removed unnecessary change

ibetitsmike · ibetitsmike · commit a7f755dad142 · 2025-04-10T14:03:04.000Z
diff --git a/coderd/rbac/authz.go b/coderd/rbac/authz.go
@@ -77,10 +77,6 @@ const (
 // Subject is a struct that contains all the elements of a subject in an rbac
 // authorize.
 type Subject struct {
-	// Type indicates what kind of subject this is (user, system, provisioner, etc.)
-	// It is not used in any functional way, only for logging.
-	Type SubjectType
-
 	// FriendlyName is entirely optional and is used for logging and debugging
 	// It is not used in any functional way.
 	// It is usually the "username" of the user, but it can be the name of the
@@ -98,6 +94,10 @@ type Subject struct {
 
 	// cachedASTValue is the cached ast value for this subject.
 	cachedASTValue ast.Value
+
+	// Type indicates what kind of subject this is (user, system, provisioner, etc.)
+	// It is not used in any functional way, only for logging.
+	Type SubjectType
 }
 
 // RegoValueOk is only used for unit testing. There is no easy way
@@ -360,11 +360,10 @@ func NewAuthorizer(registry prometheus.Registerer) *RegoAuthorizer {
 }
 
 type authSubject struct {
-	Type   SubjectType `json:"type"`
-	ID     string      `json:"id"`
-	Roles  []Role      `json:"roles"`
-	Groups []string    `json:"groups"`
-	Scope  Scope       `json:"scope"`
+	ID     string   `json:"id"`
+	Roles  []Role   `json:"roles"`
+	Groups []string `json:"groups"`
+	Scope  Scope    `json:"scope"`
 }
 
 // Authorize is the intended function to be used outside this package.
diff --git a/coderd/rbac/roles_internal_test.go b/coderd/rbac/roles_internal_test.go
@@ -20,7 +20,6 @@ import (
 // A possible large improvement would be to implement the ast.Value interface directly.
 func BenchmarkRBACValueAllocation(b *testing.B) {
 	actor := Subject{
-		Type:   SubjectTypeUser,
 		Roles:  RoleIdentifiers{ScopedRoleOrgMember(uuid.New()), ScopedRoleOrgAdmin(uuid.New()), RoleMember()},
 		ID:     uuid.NewString(),
 		Scope:  ScopeAll,
@@ -40,7 +39,6 @@ func BenchmarkRBACValueAllocation(b *testing.B) {
 	})
 
 	jsonSubject := authSubject{
-		Type:   actor.Type,
 		ID:     actor.ID,
 		Roles:  must(actor.Roles.Expand()),
 		Groups: actor.Groups,
@@ -84,7 +82,6 @@ func TestRegoInputValue(t *testing.T) {
 	}
 
 	actor := Subject{
-		Type:   SubjectTypeUser,
 		Roles:  Roles(roles),
 		ID:     uuid.NewString(),
 		Scope:  ScopeAll,
@@ -112,7 +109,6 @@ func TestRegoInputValue(t *testing.T) {
 		// This is the input that would be passed to the rego policy.
 		jsonInput := map[string]interface{}{
 			"subject": authSubject{
-				Type:   actor.Type,
 				ID:     actor.ID,
 				Roles:  must(actor.Roles.Expand()),
 				Groups: actor.Groups,
