Merge branch 'main' into mchavez-fix-goreleaser

ConductorOne · Jul 10, 2024 · 5d81d83 · 5d81d83
2 parents e3f690e + aac2440
commit 5d81d83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/connector/app.go b/pkg/connector/app.go
@@ -341,12 +341,12 @@ func appEntitlement(ctx context.Context, resource *v2.Resource, permission strin
 	return &v2.Entitlement{
 		Id:          fmtResourceRole(resource.Id, permission),
 		Resource:    resource,
-		DisplayName: fmt.Sprintf("%s app access", resource.DisplayName),
-		Description: fmt.Sprintf("Has access to the %s app in Okta", resource.DisplayName),
+		DisplayName: fmt.Sprintf("%s App %s", resource.DisplayName, permission),
+		Description: fmt.Sprintf("Can %s on Okta app %s", permission, resource.DisplayName),
 		Annotations: annos,
 		GrantableTo: []*v2.ResourceType{resourceTypeGroup, resourceTypeUser},
 		Purpose:     v2.Entitlement_PURPOSE_VALUE_ASSIGNMENT,
-		Slug:        resource.DisplayName,
+		Slug:        fmt.Sprintf("%s - %s", resource.DisplayName, permission),
 	}
 }
 

diff --git a/pkg/connector/group.go b/pkg/connector/group.go
@@ -311,12 +311,12 @@ func (o *groupResourceType) groupEntitlement(ctx context.Context, resource *v2.R
 	return &v2.Entitlement{
 		Id:          fmtResourceRole(resource.Id, permission),
 		Resource:    resource,
-		DisplayName: fmt.Sprintf("%s Group Member", resource.DisplayName),
-		Description: fmt.Sprintf("Member of %s group in Okta", resource.DisplayName),
+		DisplayName: fmt.Sprintf("%s Group %s", resource.DisplayName, permission),
+		Description: fmt.Sprintf("%s in Okta group %s", permission, resource.DisplayName),
 		Annotations: annos,
 		GrantableTo: []*v2.ResourceType{resourceTypeUser},
 		Purpose:     v2.Entitlement_PURPOSE_VALUE_ASSIGNMENT,
-		Slug:        resource.DisplayName,
+		Slug:        fmt.Sprintf("%s - %s", resource.DisplayName, permission),
 	}
 }