address comments

Azure · Apr 29, 2024 · 45a6eab · 45a6eab
1 parent a893321
commit 45a6eab
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 12 deletions.
diff --git a/pkg/api/v20191231preview/openshiftcluster_convert.go b/pkg/api/v20191231preview/openshiftcluster_convert.go
@@ -46,8 +46,7 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 		},
 	}
 
-	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
+	if oc.Properties.ServicePrincipalProfile != nil {		
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/api/v20200430/openshiftcluster_convert.go b/pkg/api/v20200430/openshiftcluster_convert.go
@@ -47,7 +47,6 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/api/v20210901preview/openshiftcluster_convert.go b/pkg/api/v20210901preview/openshiftcluster_convert.go
@@ -50,7 +50,6 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/api/v20220401/openshiftcluster_convert.go b/pkg/api/v20220401/openshiftcluster_convert.go
@@ -50,7 +50,6 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/api/v20220401/openshiftcluster_validatestatic.go b/pkg/api/v20220401/openshiftcluster_validatestatic.go
@@ -181,6 +181,10 @@ func (sv openShiftClusterStaticValidator) validateConsoleProfile(path string, cp
 }
 
 func (sv openShiftClusterStaticValidator) validateServicePrincipalProfile(path string, spp *ServicePrincipalProfile) error {
+	if spp == nil {
+		return nil
+	}
+
 	valid := uuid.IsValid(spp.ClientID)
 	if !valid {
 		return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".clientId", "The provided client ID '%s' is invalid.", spp.ClientID)

diff --git a/pkg/api/v20220904/openshiftcluster_convert.go b/pkg/api/v20220904/openshiftcluster_convert.go
@@ -50,7 +50,6 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/api/v20230701preview/openshiftcluster_convert.go b/pkg/api/v20230701preview/openshiftcluster_convert.go
@@ -51,7 +51,6 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
 	}
 
 	if oc.Properties.ServicePrincipalProfile != nil {
-		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{}
 		out.Properties.ServicePrincipalProfile = &ServicePrincipalProfile{
 			ClientID:     oc.Properties.ServicePrincipalProfile.ClientID,
 			ClientSecret: string(oc.Properties.ServicePrincipalProfile.ClientSecret),

diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go
@@ -187,15 +187,10 @@ func (m *manager) Update(ctx context.Context) error {
 		steps.AuthorizationRetryingAction(m.fpAuthorizer, m.validateResources),
 		steps.Action(m.initializeKubernetesClients), // All init steps are first
 		steps.Action(m.initializeOperatorDeployer),  // depends on kube clients
-		steps.Action(m.initializeClusterSPClients),
 		// Since ServicePrincipalProfile is now a pointer and our converters re-build the struct,
 		// our update path needs to enrich the doc with SPObjectID since it was overwritten by our API on put/patch.
 		steps.AuthorizationRetryingAction(m.fpAuthorizer, m.fixupClusterSPObjectID),
 
-		// TODO: this relies on an authorizer that isn't exposed in the manager
-		// struct, so we'll rebuild the fpAuthorizer and use the error catching
-		// to advance
-		steps.AuthorizationRetryingAction(m.fpAuthorizer, m.clusterSPObjectID),
 		// credentials rotation flow steps
 		steps.Action(m.createOrUpdateClusterServicePrincipalRBAC),
 		steps.Action(m.createOrUpdateDenyAssignment),