Update aws.py

jordan-evans · Nov 23, 2021 · cfc1ee2 · cfc1ee2
1 parent b2f636f
commit cfc1ee2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/servicecatalog_puppet/aws.py b/servicecatalog_puppet/aws.py
@@ -559,20 +559,20 @@ def get_portfolio_for(servicecatalog, portfolio_name):
             result = portfolio_detail
             break
 
-    if result is None:
-        response = servicecatalog.list_portfolios_single_page()
-        for portfolio_detail in response.get('PortfolioDetails', []):
-            if portfolio_detail.get('DisplayName') == 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
+
+    if result is None:
+        response = servicecatalog.list_portfolios_single_page()
+        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