fixes integration tests

aws-controllers-k8s · Aug 6, 2024 · 2dcd12c · 2dcd12c
1 parent 447c4bb
commit 2dcd12c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/runtime/adoption_reconciler.go b/pkg/runtime/adoption_reconciler.go
@@ -517,14 +517,14 @@ func (r *adoptionReconciler) getEndpointURL(
 	return r.cfg.EndpointURL
 }
 
-// getRoleARN return the Role ARN that should be assumed for account ID
+// getOwnerAccountRoleARN return the Role ARN that should be assumed for account ID
 // in order to manage the resources.
 func (r *adoptionReconciler) getOwnerAccountRoleARN(
 	acctID ackv1alpha1.AWSAccountID,
 ) (ackv1alpha1.AWSResourceName, error) {
-	globalAccountID := ackrtcache.OwnerAccountIDPrefix + string(acctID)
 	// v2
 	if r.cfg.FeatureGates.IsEnabled(featuregate.FeatureCARMv2) {
+		globalAccountID := ackrtcache.OwnerAccountIDPrefix + string(acctID)
 		// use service level roleARN if present
 		serviceAccountID := r.sc.GetMetadata().ServiceAlias + "." + globalAccountID
 		if roleARN, err := r.cache.CARMMaps.GetValue(serviceAccountID); err == nil {
@@ -538,7 +538,7 @@ func (r *adoptionReconciler) getOwnerAccountRoleARN(
 		return ackv1alpha1.AWSResourceName(roleARN), nil
 	}
 	// v1
-	roleARN, err := r.cache.Accounts.GetValue(globalAccountID)
+	roleARN, err := r.cache.Accounts.GetValue(string(acctID))
 	if err != nil {
 		return "", fmt.Errorf("retrieving role ARN for accountID %q from %q configMap: %v", acctID, ackrtcache.ACKRoleAccountMap, err)
 	}

diff --git a/pkg/runtime/reconciler.go b/pkg/runtime/reconciler.go
@@ -1140,9 +1140,9 @@ func (r *resourceReconciler) getTeamID(
 func (r *resourceReconciler) getOwnerAccountRoleARN(
 	acctID ackv1alpha1.AWSAccountID,
 ) (ackv1alpha1.AWSResourceName, error) {
-	globalAccountID := ackrtcache.OwnerAccountIDPrefix + string(acctID)
 	// v2
 	if r.cfg.FeatureGates.IsEnabled(featuregate.FeatureCARMv2) {
+		globalAccountID := ackrtcache.OwnerAccountIDPrefix + string(acctID)
 		// use service level roleARN if present
 		serviceAccountID := r.sc.GetMetadata().ServiceAlias + "." + globalAccountID
 		if roleARN, err := r.cache.CARMMaps.GetValue(serviceAccountID); err == nil {
@@ -1156,7 +1156,7 @@ func (r *resourceReconciler) getOwnerAccountRoleARN(
 		return ackv1alpha1.AWSResourceName(roleARN), nil
 	}
 	// v1
-	roleARN, err := r.cache.Accounts.GetValue(globalAccountID)
+	roleARN, err := r.cache.Accounts.GetValue(string(acctID))
 	if err != nil {
 		return "", fmt.Errorf("retrieving role ARN for accountID %q from %q configMap: %v", acctID, ackrtcache.ACKRoleAccountMap, err)
 	}