linting

coder · sreya · Jan 11, 2024 · Jan 11, 2024 · Jan 11, 2024 · Jan 11, 2024
commit 6802eb919f8d02aaf243bf609c05390746b0ddf0
diff --git a/cli/templateedit.go b/cli/templateedit.go
@@ -47,7 +47,7 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 		),
 		Short: "Edit the metadata of a template by name.",
 		Handler: func(inv *clibase.Invocation) error {
-			unsetAutostopRequirementDaysOfWeek := userSetOption(inv, "autostop-requirement-weekdays")
+			unsetAutostopRequirementDaysOfWeek := len(autostopRequirementDaysOfWeek) == 1 && autostopRequirementDaysOfWeek[0] == "none"
 			requiresScheduling := (len(autostopRequirementDaysOfWeek) > 0 && !unsetAutostopRequirementDaysOfWeek) ||
 				autostopRequirementWeeks > 0 ||
 				!allowUserAutostart ||
@@ -140,7 +140,7 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				autostopRequirementDaysOfWeek = template.AutostopRequirement.DaysOfWeek
 			}
 
-			if len(autostopRequirementDaysOfWeek) == 1 && autostopRequirementDaysOfWeek[0] == "none" {
+			if unsetAutostopRequirementDaysOfWeek {
 				autostopRequirementDaysOfWeek = []string{}
 			}
 
@@ -162,9 +162,9 @@ func (r *RootCmd) templateEdit() *clibase.Cmd {
 				deprecated = &deprecationMessage
 			}
 
-			var disableEveryoneGroup *bool
+			var disableEveryoneGroup bool
 			if userSetOption(inv, "private") {
-				disableEveryoneGroup = &disableEveryone
+				disableEveryoneGroup = disableEveryone
 			}
 
 			req := codersdk.UpdateTemplateMeta{

diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
@@ -325,7 +325,7 @@ func (c *DeviceAuth) AuthorizeDevice(ctx context.Context) (*codersdk.ExternalAut
 		// return a better error.
 		switch resp.StatusCode {
 		case http.StatusTooManyRequests:
-			return nil, fmt.Errorf("rate limit hit, unable to authorize device. please try again later")
+			return nil, xerrors.New("rate limit hit, unable to authorize device. please try again later")
 		default:
 			return nil, err
 		}

diff --git a/coderd/promoauth/github.go b/coderd/promoauth/github.go
@@ -1,10 +1,11 @@
 package promoauth
 
 import (
-	"fmt"
 	"net/http"
 	"strconv"
 	"time"
+
+	"golang.org/x/xerrors"
 )
 
 type rateLimits struct {
@@ -81,7 +82,7 @@ func (p *headerParser) string(key string) string {
 
 	v := p.header.Get(key)
 	if v == "" {
-		p.errors[key] = fmt.Errorf("missing header %q", key)
+		p.errors[key] = xerrors.Errorf("missing header %q", key)
 	}
 	return v
 }

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -668,7 +668,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 		}
 
 		groupACL := template.GroupACL
-		if req.DisableEveryoneGroupAccess != nil && *req.DisableEveryoneGroupAccess == true {
+		if req.DisableEveryoneGroupAccess {
 			delete(groupACL, template.OrganizationID.String())
 		}
 

diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -246,7 +246,7 @@ type UpdateTemplateMeta struct {
 	// If this is set to true, the template will not be available to all users,
 	// and must be explicitly granted to users or groups in the permissions settings
 	// of the template.
-	DisableEveryoneGroupAccess *bool `json:"disable_everyone_group_access"`
+	DisableEveryoneGroupAccess bool `json:"disable_everyone_group_access"`
 }
 
 type TemplateExample struct {

diff --git a/enterprise/cli/templateedit_test.go b/enterprise/cli/templateedit_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/smithy-go/ptr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbfake"
 	"github.com/coder/coder/v2/coderd/rbac"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
 	"github.com/coder/coder/v2/enterprise/coderd/license"
@@ -232,8 +232,8 @@ func TestTemplateEdit(t *testing.T) {
 			TimeTilDormantMillis:           expectedDormancyMillis,
 			TimeTilDormantAutoDeleteMillis: expectedAutoDeleteMillis,
 			RequireActiveVersion:           expectedRequireActiveVersion,
-			DeprecationMessage:             ptr.String(deprecationMessage),
-			DisableEveryoneGroupAccess:     ptr.Bool(expectedDisableEveryone),
+			DeprecationMessage:             ptr.Ref(deprecationMessage),
+			DisableEveryoneGroupAccess:     expectedDisableEveryone,
 			AllowUserCancelWorkspaceJobs:   expectedAllowCancelJobs,
 			AutostartRequirement: &codersdk.TemplateAutostartRequirement{
 				DaysOfWeek: expectedAutostartDaysOfWeek,
@@ -281,8 +281,8 @@ func TestTemplateEdit(t *testing.T) {
 			TimeTilDormantMillis:           expectedDormancyMillis,
 			TimeTilDormantAutoDeleteMillis: expectedAutoDeleteMillis,
 			RequireActiveVersion:           expectedRequireActiveVersion,
-			DeprecationMessage:             ptr.String(deprecationMessage),
-			DisableEveryoneGroupAccess:     ptr.Bool(expectedDisableEveryone),
+			DeprecationMessage:             ptr.Ref(deprecationMessage),
+			DisableEveryoneGroupAccess:     expectedDisableEveryone,
 			AllowUserCancelWorkspaceJobs:   expectedAllowCancelJobs,
 			AutostartRequirement: &codersdk.TemplateAutostartRequirement{
 				DaysOfWeek: expectedAutostartDaysOfWeek,

diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
@@ -832,7 +832,7 @@ func TestTemplateACL(t *testing.T) {
 			Description:                  template.Description,
 			Icon:                         template.Icon,
 			AllowUserCancelWorkspaceJobs: template.AllowUserCancelWorkspaceJobs,
-			DisableEveryoneGroupAccess:   true,
+			DisableEveryoneGroupAccess:   ptr.Ref(true),
 		})
 		require.NoError(t, err)
 

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts