From 43ef00401c67117a35efb4848d663ddb7c0e5cf9 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Mon, 3 Jun 2024 14:33:37 -0500 Subject: [PATCH] chore: linting fixes (#13450) --- Makefile | 4 +-- cli/organizationroles.go | 2 +- cli/server.go | 2 +- cli/templatepush.go | 5 ++-- cli/templateversionarchive.go | 2 +- codersdk/rbacresources_gen.go | 50 ++++++++++++++++----------------- scripts/apitypings/main.go | 2 +- scripts/rbacgen/codersdk.gotmpl | 2 +- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 47cdea7cb6..ca54d51842 100644 --- 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 index 8cf557eecf..d127965666 100644 --- 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 index 3706b2ee1b..409056641a 100644 --- 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 index e360aca9f7..e4d776dbaa 100644 --- 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 index b63cf2e244..f9ae87e330 100644 --- 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 index 42db5449c2..2c524e3565 100644 --- a/codersdk/rbacresources_gen.go +++ b/codersdk/rbacresources_gen.go @@ -52,29 +52,29 @@ const ( // RBACResourceActions is the mapping of resources to which actions are valid for // said resource type. var RBACResourceActions = map[RBACResource][]RBACAction{ - ResourceWildcard: []RBACAction{}, - ResourceApiKey: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceAssignOrgRole: []RBACAction{ActionAssign, ActionDelete, ActionRead}, - ResourceAssignRole: []RBACAction{ActionAssign, ActionCreate, ActionDelete, ActionRead}, - ResourceAuditLog: []RBACAction{ActionCreate, ActionRead}, - ResourceDebugInfo: []RBACAction{ActionRead}, - ResourceDeploymentConfig: []RBACAction{ActionRead, ActionUpdate}, - ResourceDeploymentStats: []RBACAction{ActionRead}, - ResourceFile: []RBACAction{ActionCreate, ActionRead}, - ResourceGroup: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceLicense: []RBACAction{ActionCreate, ActionDelete, ActionRead}, - ResourceOauth2App: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceOauth2AppCodeToken: []RBACAction{ActionCreate, ActionDelete, ActionRead}, - ResourceOauth2AppSecret: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceOrganization: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceOrganizationMember: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceProvisionerDaemon: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceReplicas: []RBACAction{ActionRead}, - ResourceSystem: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceTailnetCoordinator: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, - ResourceTemplate: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate, ActionViewInsights}, - ResourceUser: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionReadPersonal, ActionUpdate, ActionUpdatePersonal}, - ResourceWorkspace: []RBACAction{ActionApplicationConnect, ActionCreate, ActionDelete, ActionRead, ActionSSH, ActionWorkspaceStart, ActionWorkspaceStop, ActionUpdate}, - ResourceWorkspaceDormant: []RBACAction{ActionApplicationConnect, ActionCreate, ActionDelete, ActionRead, ActionSSH, ActionWorkspaceStart, ActionWorkspaceStop, ActionUpdate}, - ResourceWorkspaceProxy: []RBACAction{ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceWildcard: {}, + ResourceApiKey: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceAssignOrgRole: {ActionAssign, ActionDelete, ActionRead}, + ResourceAssignRole: {ActionAssign, ActionCreate, ActionDelete, ActionRead}, + ResourceAuditLog: {ActionCreate, ActionRead}, + ResourceDebugInfo: {ActionRead}, + ResourceDeploymentConfig: {ActionRead, ActionUpdate}, + ResourceDeploymentStats: {ActionRead}, + ResourceFile: {ActionCreate, ActionRead}, + ResourceGroup: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceLicense: {ActionCreate, ActionDelete, ActionRead}, + ResourceOauth2App: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceOauth2AppCodeToken: {ActionCreate, ActionDelete, ActionRead}, + ResourceOauth2AppSecret: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceOrganization: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceOrganizationMember: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceProvisionerDaemon: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceReplicas: {ActionRead}, + ResourceSystem: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceTailnetCoordinator: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, + ResourceTemplate: {ActionCreate, ActionDelete, ActionRead, ActionUpdate, ActionViewInsights}, + ResourceUser: {ActionCreate, ActionDelete, ActionRead, ActionReadPersonal, ActionUpdate, ActionUpdatePersonal}, + ResourceWorkspace: {ActionApplicationConnect, ActionCreate, ActionDelete, ActionRead, ActionSSH, ActionWorkspaceStart, ActionWorkspaceStop, ActionUpdate}, + ResourceWorkspaceDormant: {ActionApplicationConnect, ActionCreate, ActionDelete, ActionRead, ActionSSH, ActionWorkspaceStart, ActionWorkspaceStop, ActionUpdate}, + ResourceWorkspaceProxy: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, } diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go index 0b4571a6af..98bfbc47ea 100644 --- 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 index dff4e165b1..935d8c4f55 100644 --- 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 -}}