Update aws.py

jordan-evans · Nov 22, 2021 · b2f636f · b2f636f
1 parent 3e03a6f
commit b2f636f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/servicecatalog_puppet/aws.py b/servicecatalog_puppet/aws.py
@@ -552,7 +552,7 @@ def get_version_id_for(servicecatalog, product_id, version_name):
 def get_portfolio_for(servicecatalog, portfolio_name):
     result = None
 
-    response = servicecatalog.list_accepted_portfolio_shares(PortfolioShareType='AWS_ORGANIZATIONS')
+    response = servicecatalog.list_accepted_portfolio_shares()
     assert response.get('NextPageToken') is None, "Pagination not supported"
     for portfolio_detail in response.get('PortfolioDetails'):
         if portfolio_detail.get('DisplayName') == portfolio_name:
@@ -566,6 +566,14 @@ def get_portfolio_for(servicecatalog, portfolio_name):
                 result = portfolio_detail
                 break
 
+    if result is None:            
+        response = servicecatalog.list_accepted_portfolio_shares(PortfolioShareType='AWS_ORGANIZATIONS')
+        assert response.get('NextPageToken') is None, "Pagination not supported"
+        for portfolio_detail in response.get('PortfolioDetails'):
+            if portfolio_detail.get('DisplayName') == portfolio_name:
+                result = portfolio_detail
+                break
+
     assert result is not None, "Could not find portfolio"
     return result