rename

f0ssel · f0ssel · commit 2f11606752f8 · 2024-05-13T17:35:18.000Z
diff --git a/coderd/portsharing/portsharing.go b/coderd/portsharing/portsharing.go
@@ -8,22 +8,22 @@ import (
 )
 
 type PortSharer interface {
-	AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error
-	ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error
-	ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel
+	AuthorizedLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error
+	ValidateTemplateMaxLevel(level codersdk.WorkspaceAgentPortShareLevel) error
+	ConvertMaxLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel
 }
 
 type AGPLPortSharer struct{}
 
-func (AGPLPortSharer) AuthorizedPortSharingLevel(_ database.Template, _ codersdk.WorkspaceAgentPortShareLevel) error {
+func (AGPLPortSharer) AuthorizedLevel(_ database.Template, _ codersdk.WorkspaceAgentPortShareLevel) error {
 	return nil
 }
 
-func (AGPLPortSharer) ValidateTemplateMaxPortSharingLevel(_ codersdk.WorkspaceAgentPortShareLevel) error {
+func (AGPLPortSharer) ValidateTemplateMaxLevel(_ codersdk.WorkspaceAgentPortShareLevel) error {
 	return xerrors.New("Restricting port sharing level is an enterprise feature that is not enabled.")
 }
 
-func (AGPLPortSharer) ConvertMaxPortSharingLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
+func (AGPLPortSharer) ConvertMaxLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
 	return codersdk.WorkspaceAgentPortShareLevelPublic
 }
 
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -623,8 +623,8 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_autodelete_ms", Detail: "Value must be at least one minute."})
 	}
 	maxPortShareLevel := template.MaxPortSharingLevel
-	if req.MaxPortShareLevel != nil && *req.MaxPortShareLevel != portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel) {
-		err := portSharer.ValidateTemplateMaxPortSharingLevel(*req.MaxPortShareLevel)
+	if req.MaxPortShareLevel != nil && *req.MaxPortShareLevel != portSharer.ConvertMaxLevel(template.MaxPortSharingLevel) {
+		err := portSharer.ValidateTemplateMaxLevel(*req.MaxPortShareLevel)
 		if err != nil {
 			validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: err.Error()})
 		} else {
@@ -858,7 +858,7 @@ func (api *API) convertTemplate(
 	}
 
 	portSharer := *(api.PortSharer.Load())
-	maxPortShareLevel := portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel)
+	maxPortShareLevel := portSharer.ConvertMaxLevel(template.MaxPortSharingLevel)
 
 	return codersdk.Template{
 		ID:                             template.ID,
diff --git a/coderd/workspaceagentportshare.go b/coderd/workspaceagentportshare.go
@@ -69,7 +69,7 @@ func (api *API) postWorkspaceAgentPortShare(rw http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	err = portSharer.AuthorizedPortSharingLevel(template, req.ShareLevel)
+	err = portSharer.AuthorizedLevel(template, req.ShareLevel)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: err.Error(),
diff --git a/enterprise/coderd/portsharing/portsharing.go b/enterprise/coderd/portsharing/portsharing.go
@@ -13,7 +13,7 @@ func NewEnterprisePortSharer() *EnterprisePortSharer {
 	return &EnterprisePortSharer{}
 }
 
-func (EnterprisePortSharer) AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error {
+func (EnterprisePortSharer) AuthorizedLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error {
 	max := codersdk.WorkspaceAgentPortShareLevel(template.MaxPortSharingLevel)
 	switch level {
 	case codersdk.WorkspaceAgentPortShareLevelPublic:
@@ -31,14 +31,14 @@ func (EnterprisePortSharer) AuthorizedPortSharingLevel(template database.Templat
 	return nil
 }
 
-func (EnterprisePortSharer) ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error {
+func (EnterprisePortSharer) ValidateTemplateMaxLevel(level codersdk.WorkspaceAgentPortShareLevel) error {
 	if !level.ValidMaxLevel() {
 		return xerrors.New("invalid max port sharing level, value must be 'authenticated' or 'public'.")
 	}
 
 	return nil
 }
 
-func (EnterprisePortSharer) ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
+func (EnterprisePortSharer) ConvertMaxLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
 	return codersdk.WorkspaceAgentPortShareLevel(level)
 }

Original file line number	Diff line number	Diff line change
`@@ -8,22 +8,22 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type PortSharer interface {`
`11`		`- AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error`
`12`		`- ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error`
`13`		`- ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel`
	`11`	`+ AuthorizedLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error`
	`12`	`+ ValidateTemplateMaxLevel(level codersdk.WorkspaceAgentPortShareLevel) error`
	`13`	`+ ConvertMaxLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`type AGPLPortSharer struct{}`
`17`	`17`
`18`		`-func (AGPLPortSharer) AuthorizedPortSharingLevel(_ database.Template, _ codersdk.WorkspaceAgentPortShareLevel) error {`
	`18`	`+func (AGPLPortSharer) AuthorizedLevel(_ database.Template, _ codersdk.WorkspaceAgentPortShareLevel) error {`
`19`	`19`	`return nil`
`20`	`20`	`}`
`21`	`21`
`22`		`-func (AGPLPortSharer) ValidateTemplateMaxPortSharingLevel(_ codersdk.WorkspaceAgentPortShareLevel) error {`
	`22`	`+func (AGPLPortSharer) ValidateTemplateMaxLevel(_ codersdk.WorkspaceAgentPortShareLevel) error {`
`23`	`23`	`return xerrors.New("Restricting port sharing level is an enterprise feature that is not enabled.")`
`24`	`24`	`}`
`25`	`25`
`26`		`-func (AGPLPortSharer) ConvertMaxPortSharingLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
	`26`	`+func (AGPLPortSharer) ConvertMaxLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
`27`	`27`	`return codersdk.WorkspaceAgentPortShareLevelPublic`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (api API) postWorkspaceAgentPortShare(rw http.ResponseWriter, r http.Requ`
`69`	`69`	`return`
`70`	`70`	`}`
`71`	`71`
`72`		`- err = portSharer.AuthorizedPortSharingLevel(template, req.ShareLevel)`
	`72`	`+ err = portSharer.AuthorizedLevel(template, req.ShareLevel)`
`73`	`73`	`if err != nil {`
`74`	`74`	`httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{`
`75`	`75`	`Message: err.Error(),`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ func NewEnterprisePortSharer() *EnterprisePortSharer {`
`13`	`13`	`return &EnterprisePortSharer{}`
`14`	`14`	`}`
`15`	`15`
`16`		`-func (EnterprisePortSharer) AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error {`
	`16`	`+func (EnterprisePortSharer) AuthorizedLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error {`
`17`	`17`	`max := codersdk.WorkspaceAgentPortShareLevel(template.MaxPortSharingLevel)`
`18`	`18`	`switch level {`
`19`	`19`	`case codersdk.WorkspaceAgentPortShareLevelPublic:`
`@@ -31,14 +31,14 @@ func (EnterprisePortSharer) AuthorizedPortSharingLevel(template database.Templat`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`	`33`
`34`		`-func (EnterprisePortSharer) ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error {`
	`34`	`+func (EnterprisePortSharer) ValidateTemplateMaxLevel(level codersdk.WorkspaceAgentPortShareLevel) error {`
`35`	`35`	`if !level.ValidMaxLevel() {`
`36`	`36`	`return xerrors.New("invalid max port sharing level, value must be 'authenticated' or 'public'.")`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return nil`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (EnterprisePortSharer) ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
	`42`	`+func (EnterprisePortSharer) ConvertMaxLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
`43`	`43`	`return codersdk.WorkspaceAgentPortShareLevel(level)`
`44`	`44`	`}`