fix: properly convert max port share level for oss

f0ssel · f0ssel · commit 051201d61935 · 2024-05-13T16:51:08.000Z
diff --git a/coderd/portsharing/portsharing.go b/coderd/portsharing/portsharing.go
@@ -10,6 +10,7 @@ import (
 type PortSharer interface {
 	AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error
 	ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error
+	ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel
 }
 
 type AGPLPortSharer struct{}
@@ -22,4 +23,8 @@ func (AGPLPortSharer) ValidateTemplateMaxPortSharingLevel(_ codersdk.WorkspaceAg
 	return xerrors.New("Restricting port sharing level is an enterprise feature that is not enabled.")
 }
 
+func (AGPLPortSharer) ConvertMaxPortSharingLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
+	return codersdk.WorkspaceAgentPortShareLevelPublic
+}
+
 var DefaultPortSharer PortSharer = AGPLPortSharer{}
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -623,7 +623,7 @@ 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 != codersdk.WorkspaceAgentPortShareLevel(maxPortShareLevel) {
+	if req.MaxPortShareLevel != nil && *req.MaxPortShareLevel != portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel) {
 		err := portSharer.ValidateTemplateMaxPortSharingLevel(*req.MaxPortShareLevel)
 		if err != nil {
 			validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: err.Error()})
@@ -857,6 +857,9 @@ func (api *API) convertTemplate(
 		autostopRequirementWeeks = 1
 	}
 
+	portSharer := *(api.PortSharer.Load())
+	maxPortShareLevel := portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel)
+
 	return codersdk.Template{
 		ID:                             template.ID,
 		CreatedAt:                      template.CreatedAt,
@@ -891,6 +894,6 @@ func (api *API) convertTemplate(
 		RequireActiveVersion: templateAccessControl.RequireActiveVersion,
 		Deprecated:           templateAccessControl.IsDeprecated(),
 		DeprecationMessage:   templateAccessControl.Deprecated,
-		MaxPortShareLevel:    codersdk.WorkspaceAgentPortShareLevel(template.MaxPortSharingLevel),
+		MaxPortShareLevel:    maxPortShareLevel,
 	}
 }
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -600,9 +600,9 @@ func TestPatchTemplateMeta(t *testing.T) {
 		user := coderdtest.CreateFirstUser(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
-		require.Equal(t, codersdk.WorkspaceAgentPortShareLevelOwner, template.MaxPortShareLevel)
+		require.Equal(t, codersdk.WorkspaceAgentPortShareLevelPublic, template.MaxPortShareLevel)
 
-		var level codersdk.WorkspaceAgentPortShareLevel = codersdk.WorkspaceAgentPortShareLevelPublic
+		var level codersdk.WorkspaceAgentPortShareLevel = codersdk.WorkspaceAgentPortShareLevelAuthenticated
 		req := codersdk.UpdateTemplateMeta{
 			MaxPortShareLevel: &level,
 		}
@@ -615,7 +615,7 @@ func TestPatchTemplateMeta(t *testing.T) {
 		require.ErrorContains(t, err, "port sharing level is an enterprise feature")
 
 		// Ensure the same value port share level is a no-op
-		level = codersdk.WorkspaceAgentPortShareLevelOwner
+		level = codersdk.WorkspaceAgentPortShareLevelPublic
 		_, err = client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
 			Name:              coderdtest.RandomUsername(t),
 			MaxPortShareLevel: &level,
diff --git a/enterprise/coderd/portsharing/portsharing.go b/enterprise/coderd/portsharing/portsharing.go
@@ -38,3 +38,7 @@ func (EnterprisePortSharer) ValidateTemplateMaxPortSharingLevel(level codersdk.W
 
 	return nil
 }
+
+func (EnterprisePortSharer) ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {
+	return codersdk.WorkspaceAgentPortShareLevel(level)
+}

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`type PortSharer interface {`
`11`	`11`	`AuthorizedPortSharingLevel(template database.Template, level codersdk.WorkspaceAgentPortShareLevel) error`
`12`	`12`	`ValidateTemplateMaxPortSharingLevel(level codersdk.WorkspaceAgentPortShareLevel) error`
	`13`	`+ ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`type AGPLPortSharer struct{}`
`@@ -22,4 +23,8 @@ func (AGPLPortSharer) ValidateTemplateMaxPortSharingLevel(_ codersdk.WorkspaceAg`
`22`	`23`	`return xerrors.New("Restricting port sharing level is an enterprise feature that is not enabled.")`
`23`	`24`	`}`
`24`	`25`
	`26`	`+func (AGPLPortSharer) ConvertMaxPortSharingLevel(_ database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
	`27`	`+ return codersdk.WorkspaceAgentPortShareLevelPublic`
	`28`	`+}`
	`29`	`+`
`25`	`30`	`var DefaultPortSharer PortSharer = AGPLPortSharer{}`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ func (api API) patchTemplateMeta(rw http.ResponseWriter, r http.Request) {`
`623`	`623`	`validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_autodelete_ms", Detail: "Value must be at least one minute."})`
`624`	`624`	`}`
`625`	`625`	`maxPortShareLevel := template.MaxPortSharingLevel`
`626`		`- if req.MaxPortShareLevel != nil && *req.MaxPortShareLevel != codersdk.WorkspaceAgentPortShareLevel(maxPortShareLevel) {`
	`626`	`+ if req.MaxPortShareLevel != nil && *req.MaxPortShareLevel != portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel) {`
`627`	`627`	`err := portSharer.ValidateTemplateMaxPortSharingLevel(*req.MaxPortShareLevel)`
`628`	`628`	`if err != nil {`
`629`	`629`	`validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: err.Error()})`
`@@ -857,6 +857,9 @@ func (api *API) convertTemplate(`
`857`	`857`	`autostopRequirementWeeks = 1`
`858`	`858`	`}`
`859`	`859`
	`860`	`+ portSharer := *(api.PortSharer.Load())`
	`861`	`+ maxPortShareLevel := portSharer.ConvertMaxPortSharingLevel(template.MaxPortSharingLevel)`
	`862`	`+`
`860`	`863`	`return codersdk.Template{`
`861`	`864`	`ID: template.ID,`
`862`	`865`	`CreatedAt: template.CreatedAt,`
`@@ -891,6 +894,6 @@ func (api *API) convertTemplate(`
`891`	`894`	`RequireActiveVersion: templateAccessControl.RequireActiveVersion,`
`892`	`895`	`Deprecated: templateAccessControl.IsDeprecated(),`
`893`	`896`	`DeprecationMessage: templateAccessControl.Deprecated,`
`894`		`- MaxPortShareLevel: codersdk.WorkspaceAgentPortShareLevel(template.MaxPortSharingLevel),`
	`897`	`+ MaxPortShareLevel: maxPortShareLevel,`
`895`	`898`	`}`
`896`	`899`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,7 @@ func (EnterprisePortSharer) ValidateTemplateMaxPortSharingLevel(level codersdk.W`
`38`	`38`
`39`	`39`	`return nil`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+func (EnterprisePortSharer) ConvertMaxPortSharingLevel(level database.AppSharingLevel) codersdk.WorkspaceAgentPortShareLevel {`
	`43`	`+ return codersdk.WorkspaceAgentPortShareLevel(level)`
	`44`	`+}`