pkg/cluster: Use Action for fixupClusterSPObjectID

Azure · Jul 16, 2024 · ffca22b · ffca22b
1 parent d9800f0
commit ffca22b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/cluster/adminupdate_test.go b/pkg/cluster/adminupdate_test.go
@@ -36,7 +36,7 @@ func TestAdminUpdateSteps(t *testing.T) {
 		"[Action initializeKubernetesClients]",
 		"[Action ensureBillingRecord]",
 		"[Action ensureDefaults]",
-		"[AuthorizationRetryingAction fixupClusterSPObjectID]",
+		"[Action fixupClusterSPObjectID]",
 		"[Action fixInfraID]",
 	}
 

diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go
@@ -86,11 +86,7 @@ func (m *manager) getZerothSteps() []steps.Step {
 		steps.Action(m.initializeKubernetesClients), // must be first
 		steps.Action(m.ensureBillingRecord),         // belt and braces
 		steps.Action(m.ensureDefaults),
-
-		// 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.fixupClusterSPObjectID),
+		steps.Action(m.fixupClusterSPObjectID),
 	}
 
 	// Generic fix-up actions that are fairly safe to always take, and don't require a running cluster