Merge pull request #156 from a-hilaly/rm-rolearn

Update `AWSResourceManagerFactory` to include `roleARN` paramter
aws-controllers-k8s · Aug 29, 2024 · a606fd1 · a606fd1
2 parents 63238ad + 9fdb7f0
commit a606fd1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/mocks/pkg/types/aws_resource_manager_factory.go b/mocks/pkg/types/aws_resource_manager_factory.go
diff --git a/pkg/runtime/adoption_reconciler.go b/pkg/runtime/adoption_reconciler.go
@@ -168,7 +168,7 @@ func (r *adoptionReconciler) reconcile(ctx context.Context, req ctrlrt.Request)
 	ackrtlog.InfoAdoptedResource(r.log, res, "starting adoption reconciliation")
 
 	rm, err := rmf.ManagerFor(
-		r.cfg, r.log, r.metrics, r, sess, acctID, region,
+		r.cfg, r.log, r.metrics, r, sess, acctID, region, roleARN,
 	)
 	if err != nil {
 		return err

diff --git a/pkg/runtime/reconciler.go b/pkg/runtime/reconciler.go
@@ -285,7 +285,7 @@ func (r *resourceReconciler) Reconcile(ctx context.Context, req ctrlrt.Request)
 	)
 
 	rm, err := r.rmf.ManagerFor(
-		r.cfg, r.log, r.metrics, r, sess, acctID, region,
+		r.cfg, r.log, r.metrics, r, sess, acctID, region, roleARN,
 	)
 	if err != nil {
 		return ctrlrt.Result{}, err

diff --git a/pkg/types/aws_resource_manager.go b/pkg/types/aws_resource_manager.go
@@ -106,6 +106,7 @@ type AWSResourceManagerFactory interface {
 		*session.Session,
 		ackv1alpha1.AWSAccountID,
 		ackv1alpha1.AWSRegion,
+		ackv1alpha1.AWSResourceName,
 	) (AWSResourceManager, error)
 	// IsAdoptable returns true if the resource is able to be adopted
 	IsAdoptable() bool