lint fixes

ConductorOne · Jun 10, 2024 · 8e82f73 · 8e82f73
1 parent 68e807d
commit 8e82f73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/pkg/connector/ciam.go b/pkg/connector/ciam.go
@@ -215,7 +215,7 @@ func (g *ciamResourceBuilder) Grant(ctx context.Context, principal *v2.Resource,
 				return nil, err
 			}
 
-			if errOkta.ErrorCode == "E0000090" {
+			if errOkta.ErrorCode == alreadyAssignedRole {
 				l.Warn(
 					"okta-connector: The role specified is already assigned to the user",
 					zap.String("principal_id", principal.Id.String()),
@@ -249,7 +249,7 @@ func (g *ciamResourceBuilder) Grant(ctx context.Context, principal *v2.Resource,
 				return nil, err
 			}
 
-			if errOkta.ErrorCode == "E0000090" {
+			if errOkta.ErrorCode == alreadyAssignedRole {
 				l.Warn(
 					"okta-connector: The role specified is already assigned to the group",
 					zap.String("principal_id", principal.Id.String()),
@@ -301,7 +301,7 @@ func (g *ciamResourceBuilder) Revoke(ctx context.Context, grant *v2.Grant) (anno
 		}
 
 		rolePos := slices.IndexFunc(roles, func(r *okta.Role) bool {
-			return r.Type == roleType && r.Status == "ACTIVE"
+			return r.Type == roleType && r.Status == userStatusActive
 		})
 		if rolePos == NF {
 			l.Warn(
@@ -332,7 +332,7 @@ func (g *ciamResourceBuilder) Revoke(ctx context.Context, grant *v2.Grant) (anno
 		}
 
 		rolePos := slices.IndexFunc(roles, func(r *okta.Role) bool {
-			return r.Type == roleType && r.Status == "ACTIVE"
+			return r.Type == roleType && r.Status == userStatusActive
 		})
 		if rolePos == NF {
 			l.Warn(

diff --git a/pkg/connector/role.go b/pkg/connector/role.go
@@ -21,6 +21,7 @@ import (
 )
 
 var errMissingRolePermissions = errors.New("okta-connectorv2: missing role permissions")
+var alreadyAssignedRole = "E0000090"
 
 // Roles that can only be assigned at the org-wide scope.
 // For full list of roles see: https://developer.okta.com/docs/reference/api/roles/#role-types
@@ -311,7 +312,7 @@ func (g *roleResourceType) Grant(ctx context.Context, principal *v2.Resource, en
 				return nil, err
 			}
 
-			if errOkta.ErrorCode == "E0000090" {
+			if errOkta.ErrorCode == alreadyAssignedRole {
 				l.Warn(
 					"okta-connector: The role specified is already assigned to the user",
 					zap.String("principal_id", principal.Id.String()),
@@ -345,7 +346,7 @@ func (g *roleResourceType) Grant(ctx context.Context, principal *v2.Resource, en
 				return nil, err
 			}
 
-			if errOkta.ErrorCode == "E0000090" {
+			if errOkta.ErrorCode == alreadyAssignedRole {
 				l.Warn(
 					"okta-connector: The role specified is already assigned to the group",
 					zap.String("principal_id", principal.Id.String()),
@@ -397,7 +398,7 @@ func (g *roleResourceType) Revoke(ctx context.Context, grant *v2.Grant) (annotat
 		}
 
 		rolePos := slices.IndexFunc(roles, func(r *okta.Role) bool {
-			return r.Type == roleType && r.Status == "ACTIVE"
+			return r.Type == roleType && r.Status == userStatusActive
 		})
 		if rolePos == NF {
 			l.Warn(
@@ -428,7 +429,7 @@ func (g *roleResourceType) Revoke(ctx context.Context, grant *v2.Grant) (annotat
 		}
 
 		rolePos := slices.IndexFunc(roles, func(r *okta.Role) bool {
-			return r.Type == roleType && r.Status == "ACTIVE"
+			return r.Type == roleType && r.Status == userStatusActive
 		})
 		if rolePos == NF {
 			l.Warn(