refactor(scope): GetIdentityRefFromObjects

factorize identityRef lookup from multiple object to implement logic of identityRef's inheritage in one place (scope factory)

Signed-off-by: MatthieuFin <[email protected]>

Author: MatthieuFin

controllers/openstackmachine_controller.go

@@ -392,9 +392,9 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 		Address: instanceStatus.Name(),
 	})
 	openStackMachine.Status.Addresses = addresses
-	if openStackMachine.Spec.IdentityRef == nil {
-		openStackMachine.Spec.IdentityRef = &openStackCluster.Spec.IdentityRef
-	}
+
+	_, identityRef := r.ScopeFactory.GetIdentityRefFromObjects(openStackMachine, openStackCluster)
+	openStackMachine.Spec.IdentityRef = identityRef
 
 	_, identityRef := r.ScopeFactory.GetIdentityRefFromObjects(openStackMachine, openStackCluster)
 	openStackMachine.Spec.IdentityRef = identityRef

test/e2e/shared/common.go

@@ -198,7 +198,7 @@ func (o OpenStackLogCollector) CollectMachineLog(ctx context.Context, management
 	if m.Spec.ProviderID == nil {
 		return fmt.Errorf("unable to get logs for machine since it has no provider ID")
 	}
-	providerID := getIDFromProviderID(*m.Spec.ProviderID)
+	providerID := GetIDFromProviderID(*m.Spec.ProviderID)
 
 	consolLog, err := GetOpenStackServerConsoleLog(o.E2EContext, providerID)
 	if err != nil {