now allowing multiple hops through accounts (#31)

awslabs · May 3, 2019 · e437a03 · e437a03
1 parent 5fa7ff8
commit e437a03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/servicecatalog_puppet/cli.py b/servicecatalog_puppet/cli.py
@@ -78,10 +78,20 @@ def deploy(f, single_account):
 
 @cli.command()
 @click.argument('puppet_account_id')
-@click.argument('iam_role_arn')
-def bootstrap_spoke_as(puppet_account_id, iam_role_arn):
-    with betterboto_client.CrossAccountClientContextManager('cloudformation', iam_role_arn,
-                                                            'bootstrapping') as cloudformation:
+@click.argument('iam_role_arn', nargs=-1)
+def bootstrap_spoke_as(puppet_account_id, roles):
+    cross_accounts = []
+    index = 0
+    for role in roles:
+        cross_accounts.append(
+            (role, 'bootstrapping-role-{}'.format(index))
+        )
+        index += 1
+
+    with betterboto_client.CrossMultipleAccountsClientContextManager(
+        'cloudformation',
+        cross_accounts
+    ) as cloudformation:
         do_bootstrap_spoke(puppet_account_id, cloudformation, get_puppet_version())
 
 

diff --git a/servicecatalog_puppet/requirements.txt b/servicecatalog_puppet/requirements.txt
@@ -3,6 +3,6 @@ Jinja2==2.10.1
 click==7.0
 boto3==1.9.102
 pykwalify==1.7.0
-better-boto==0.6.14
+better-boto==0.6.18
 terminaltables==3.1.0
 colorclass==2.2.0
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setuptools.setup(
     name="aws-service-catalog-puppet",
-    version="0.0.31",
+    version="0.0.32",
     author="Eamonn Faherty",
     author_email="aws-service-catalog-tools@amazon.com",
     description="Making it easier to deploy ServiceCatalog products",