dbt-platform-helper 12.2.1__py3-none-any.whl → 12.2.3__py3-none-any.whl

dbt_platform_helper/commands/environment.py

@@ -71,7 +71,7 @@ def get_vpc_id(session, env_name, vpc_name=None):
     return vpcs[0]["VpcId"]
 
 
-def get_subnet_ids(session, vpc_id):
+def get_subnet_ids(session, vpc_id, environment_name):
     subnets = session.client("ec2").describe_subnets(
         Filters=[{"Name": "vpc-id", "Values": [vpc_id]}]
     )["Subnets"]
@@ -81,11 +81,41 @@ def get_subnet_ids(session, vpc_id):
         raise click.Abort
 
     public_tag = {"Key": "subnet_type", "Value": "public"}
-    public = [subnet["SubnetId"] for subnet in subnets if public_tag in subnet["Tags"]]
+    public_subnets = [subnet["SubnetId"] for subnet in subnets if public_tag in subnet["Tags"]]
     private_tag = {"Key": "subnet_type", "Value": "private"}
-    private = [subnet["SubnetId"] for subnet in subnets if private_tag in subnet["Tags"]]
+    private_subnets = [subnet["SubnetId"] for subnet in subnets if private_tag in subnet["Tags"]]
+
+    # This call and the method declaration can be removed when we stop using AWS Copilot to deploy the services
+    public_subnets, private_subnets = _match_subnet_id_order_to_cloudformation_exports(
+        session,
+        environment_name,
+        public_subnets,
+        private_subnets,
+    )
+
+    return public_subnets, private_subnets
+
+
+def _match_subnet_id_order_to_cloudformation_exports(
+    session, environment_name, public_subnets, private_subnets
+):
+    public_subnet_exports = []
+    private_subnet_exports = []
+    for page in session.client("cloudformation").get_paginator("list_exports").paginate():
+        for export in page["Exports"]:
+            if f"-{environment_name}-" in export["Name"]:
+                if export["Name"].endswith("-PublicSubnets"):
+                    public_subnet_exports = export["Value"].split(",")
+                if export["Name"].endswith("-PrivateSubnets"):
+                    private_subnet_exports = export["Value"].split(",")
+
+    # If the elements match, regardless of order, use the list from the CloudFormation exports
+    if set(public_subnets) == set(public_subnet_exports):
+        public_subnets = public_subnet_exports
+    if set(private_subnets) == set(private_subnet_exports):
+        private_subnets = private_subnet_exports
 
-    return public, private
+    return public_subnets, private_subnets
 
 
 def get_cert_arn(session, application, env_name):
@@ -142,22 +172,26 @@ def generate_terraform(name, terraform_platform_modules_version):
     )
 
 
-def _generate_copilot_environment_manifests(name, application, env_config, session):
+def _generate_copilot_environment_manifests(environment_name, application, env_config, session):
     env_template = setup_templates().get_template("env/manifest.yml")
     vpc_name = env_config.get("vpc", None)
-    vpc_id = get_vpc_id(session, name, vpc_name)
-    pub_subnet_ids, priv_subnet_ids = get_subnet_ids(session, vpc_id)
-    cert_arn = get_cert_arn(session, application, name)
+    vpc_id = get_vpc_id(session, environment_name, vpc_name)
+    pub_subnet_ids, priv_subnet_ids = get_subnet_ids(session, vpc_id, environment_name)
+    cert_arn = get_cert_arn(session, application, environment_name)
     contents = env_template.render(
         {
-            "name": name,
+            "name": environment_name,
             "vpc_id": vpc_id,
             "pub_subnet_ids": pub_subnet_ids,
             "priv_subnet_ids": priv_subnet_ids,
             "certificate_arn": cert_arn,
         }
     )
-    click.echo(mkfile(".", f"copilot/environments/{name}/manifest.yml", contents, overwrite=True))
+    click.echo(
+        mkfile(
+            ".", f"copilot/environments/{environment_name}/manifest.yml", contents, overwrite=True
+        )
+    )
 
 
 def _generate_terraform_environment_manifests(

dbt_platform_helper/domain/codebase.py

@@ -144,7 +144,7 @@ class Codebase:
         if not application.environments.get(env):
             raise ApplicationEnvironmentNotFoundError()
 
-        json.loads(self.check_codebase_exists_fn(session, application, codebase))
+        self.check_codebase_exists_fn(session, application, codebase)
 
         self.check_image_exists_fn(session, application, codebase, commit)
 

dbt_platform_helper/utils/aws.py

@@ -488,13 +488,16 @@ def start_build_extraction(codebuild_client, build_options):
 def check_codebase_exists(session: Session, application, codebase: str):
     try:
         ssm_client = session.client("ssm")
-        ssm_client.get_parameter(
-            Name=f"/copilot/applications/{application.name}/codebases/{codebase}"
-        )["Parameter"]["Value"]
+        json.loads(
+            ssm_client.get_parameter(
+                Name=f"/copilot/applications/{application.name}/codebases/{codebase}"
+            )["Parameter"]["Value"]
+        )
     except (
         KeyError,
         ValueError,
         ssm_client.exceptions.ParameterNotFound,
+        json.JSONDecodeError,
     ):
         raise CopilotCodebaseNotFoundError
 

{dbt_platform_helper-12.2.1.dist-info → dbt_platform_helper-12.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 12.2.1
+Version: 12.2.3
 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-12.2.1.dist-info → dbt_platform_helper-12.2.3.dist-info}/RECORD

@@ -10,7 +10,7 @@ dbt_platform_helper/commands/conduit.py,sha256=nOfyqZoF0Q3uYicTwfMXf4FGYC7cR1du-
 dbt_platform_helper/commands/config.py,sha256=NOHea7OAjrl6XHlW6HMLn0m0T5lFPyNH3HXoyCOWsJk,12070
 dbt_platform_helper/commands/copilot.py,sha256=i7FLSF-p9P5JQ36e_V8THXxdXG_g1hI7fHxemxQG82A,12927
 dbt_platform_helper/commands/database.py,sha256=_HnuOxlfVIFGkDotGv0SGb6oWrnm517FSvLv0aGcLJQ,3542
-dbt_platform_helper/commands/environment.py,sha256=3HALcatJMJ1-7WmHwnfazh6ulBlwtz0L7cfifDVVPtQ,7751
+dbt_platform_helper/commands/environment.py,sha256=-j-PYLHlrMH4F-DLhCCF3AYKP5z-Tzw7E8SbjMsMPnE,9209
 dbt_platform_helper/commands/generate.py,sha256=YLCPb-xcPapGcsLn-7d1Am7BpGp5l0iecIDTOdNGjHk,722
 dbt_platform_helper/commands/notify.py,sha256=kVJ0s78QMiaEWPVKu_bbMko4DW2uJy2fu8-HNJsglyk,3748
 dbt_platform_helper/commands/pipeline.py,sha256=_52bDSDa8DoyOA4VFxFJhwaiKCPHKqPtK2LWDLFaKlA,9452
@@ -19,7 +19,7 @@ dbt_platform_helper/commands/version.py,sha256=XVfSd53TDti4cceBqTmRfq_yZnvxs14Rb
 dbt_platform_helper/constants.py,sha256=HVaaO7hlQB41GrBBxcgk7hHie9tKbeYhJc-cRyYuIE0,453
 dbt_platform_helper/default-extensions.yml,sha256=SU1ZitskbuEBpvE7efc3s56eAUF11j70brhj_XrNMMo,493
 dbt_platform_helper/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_platform_helper/domain/codebase.py,sha256=sWmjkKSYh7SnuFFoLtStI6_aYwvncnoAs3xzZZctQY4,9432
+dbt_platform_helper/domain/codebase.py,sha256=_Qx6WZs-16C3Ax0gEbbtPBbl0MNmuxm2Vd42bpc8AZs,9420
 dbt_platform_helper/domain/conduit.py,sha256=nzkeFCRwEuI5QK092H50l6o2CDD4ZuCuTXLDDmsTNd4,7207
 dbt_platform_helper/domain/database_copy.py,sha256=QUw8XeUzcKccu4U33b9AKSOwCuGsONIzdmInlOzsmA4,8525
 dbt_platform_helper/domain/maintenance_page.py,sha256=NFHN_J0NthhJ1YkcOTJ8c0R8y33TrDZq3ka2fmMRM1g,15708
@@ -74,7 +74,7 @@ dbt_platform_helper/templates/svc/overrides/cfn.patches.yml,sha256=W7-d017akuUq9
 dbt_platform_helper/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_platform_helper/utils/application.py,sha256=C-t8LIFqE-rrVBNqWEGRtCd6uOt41Y2t0z9_SEZm7oE,4127
 dbt_platform_helper/utils/arn_parser.py,sha256=1jY0elpAe4YL3ulrrCf1YiKmjI-7YXz4gJASqkIFHTc,1294
-dbt_platform_helper/utils/aws.py,sha256=TkgDBelEcfBKQwiYiYZD1RMCxC4tZkRn0PyLyiM19Eo,18555
+dbt_platform_helper/utils/aws.py,sha256=Vs92jcQOJt8aL3xfnfUVX6AiQ2hRfYsf3n6eBsXjbi0,18627
 dbt_platform_helper/utils/click.py,sha256=Fx4y4bbve1zypvog_sgK7tJtCocmzheoEFLBRv1lfdM,2943
 dbt_platform_helper/utils/cloudfoundry.py,sha256=GnQ4fVLnDfOdNSrsJjI6ElZHqpgwINeoPn77cUH2UFY,484
 dbt_platform_helper/utils/files.py,sha256=pa5uwwrEFIAgXZUyH2KEr2Yiu6bKuV4EMlhn9BcUMsY,5296
@@ -86,8 +86,8 @@ dbt_platform_helper/utils/template.py,sha256=raRx4QUCVJtKfvJK08Egg6gwWcs3r3V4nPW
 dbt_platform_helper/utils/validation.py,sha256=TYLEVdTPBFArnodS9Z7V72qxZJ37GIJto3EXKuBiXFU,28944
 dbt_platform_helper/utils/versioning.py,sha256=IBxdocJ8ZyJib38d1ja87tTuFE0iJ4npaDcAHQAKQ58,10825
 platform_helper.py,sha256=bly3JkwbfwnWTZSZziu40dbgzQItsK-DIMMvL6ArFDY,1893
-dbt_platform_helper-12.2.1.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-dbt_platform_helper-12.2.1.dist-info/METADATA,sha256=gqoQ37ao1UyKerjLM6Ssic-554F8PNeAEhkYv_rtgRk,3212
-dbt_platform_helper-12.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-dbt_platform_helper-12.2.1.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
-dbt_platform_helper-12.2.1.dist-info/RECORD,,
+dbt_platform_helper-12.2.3.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+dbt_platform_helper-12.2.3.dist-info/METADATA,sha256=vl8LPxxm63TcuE74ix6QX3LaLgvhhDpcwejeblu5TO4,3212
+dbt_platform_helper-12.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+dbt_platform_helper-12.2.3.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
+dbt_platform_helper-12.2.3.dist-info/RECORD,,