dbt-platform-helper 15.5.0__py3-none-any.whl → 15.6.0__py3-none-any.whl

dbt_platform_helper/providers/vpc.py

@@ -78,11 +78,42 @@ class VpcProvider:
 
     def _get_security_groups(self, app: str, env: str, vpc_id: str) -> list:
         vpc_filter = {"Name": "vpc-id", "Values": [vpc_id]}
-        # TODO Handle terraformed environment SG https://uktrade.atlassian.net/browse/DBTP-2074
-        tag_filter = {"Name": f"tag:Name", "Values": [f"copilot-{app}-{env}-env"]}
-        response = self.ec2_client.describe_security_groups(Filters=[vpc_filter, tag_filter])
-
-        return [sg.get("GroupId") for sg in response.get("SecurityGroups")]
+        platform_sg_name = f"platform-{app}-{env}-env-sg"
+        copilot_sg_name = f"copilot-{app}-{env}-env"
+        tag_filter = {"Name": f"tag:Name", "Values": [copilot_sg_name, platform_sg_name]}
+
+        filtered_security_groups = self.ec2_client.describe_security_groups(
+            Filters=[vpc_filter, tag_filter]
+        )
+
+        platform_security_groups = self._get_matching_security_groups(
+            filtered_security_groups, platform_sg_name
+        )
+
+        if platform_security_groups:
+            print(
+                f"using {platform_security_groups}"
+            )  # TODO remove this once decopilotiing has been completed
+            return platform_security_groups
+
+        copilot_security_groups = self._get_matching_security_groups(
+            filtered_security_groups, copilot_sg_name
+        )
+
+        print(
+            f"using {copilot_security_groups}"
+        )  # TODO remove this once decopilotiing has been completed
+        return copilot_security_groups
+
+    def _get_matching_security_groups(
+        self, filtered_security_groups: list[dict], security_group_name: str
+    ):
+        matching_sec_groups = filtered_security_groups.get("SecurityGroups")
+        return [
+            sg.get("GroupId")
+            for sg in matching_sec_groups
+            if {"Key": "Name", "Value": security_group_name} in sg.get("Tags", [])
+        ]
 
     def get_vpc(self, app: str, env: str, vpc_name: str) -> Vpc:
 

dbt_platform_helper/utils/aws.py

@@ -158,7 +158,17 @@ def get_ssm_secrets(app, env, session=None, path=None):
     secrets = []
 
     while True:
-        response = client.get_parameters_by_path(**params)
+        try:
+            response = client.get_parameters_by_path(**params)
+        except ClientError as e:
+            if e.response["Error"]["Code"] == "AccessDeniedException":
+                click.secho(
+                    "Access denied on SSM, due to missing permissions. Please update your environment infrastructure.",
+                    fg="magenta",
+                )
+                break
+            else:
+                raise e
 
         for secret in response["Parameters"]:
             secrets.append((secret["Name"], secret["Value"]))

{dbt_platform_helper-15.5.0.dist-info → dbt_platform_helper-15.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-platform-helper
-Version: 15.5.0
+Version: 15.6.0
 Summary: Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot.
 License: MIT
 Author: Department for Business and Trade Platform Team

{dbt_platform_helper-15.5.0.dist-info → dbt_platform_helper-15.6.0.dist-info}/RECORD

@@ -62,7 +62,7 @@ dbt_platform_helper/providers/terraform_manifest.py,sha256=Qst0GwLyOgHgmli3gVciV
 dbt_platform_helper/providers/validation.py,sha256=i2g-Mrd4hy_fGIfGa6ZQy4vTJ40OM44Fe_XpEifGWxs,126
 dbt_platform_helper/providers/version.py,sha256=QNGrV5nyJi0JysXowYUU4OrXGDn27WmFezlV8benpdY,4251
 dbt_platform_helper/providers/version_status.py,sha256=qafnhZrEc9k1cvXJpvJhkGj6WtkzcsoQhqS_Y6JXy48,929
-dbt_platform_helper/providers/vpc.py,sha256=V8kXXzy-JuRpuzZhI9xyfcNky-eD42K0v_uM2WejLoo,3048
+dbt_platform_helper/providers/vpc.py,sha256=KdgwyHv2RwNpq16Sa2FtWm7DMJlTNmsPbXkbMNMYiQo,4082
 dbt_platform_helper/providers/yaml_file.py,sha256=LZ8eCPDQRr1wlck13My5hQa0eE2OVhSomm-pOIuZ9h0,2881
 dbt_platform_helper/templates/.copilot/config.yml,sha256=J_bA9sCtBdCPBRImpCBRnYvhQd4vpLYIXIU-lq9vbkA,158
 dbt_platform_helper/templates/.copilot/image_build_run.sh,sha256=adYucYXEB-kAgZNjTQo0T6EIAY8sh_xCEvVhWKKQ8mw,164
@@ -92,7 +92,7 @@ dbt_platform_helper/utilities/decorators.py,sha256=rS6ohsuo0bc6fkZP98Qwaeh0c_v2M
 dbt_platform_helper/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_platform_helper/utils/application.py,sha256=414czQmCUMDohoz38cY8FjoitJolCmRxCqc9TMJTsE4,6951
 dbt_platform_helper/utils/arn_parser.py,sha256=BaXzIxSOLdFmP_IfAxRq-0j-0Re1iCN7L4j2Zi5-CRQ,1304
-dbt_platform_helper/utils/aws.py,sha256=O3L5Lg2idq597WYNe0GQiW9gHfoeL5XiQbtJ1r_1K-o,12710
+dbt_platform_helper/utils/aws.py,sha256=mnffVJzvXojfmYh1waeUWwHYo24jRu95rXg8LiuogtA,13096
 dbt_platform_helper/utils/click.py,sha256=Fx4y4bbve1zypvog_sgK7tJtCocmzheoEFLBRv1lfdM,2943
 dbt_platform_helper/utils/git.py,sha256=9jyLhv37KKE6r-_hb3zvjhTbluA81kdrOdNeG6MB-_M,384
 dbt_platform_helper/utils/messages.py,sha256=nWA7BWLb7ND0WH5TejDN4OQUJSKYBxU4tyCzteCrfT0,142
@@ -102,8 +102,8 @@ platform_helper.py,sha256=_YNNGtMkH5BcpC_mQQYJrmlf2mt7lkxTYeH7ZgflPoA,1925
 terraform/elasticache-redis/plans.yml,sha256=efJfkLuLC_5TwhLb9DalKHOuZFO79y6iei6Dg_tqKjI,1831
 terraform/opensearch/plans.yml,sha256=lQbUSNMGfvUeDMcGx8mSwzGQhMJU3EZ4J4tPzPKaq6c,1471
 terraform/postgres/plans.yml,sha256=plwCklW1VB_tNJFyUduRMZx9UANgiWH_7TGLWUaUEus,2553
-dbt_platform_helper-15.5.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-dbt_platform_helper-15.5.0.dist-info/METADATA,sha256=1RI8g5Z8DCJITAgBzSjUo-8Pf2eTDF1u8oDIj_0yW9I,3293
-dbt_platform_helper-15.5.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dbt_platform_helper-15.5.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
-dbt_platform_helper-15.5.0.dist-info/RECORD,,
+dbt_platform_helper-15.6.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+dbt_platform_helper-15.6.0.dist-info/METADATA,sha256=t3DF_0fn1sT4hseK6F1MZ4H-GaMClJKiU2RaS5ZK_Gc,3293
+dbt_platform_helper-15.6.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dbt_platform_helper-15.6.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
+dbt_platform_helper-15.6.0.dist-info/RECORD,,