use UsesWorkloadIdentity() helper function instead of bespoke check

Azure · Aug 6, 2024 · d5f333c · d5f333c
1 parent 2cea8eb
commit d5f333c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cluster/denyassignment.go b/pkg/cluster/denyassignment.go
@@ -17,7 +17,7 @@ func (m *manager) createOrUpdateDenyAssignment(ctx context.Context) error {
 	}
 
 	// needed for AdminUpdate so it would not block other steps
-	if m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile == nil && m.doc.OpenShiftCluster.Properties.PlatformWorkloadIdentityProfile == nil {
+	if !m.doc.OpenShiftCluster.UsesWorkloadIdentity() && m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile.SPObjectID == "" {
 		m.log.Print("skipping createOrUpdateDenyAssignment: ServicePrincipalProfile and PlatformWorkloadIdentityProfile are empty")
 		return nil
 	}

diff --git a/pkg/cluster/deploybaseresources_additional.go b/pkg/cluster/deploybaseresources_additional.go
@@ -21,7 +21,7 @@ import (
 
 func (m *manager) denyAssignment() *arm.Resource {
 	excludePrincipals := []mgmtauthorization.Principal{}
-	if m.doc.OpenShiftCluster.Properties.PlatformWorkloadIdentityProfile != nil && m.doc.OpenShiftCluster.Properties.ServicePrincipalProfile == nil {
+	if m.doc.OpenShiftCluster.UsesWorkloadIdentity() {
 		for _, identity := range m.doc.OpenShiftCluster.Properties.PlatformWorkloadIdentityProfile.PlatformWorkloadIdentities {
 			excludePrincipals = append(excludePrincipals, mgmtauthorization.Principal{
 				ID:   &identity.ObjectID,