Jun 3, 2024 · Jun 3, 2024
diff --git a/Makefile b/Makefile
 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
 } else {
 updated, err = client.PatchOrganizationRole(ctx, org.ID, customRole)
 if err != nil {
 returnfmt.Errorf("patch role: %w", err)
 returnxerrors.Errorf("patch role: %w", err)
 }
 }

diff --git a/cli/server.go b/cli/server.go
 if vals.Telemetry.Enable {
 gitAuth := make([]telemetry.GitAuth, 0)
 // TODO:
 vargitAuthConfigs []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
 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
 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
 // inferred.
 typescriptTag, err := tags.Get("typescript")
 if err == nil {
 iferr == 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
 // 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
Expand Up		@@ -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
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -205,7 +205,7 @@ func (r RootCmd) editOrganizationRole() serpent.Command {
		} else {
		updated, err = client.PatchOrganizationRole(ctx, org.ID, customRole)
		if err != nil {
		returnfmt.Errorf("patch role: %w", err)
		returnxerrors.Errorf("patch role: %w", err)
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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:
		vargitAuthConfigs []codersdk.ExternalAuthConfig
		gitAuthConfigs:= make([]codersdk.ExternalAuthConfig, 0)
		for _, cfg := range gitAuthConfigs {
		gitAuth = append(gitAuth, telemetry.GitAuth{
		Type: cfg.Type,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 {
		iferr == nil &&typescriptTag.Name == "-" {
		if typescriptTag.Name == "-" {
		// Completely ignore this field.
		continue
		} else if typescriptTag.Name != "" {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 -}}
Expand Down