chore: linting fixes (#13450)

coadler · web-flow · commit 43ef00401c67 · 2024-06-03T14:33:37.000-05:00
diff --git a/Makefile b/Makefile
@@ -615,10 +615,10 @@ site/src/theme/icons.json: $(wildcard scripts/gensite/*) $(wildcard site/static/
 examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
 	go run ./scripts/examplegen/main.go > examples/examples.gen.json
 
-coderd/rbac/object_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
+coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go
 	go run scripts/rbacgen/main.go rbac > coderd/rbac/object_gen.go
 
-codersdk/rbacresources_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
+codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go
 	go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go
 
 docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
diff --git a/cli/organizationroles.go b/cli/organizationroles.go
@@ -205,7 +205,7 @@ func (r *RootCmd) editOrganizationRole() *serpent.Command {
 			} else {
 				updated, err = client.PatchOrganizationRole(ctx, org.ID, customRole)
 				if err != nil {
-					return fmt.Errorf("patch role: %w", err)
+					return xerrors.Errorf("patch role: %w", err)
 				}
 			}
 
diff --git a/cli/server.go b/cli/server.go
@@ -798,7 +798,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			if vals.Telemetry.Enable {
 				gitAuth := make([]telemetry.GitAuth, 0)
 				// TODO:
-				var gitAuthConfigs []codersdk.ExternalAuthConfig
+				gitAuthConfigs := make([]codersdk.ExternalAuthConfig, 0)
 				for _, cfg := range gitAuthConfigs {
 					gitAuth = append(gitAuth, telemetry.GitAuth{
 						Type: cfg.Type,
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -407,9 +407,8 @@ func createValidTemplateVersion(inv *serpent.Invocation, args createValidTemplat
 		if errors.As(err, &jobErr) && !codersdk.JobIsMissingParameterErrorCode(jobErr.Code) {
 			return nil, err
 		}
-		if err != nil {
-			return nil, err
-		}
+
+		return nil, err
 	}
 	version, err = client.TemplateVersion(inv.Context(), version.ID)
 	if err != nil {
diff --git a/cli/templateversionarchive.go b/cli/templateversionarchive.go
@@ -166,7 +166,7 @@ func (r *RootCmd) archiveTemplateVersions() *serpent.Command {
 					inv.Stdout, fmt.Sprintf("Archived %d versions from "+pretty.Sprint(cliui.DefaultStyles.Keyword, template.Name)+" at "+cliui.Timestamp(time.Now()), len(resp.ArchivedIDs)),
 				)
 
-				if ok, _ := inv.ParsedFlags().GetBool("verbose"); err == nil && ok {
+				if ok, _ := inv.ParsedFlags().GetBool("verbose"); ok {
 					data, err := json.Marshal(resp)
 					if err != nil {
 						return xerrors.Errorf("marshal verbose response: %w", err)
diff --git a/codersdk/rbacresources_gen.go b/codersdk/rbacresources_gen.go
diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go
@@ -600,7 +600,7 @@ func (g *Generator) buildStruct(obj types.Object, st *types.Struct) (string, err
 		// inferred.
 		typescriptTag, err := tags.Get("typescript")
 		if err == nil {
-			if err == nil && typescriptTag.Name == "-" {
+			if typescriptTag.Name == "-" {
 				// Completely ignore this field.
 				continue
 			} else if typescriptTag.Name != "" {
diff --git a/scripts/rbacgen/codersdk.gotmpl b/scripts/rbacgen/codersdk.gotmpl
@@ -21,7 +21,7 @@ const (
 // said resource type.
 var RBACResourceActions = map[RBACResource][]RBACAction{
 	{{- range $element := . }}
-    Resource{{ pascalCaseName $element.FunctionName }}: []RBACAction{
+    Resource{{ pascalCaseName $element.FunctionName }}: {
         {{- range $actionValue, $_ := $element.Actions }}
             {{- actionEnum $actionValue -}},
         {{- end -}}

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func (r RootCmd) editOrganizationRole() serpent.Command {`
`205`	`205`	`} else {`
`206`	`206`	`updated, err = client.PatchOrganizationRole(ctx, org.ID, customRole)`
`207`	`207`	`if err != nil {`
`208`		`- return fmt.Errorf("patch role: %w", err)`
	`208`	`+ return xerrors.Errorf("patch role: %w", err)`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,8 @@ func createValidTemplateVersion(inv *serpent.Invocation, args createValidTemplat`
`407`	`407`	`if errors.As(err, &jobErr) && !codersdk.JobIsMissingParameterErrorCode(jobErr.Code) {`
`408`	`408`	`return nil, err`
`409`	`409`	`}`
`410`		`- if err != nil {`
`411`		`- return nil, err`
`412`		`- }`
	`410`	`+`
	`411`	`+ return nil, err`
`413`	`412`	`}`
`414`	`413`	`version, err = client.TemplateVersion(inv.Context(), version.ID)`
`415`	`414`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func (r RootCmd) archiveTemplateVersions() serpent.Command {`
`166`	`166`	`inv.Stdout, fmt.Sprintf("Archived %d versions from "+pretty.Sprint(cliui.DefaultStyles.Keyword, template.Name)+" at "+cliui.Timestamp(time.Now()), len(resp.ArchivedIDs)),`
`167`	`167`	`)`
`168`	`168`
`169`		`- if ok, _ := inv.ParsedFlags().GetBool("verbose"); err == nil && ok {`
	`169`	`+ if ok, _ := inv.ParsedFlags().GetBool("verbose"); ok {`
`170`	`170`	`data, err := json.Marshal(resp)`
`171`	`171`	`if err != nil {`
`172`	`172`	`return xerrors.Errorf("marshal verbose response: %w", err)`