adding c7n support and fixing undetected failures in codebuild runs

awslabs · Mar 9, 2023 · 39e89f2 · 39e89f2
1 parent f61ea8d
commit 39e89f2
Show file tree

Hide file tree

Showing 146 changed files with 1,070 additions and 148 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "aws-service-catalog-puppet"
-version = "0.226.2"
+version = "0.227.0"
 description = "Making it easier to deploy ServiceCatalog products"
 classifiers = ["Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Programming Language :: Python :: 3", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Natural Language :: English"]
 homepage = "https://service-catalog-tools-workshop.com/"

diff --git a/servicecatalog_puppet/__init__.py b/servicecatalog_puppet/__init__.py
@@ -1,2 +1,2 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
diff --git a/servicecatalog_puppet/asset_helpers.py b/servicecatalog_puppet/asset_helpers.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import os

diff --git a/servicecatalog_puppet/asset_helpers_unit_test.py b/servicecatalog_puppet/asset_helpers_unit_test.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import os
 from unittest import mock as mocker

diff --git a/servicecatalog_puppet/aws.py b/servicecatalog_puppet/aws.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/servicecatalog_puppet/cli.py b/servicecatalog_puppet/cli.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import json

diff --git a/servicecatalog_puppet/commands/__init__.py b/servicecatalog_puppet/commands/__init__.py
@@ -1,2 +1,2 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
diff --git a/servicecatalog_puppet/commands/bootstrap.py b/servicecatalog_puppet/commands/bootstrap.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import io

diff --git a/servicecatalog_puppet/commands/graph.py b/servicecatalog_puppet/commands/graph.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 from servicecatalog_puppet import serialisation_utils
 

diff --git a/servicecatalog_puppet/commands/management.py b/servicecatalog_puppet/commands/management.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import glob
 import os

diff --git a/servicecatalog_puppet/commands/manifest.py b/servicecatalog_puppet/commands/manifest.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import json
 import logging

diff --git a/servicecatalog_puppet/commands/misc.py b/servicecatalog_puppet/commands/misc.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import json

diff --git a/servicecatalog_puppet/commands/orgs.py b/servicecatalog_puppet/commands/orgs.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/servicecatalog_puppet/commands/show_codebuilds.py b/servicecatalog_puppet/commands/show_codebuilds.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import json
 import logging

diff --git a/servicecatalog_puppet/commands/show_pipelines.py b/servicecatalog_puppet/commands/show_pipelines.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import datetime
 import json

diff --git a/servicecatalog_puppet/commands/spoke_management.py b/servicecatalog_puppet/commands/spoke_management.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/servicecatalog_puppet/commands/task_reference.py b/servicecatalog_puppet/commands/task_reference.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import logging
 import os

diff --git a/servicecatalog_puppet/commands/task_reference_helpers/complete_generator.py b/servicecatalog_puppet/commands/task_reference_helpers/complete_generator.py
@@ -1,4 +1,4 @@
-#  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 import copy
 
@@ -27,6 +27,7 @@ def generate(puppet_account_id, manifest, output_file_path):
     organizations_to_share_with = dict()
     ous_to_share_with = dict()
     accounts_to_share_with = dict()
+
     for a in manifest.get("accounts", []):
         if a.get("organization"):
             organizations_to_share_with[a.get("organization")] = True
@@ -86,7 +87,6 @@ def generate(puppet_account_id, manifest, output_file_path):
                 task_to_add["item_name"] = item_name
                 # set up for later pass
                 task_to_add["dependencies_by_reference"] = [constants.CREATE_POLICIES]
-
                 task_reference = graph.escape(
                     f"{task_to_add.get('ou_name', task_to_add.get('account_id'))}-{task_to_add.get('region')}"
                 )
@@ -190,6 +190,7 @@ def generate(puppet_account_id, manifest, output_file_path):
                     section_name,
                     task_reference,
                     task_to_add,
+                    manifest,
                 )
 
     #