fix logic in validation

f0ssel · f0ssel · commit 0026c6e1caac · 2024-02-01T21:30:20.000Z
diff --git a/coderd/agentapi/servicebanner_internal_test.go b/coderd/agentapi/servicebanner_internal_test.go
@@ -7,10 +7,11 @@ import (
 
 	"golang.org/x/xerrors"
 
+	"github.com/stretchr/testify/require"
+
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/appearance"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/stretchr/testify/require"
 )
 
 func TestGetServiceBanner(t *testing.T) {
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -630,13 +630,12 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 	if req.TimeTilDormantAutoDeleteMillis < 0 || (req.TimeTilDormantAutoDeleteMillis > 0 && req.TimeTilDormantAutoDeleteMillis < minTTL) {
 		validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_autodelete_ms", Detail: "Value must be at least one minute."})
 	}
-	if req.MaxPortSharingLevel != nil && *req.MaxPortSharingLevel < 0 || *req.MaxPortSharingLevel > 2 {
+	if req.MaxPortSharingLevel != nil {
 		if *req.MaxPortSharingLevel < 0 || *req.MaxPortSharingLevel > 2 {
 			validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Value must be between 0 and 2."})
-		} else {
-			if !portSharer.CanRestrictSharing() {
-				validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Restricting port sharing level is an enterprise feature that is not enabled."})
-			}
+		}
+		if !portSharer.CanRestrictSharing() {
+			validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Restricting port sharing level is an enterprise feature that is not enabled."})
 		}
 	}
 	maxPortShareLevel := template.MaxPortSharingLevel

Original file line number	Diff line number	Diff line change
`@@ -630,13 +630,12 @@ func (api API) patchTemplateMeta(rw http.ResponseWriter, r http.Request) {`
`630`	`630`	`if req.TimeTilDormantAutoDeleteMillis < 0 \|\| (req.TimeTilDormantAutoDeleteMillis > 0 && req.TimeTilDormantAutoDeleteMillis < minTTL) {`
`631`	`631`	`validErrs = append(validErrs, codersdk.ValidationError{Field: "time_til_dormant_autodelete_ms", Detail: "Value must be at least one minute."})`
`632`	`632`	`}`
`633`		`- if req.MaxPortSharingLevel != nil && req.MaxPortSharingLevel < 0 \|\| req.MaxPortSharingLevel > 2 {`
	`633`	`+ if req.MaxPortSharingLevel != nil {`
`634`	`634`	`if req.MaxPortSharingLevel < 0 \|\| req.MaxPortSharingLevel > 2 {`
`635`	`635`	`validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Value must be between 0 and 2."})`
`636`		`- } else {`
`637`		`- if !portSharer.CanRestrictSharing() {`
`638`		`- validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Restricting port sharing level is an enterprise feature that is not enabled."})`
`639`		`- }`
	`636`	`+ }`
	`637`	`+ if !portSharer.CanRestrictSharing() {`
	`638`	`+ validErrs = append(validErrs, codersdk.ValidationError{Field: "max_port_sharing_level", Detail: "Restricting port sharing level is an enterprise feature that is not enabled."})`
`640`	`639`	`}`
`641`	`640`	`}`
`642`	`641`	`maxPortShareLevel := template.MaxPortSharingLevel`