more fixes

sreya · sreya · commit 7f932286f1f0 · 2025-03-26T04:31:36.000Z
diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
@@ -664,7 +664,7 @@ func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.
 	if config.Regex == "" {
 		config.Regex = defaults.Regex
 	}
-	if config.Scopes == nil || len(config.Scopes) == 0 {
+	if len(config.Scopes) == 0 {
 		config.Scopes = defaults.Scopes
 	}
 	if config.DeviceCodeURL == "" {
@@ -676,7 +676,7 @@ func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.
 	if config.DisplayIcon == "" {
 		config.DisplayIcon = defaults.DisplayIcon
 	}
-	if config.ExtraTokenKeys == nil || len(config.ExtraTokenKeys) == 0 {
+	if len(config.ExtraTokenKeys) == 0 {
 		config.ExtraTokenKeys = defaults.ExtraTokenKeys
 	}
 
diff --git a/coderd/healthcheck/workspaceproxy_test.go b/coderd/healthcheck/workspaceproxy_test.go
@@ -195,10 +195,8 @@ func TestWorkspaceProxies(t *testing.T) {
 			assert.Equal(t, tt.expectedSeverity, rpt.Severity)
 			if tt.expectedError != "" && assert.NotNil(t, rpt.Error) {
 				assert.Contains(t, *rpt.Error, tt.expectedError)
-			} else {
-				if !assert.Nil(t, rpt.Error) {
-					t.Logf("error: %v", *rpt.Error)
-				}
+			} else if !assert.Nil(t, rpt.Error) {
+				t.Logf("error: %v", *rpt.Error)
 			}
 			if tt.expectedWarningCode != "" && assert.NotEmpty(t, rpt.Warnings) {
 				var found bool
diff --git a/coderd/schedule/template.go b/coderd/schedule/template.go
@@ -89,6 +89,7 @@ func VerifyTemplateAutostopRequirement(days uint8, weeks int64) error {
 	if days&0b10000000 != 0 {
 		return xerrors.New("invalid autostop requirement days, last bit is set")
 	}
+	//nolint:staticcheck
 	if days > 0b11111111 {
 		return xerrors.New("invalid autostop requirement days, too large")
 	}
@@ -107,6 +108,7 @@ func VerifyTemplateAutostartRequirement(days uint8) error {
 	if days&0b10000000 != 0 {
 		return xerrors.New("invalid autostart requirement days, last bit is set")
 	}
+	//nolint:staticcheck
 	if days > 0b11111111 {
 		return xerrors.New("invalid autostart requirement days, too large")
 	}
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1280,10 +1280,8 @@ func (api *API) setArchiveTemplateVersion(archive bool) func(rw http.ResponseWri
 
 			if archiveError != nil {
 				err = archiveError
-			} else {
-				if len(archived) == 0 {
-					err = xerrors.New("Unable to archive specified version, the version is likely in use by a workspace or currently set to the active version")
-				}
+			} else if len(archived) == 0 {
+				err = xerrors.New("Unable to archive specified version, the version is likely in use by a workspace or currently set to the active version")
 			}
 		} else {
 			err = api.Database.UnarchiveTemplateVersion(ctx, database.UnarchiveTemplateVersionParams{
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -1452,7 +1452,7 @@ func TestUserOIDC(t *testing.T) {
 				oidctest.WithStaticUserInfo(tc.UserInfoClaims),
 			}
 
-			if tc.AccessTokenClaims != nil && len(tc.AccessTokenClaims) > 0 {
+			if len(tc.AccessTokenClaims) > 0 {
 				opts = append(opts, oidctest.WithAccessTokenJWTHook(func(email string, exp time.Time) jwt.MapClaims {
 					return tc.AccessTokenClaims
 				}))

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.`
`664`	`664`	`if config.Regex == "" {`
`665`	`665`	`config.Regex = defaults.Regex`
`666`	`666`	`}`
`667`		`- if config.Scopes == nil \|\| len(config.Scopes) == 0 {`
	`667`	`+ if len(config.Scopes) == 0 {`
`668`	`668`	`config.Scopes = defaults.Scopes`
`669`	`669`	`}`
`670`	`670`	`if config.DeviceCodeURL == "" {`
`@@ -676,7 +676,7 @@ func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.`
`676`	`676`	`if config.DisplayIcon == "" {`
`677`	`677`	`config.DisplayIcon = defaults.DisplayIcon`
`678`	`678`	`}`
`679`		`- if config.ExtraTokenKeys == nil \|\| len(config.ExtraTokenKeys) == 0 {`
	`679`	`+ if len(config.ExtraTokenKeys) == 0 {`
`680`	`680`	`config.ExtraTokenKeys = defaults.ExtraTokenKeys`
`681`	`681`	`}`
`682`	`682`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ func VerifyTemplateAutostopRequirement(days uint8, weeks int64) error {`
`89`	`89`	`if days&0b10000000 != 0 {`
`90`	`90`	`return xerrors.New("invalid autostop requirement days, last bit is set")`
`91`	`91`	`}`
	`92`	`+ //nolint:staticcheck`
`92`	`93`	`if days > 0b11111111 {`
`93`	`94`	`return xerrors.New("invalid autostop requirement days, too large")`
`94`	`95`	`}`
`@@ -107,6 +108,7 @@ func VerifyTemplateAutostartRequirement(days uint8) error {`
`107`	`108`	`if days&0b10000000 != 0 {`
`108`	`109`	`return xerrors.New("invalid autostart requirement days, last bit is set")`
`109`	`110`	`}`
	`111`	`+ //nolint:staticcheck`
`110`	`112`	`if days > 0b11111111 {`
`111`	`113`	`return xerrors.New("invalid autostart requirement days, too large")`
`112`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1452,7 +1452,7 @@ func TestUserOIDC(t *testing.T) {`
`1452`	`1452`	`oidctest.WithStaticUserInfo(tc.UserInfoClaims),`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`		`- if tc.AccessTokenClaims != nil && len(tc.AccessTokenClaims) > 0 {`
	`1455`	`+ if len(tc.AccessTokenClaims) > 0 {`
`1456`	`1456`	`opts = append(opts, oidctest.WithAccessTokenJWTHook(func(email string, exp time.Time) jwt.MapClaims {`
`1457`	`1457`	`return tc.AccessTokenClaims`
`1458`	`1458`	`}))`