dbt-platform-helper 10.11.0__py3-none-any.whl → 10.11.2__py3-none-any.whl

dbt_platform_helper/commands/conduit.py

@@ -5,6 +5,7 @@ import subprocess
 import time
 
 import click
+from botocore.exceptions import ClientError
 from cfn_tools import dump_yaml
 from cfn_tools import load_yaml
 
@@ -12,6 +13,7 @@ from dbt_platform_helper.utils.application import Application
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.aws import update_postgres_parameter_with_master_secret
 from dbt_platform_helper.utils.click import ClickDocOptCommand
+from dbt_platform_helper.utils.messages import abort_with_error
 from dbt_platform_helper.utils.platform_config import is_terraform_project
 from dbt_platform_helper.utils.versioning import (
     check_platform_helper_version_needs_update,
@@ -207,15 +209,19 @@ def create_addon_client_task(
     elif addon_type == "redis" or addon_type == "opensearch":
         secret_name += "_ENDPOINT"
 
+    role_name = f"{addon_name}-{app.name}-{env}-conduitEcsTask"
+
     try:
-        session.client("iam").get_role(
-            RoleName=f"{app.name}-{addon_type}-{app.name}-{env}-conduitEcsTask"
-        )
-        execution_role = (
-            f"--execution-role {app.name}-{addon_type}-{app.name}-{env}-conduitEcsTask "
-        )
-    except:
+        session.client("iam").get_role(RoleName=role_name)
+        execution_role = f"--execution-role {role_name} "
+    except ClientError as ex:
         execution_role = ""
+        # We cannot check for botocore.errorfactory.NoSuchEntityException as botocore generates that class on the fly as part of errorfactory.
+        # factory. Checking the error code is the recommended way of handling these exceptions.
+        if ex.response.get("Error", {}).get("Code", None) != "NoSuchEntity":
+            abort_with_error(
+                f"cannot obtain Role {role_name}: {ex.response.get('Error', {}).get('Message', '')}"
+            )
 
     subprocess.call(
         f"copilot task run --app {app.name} --env {env} "

dbt_platform_helper/templates/pipelines/codebase/overrides/stack.ts

@@ -84,7 +84,7 @@ export class TransformedStack extends cdk.Stack {
             envVars.push({name: 'ADDITIONAL_ECR_REPOSITORY', value: this.additionalEcrRepository()});
         }
 
-        new cdk.aws_codebuild.CfnProject(this, 'ImageBuildProject', {
+        const imageBuildProject: cdk.aws_codebuild.CfnProject = new cdk.aws_codebuild.CfnProject(this, 'ImageBuildProject', {
             name: `codebuild-${this.appName}-${this.pipelineManifest.name}`,
             description: `Publish images on push to ${this.codebaseConfiguration.repository}`,
             badgeEnabled: true,
@@ -122,6 +122,9 @@ export class TransformedStack extends cdk.Stack {
                 )),
             },
         });
+
+        imageBuildProject.node.addDependency(this.template.getResource("BuildProjectRole") as cdk.aws_iam.CfnRole);
+        imageBuildProject.node.addDependency(this.template.getResource("BuildProjectPolicy") as cdk.aws_iam.CfnPolicy);
     }
 
     private createECRRepository() {
@@ -403,7 +406,10 @@ export class TransformedStack extends cdk.Stack {
         const buildProjectPolicy = this.template.getResource("BuildProjectPolicy") as cdk.aws_iam.CfnPolicy;
         (buildProjectPolicy.policyDocument.Statement as Array<any>).push({
             Effect: 'Allow',
-            Action: ['codestar-connections:UseConnection'],
+            Action: [
+                'codestar-connections:GetConnectionToken',
+                'codestar-connections:UseConnection',
+            ],
             Resource: [this.codestarConnection.arn],
         });
     }

{dbt_platform_helper-10.11.0.dist-info → dbt_platform_helper-10.11.2.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ dbt_platform_helper/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 dbt_platform_helper/commands/application.py,sha256=1XTBfdZBDj1vOFkAWjTxxTNFtko4YB9Q0_tVdxavwAo,9957
 dbt_platform_helper/commands/check_cloudformation.py,sha256=aLif3yMHKuZO0uvdUjTH9FdRZNIpCqtWvE3aFQMozoc,3226
 dbt_platform_helper/commands/codebase.py,sha256=NchJzH-yxv5mXCe2rPyXVNHmXGEvjFUv0KhMKYsLNNQ,11380
-dbt_platform_helper/commands/conduit.py,sha256=M_-Lrcph4c4PFivfEzDEL2_PW_OzZaOtZXpgo_Ao3DU,14882
+dbt_platform_helper/commands/conduit.py,sha256=SjuVhTcmyokCIF7OI8E5YxRgkyHc0C5lt72waCJfML0,15395
 dbt_platform_helper/commands/config.py,sha256=NOHea7OAjrl6XHlW6HMLn0m0T5lFPyNH3HXoyCOWsJk,12070
 dbt_platform_helper/commands/copilot.py,sha256=euid0FTlVtwKmBQ6vxt_HxtBdRYiVQvb-9CyrK1-MWc,16724
 dbt_platform_helper/commands/database.py,sha256=-DacXZ2LhwV3CRukG35urEU2TuNVZHppUA3EhbBNjUs,4840
@@ -68,7 +68,7 @@ dbt_platform_helper/templates/pipelines/codebase/overrides/buildspec.image.yml,s
 dbt_platform_helper/templates/pipelines/codebase/overrides/cdk.json,sha256=ZbvoQdcj_k9k1GAD9qHUQcDfQPbMcBPjJwt2mu_S6ho,339
 dbt_platform_helper/templates/pipelines/codebase/overrides/package-lock.json,sha256=Is83o58QXbeg2SkHmR79ATt91aFhVbO7kb1VF0qXpY8,152671
 dbt_platform_helper/templates/pipelines/codebase/overrides/package.json,sha256=XB0Pf63NSsGyowkPGTl1Nki167nRDXJdnxLSN3S_lQg,536
-dbt_platform_helper/templates/pipelines/codebase/overrides/stack.ts,sha256=ugImQjc15sBCvQSbciOeHX2lnoTY_dkepjwFn5ueNNo,21117
+dbt_platform_helper/templates/pipelines/codebase/overrides/stack.ts,sha256=v9m6EziRgFnrhF7inbr1KtuOh75FeC054vaWMoAi-qg,21500
 dbt_platform_helper/templates/pipelines/codebase/overrides/tsconfig.json,sha256=k6KabP-WwhFNgA1AFHNuonTEAnES6eR74jUuYUJEGOM,651
 dbt_platform_helper/templates/pipelines/codebase/overrides/types.ts,sha256=8cp5xl_CIMH5TPvwlw9UBPKwfntcsu-lTAjbL5uylgw,1257
 dbt_platform_helper/templates/pipelines/environments/buildspec.yml,sha256=hTCUhSfrnTUMOpUo8EjQmvit2aX7J0cKNeqV2DChaA0,3365
@@ -96,8 +96,8 @@ dbt_platform_helper/utils/template.py,sha256=raRx4QUCVJtKfvJK08Egg6gwWcs3r3V4nPW
 dbt_platform_helper/utils/validation.py,sha256=2XMizmCGk4oTVU67q72cdc8eyOzL0wxhe7DframhQ8Q,23699
 dbt_platform_helper/utils/versioning.py,sha256=h3veQpFoiOjYY9dRVppcBDzVfgZerT0lXuE9QCTo5-c,10710
 platform_helper.py,sha256=zjsZKcbyrEQbKfERi0JG8JEL-MgG6EjxIMiWT66kCVg,2299
-dbt_platform_helper-10.11.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-dbt_platform_helper-10.11.0.dist-info/METADATA,sha256=R2rfcAwazxqT20_XZoW-CZeaGjBLSuHIJSchxQJ4Kh4,3127
-dbt_platform_helper-10.11.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dbt_platform_helper-10.11.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
-dbt_platform_helper-10.11.0.dist-info/RECORD,,
+dbt_platform_helper-10.11.2.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+dbt_platform_helper-10.11.2.dist-info/METADATA,sha256=lA9wUd7Bp-AE9Xj3bjVp0xzTYQgSBnjcUNawTnj9bfk,3127
+dbt_platform_helper-10.11.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dbt_platform_helper-10.11.2.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
+dbt_platform_helper-10.11.2.dist-info/RECORD,,