May 15, 2024 · May 9, 2024 · May 9, 2024 · May 9, 2024 · May 13, 2024 · May 13, 2024
diff --git a/Makefile b/Makefile
 $(DB_GEN_FILES) \
 site/src/api/typesGenerated.ts \
 coderd/rbac/object_gen.go \
 codersdk/rbacresources_gen.go \
 docs/admin/prometheus.md \
 docs/cli.md \
 docs/admin/audit-logs.md \
 go run ./scripts/examplegen/main.go > examples/examples.gen.json

 coderd/rbac/object_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
 go run scripts/rbacgen/main.go ./coderd/rbac > coderd/rbac/object_gen.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
 go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go

 docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
 go run scripts/metricsdocgen/main.go
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/authorize.go b/coderd/authorize.go
 obj := rbac.Object{
 Owner: v.Object.OwnerID,
 OrgID: v.Object.OrganizationID,
 Type:  v.Object.ResourceType.String(),
 Type:string(v.Object.ResourceType),
 }
 if obj.Owner == "me" {
 obj.Owner = auth.ID
 var dbObj rbac.Objecter
 var dbErr error
 // Only support referencing some resources by ID.
 switch v.Object.ResourceType.String() {
 case rbac.ResourceWorkspaceExecution.Type:
 workSpace, err := api.Database.GetWorkspaceByID(ctx, id)
 if err == nil {
 dbObj = workSpace.ExecutionRBAC()
 }
 dbErr = err
 switch string(v.Object.ResourceType) {
 case rbac.ResourceWorkspace.Type:
 dbObj, dbErr = api.Database.GetWorkspaceByID(ctx, id)
 case rbac.ResourceTemplate.Type:
diff --git a/coderd/coderdtest/authorize.go b/coderd/coderdtest/authorize.go
 func randomRBACType() string {
 all := []string{
 rbac.ResourceWorkspace.Type,
 rbac.ResourceWorkspaceExecution.Type,
 rbac.ResourceWorkspaceApplicationConnect.Type,
 rbac.ResourceAuditLog.Type,
 rbac.ResourceTemplate.Type,
 rbac.ResourceGroup.Type,
 rbac.ResourceFile.Type,
 rbac.ResourceProvisionerDaemon.Type,
 rbac.ResourceOrganization.Type,
 rbac.ResourceRoleAssignment.Type,
 rbac.ResourceOrgRoleAssignment.Type,
 rbac.ResourceAPIKey.Type,
 rbac.ResourceUser.Type,
 rbac.ResourceUserData.Type,
 rbac.ResourceOrganizationMember.Type,
 rbac.ResourceWildcard.Type,
 rbac.ResourceLicense.Type,
 rbac.ResourceDeploymentValues.Type,
 rbac.ResourceReplicas.Type,
 rbac.ResourceDebugInfo.Type,
 }
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 }

 if options.Authorizer == nil {
 defAuth := rbac.NewCachingAuthorizer(prometheus.NewRegistry())
 defAuth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
 if _, ok := t.(*testing.T); ok {
 options.Authorizer = &RecordingAuthorizer{
 Wrapped: defAuth,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -486,6 +486,7 @@ gen: \
		$(DB_GEN_FILES) \
		site/src/api/typesGenerated.ts \
		coderd/rbac/object_gen.go \
		codersdk/rbacresources_gen.go \
		docs/admin/prometheus.md \
		docs/cli.md \
		docs/admin/audit-logs.md \
Expand DownExpand Up		@@ -611,7 +612,10 @@ examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(sh
		go run ./scripts/examplegen/main.go > examples/examples.gen.json

		coderd/rbac/object_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
		go run scripts/rbacgen/main.go ./coderd/rbac > coderd/rbac/object_gen.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
		go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go
Comment on lines +617 to +618 Copy link MemberAuthor EmyrkMay 15, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Before this was manuallykept in sync. Or so we told ourselves johnstcn reacted with laugh emoji

		docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
		go run scripts/metricsdocgen/main.go
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -169,7 +169,7 @@ func (api API) checkAuthorization(rw http.ResponseWriter, r http.Request) {
		obj := rbac.Object{
		Owner: v.Object.OwnerID,
		OrgID: v.Object.OrganizationID,
		Type: v.Object.ResourceType.String(),
		Type:string(v.Object.ResourceType),
		}
		if obj.Owner == "me" {
		obj.Owner = auth.ID
Expand All		@@ -189,13 +189,7 @@ func (api API) checkAuthorization(rw http.ResponseWriter, r http.Request) {
		var dbObj rbac.Objecter
		var dbErr error
		// Only support referencing some resources by ID.
		switch v.Object.ResourceType.String() {
		case rbac.ResourceWorkspaceExecution.Type:
		workSpace, err := api.Database.GetWorkspaceByID(ctx, id)
		if err == nil {
		dbObj = workSpace.ExecutionRBAC()
		}
		dbErr = err
		switch string(v.Object.ResourceType) {
		case rbac.ResourceWorkspace.Type:
		dbObj, dbErr = api.Database.GetWorkspaceByID(ctx, id)
		case rbac.ResourceTemplate.Type:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -416,23 +416,16 @@ func RandomRBACObject() rbac.Object {
		func randomRBACType() string {
		all := []string{
		rbac.ResourceWorkspace.Type,
		rbac.ResourceWorkspaceExecution.Type,
		rbac.ResourceWorkspaceApplicationConnect.Type,
		rbac.ResourceAuditLog.Type,
		rbac.ResourceTemplate.Type,
		rbac.ResourceGroup.Type,
		rbac.ResourceFile.Type,
		rbac.ResourceProvisionerDaemon.Type,
		rbac.ResourceOrganization.Type,
		rbac.ResourceRoleAssignment.Type,
		rbac.ResourceOrgRoleAssignment.Type,
		rbac.ResourceAPIKey.Type,
		rbac.ResourceUser.Type,
		rbac.ResourceUserData.Type,
		rbac.ResourceOrganizationMember.Type,
		rbac.ResourceWildcard.Type,
		rbac.ResourceLicense.Type,
		rbac.ResourceDeploymentValues.Type,
		rbac.ResourceReplicas.Type,
		rbac.ResourceDebugInfo.Type,
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -221,7 +221,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		}

		if options.Authorizer == nil {
		defAuth := rbac.NewCachingAuthorizer(prometheus.NewRegistry())
		defAuth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
		if _, ok := t.(*testing.T); ok {
		options.Authorizer = &RecordingAuthorizer{
		Wrapped: defAuth,
Expand Down