dbt-platform-helper 10.7.0__py3-none-any.whl → 10.7.2__py3-none-any.whl

dbt_platform_helper/templates/pipelines/codebase/overrides/buildspec.deploy.yml

@@ -10,15 +10,8 @@ env:
 phases:
   build:
     commands:
-      - |
-        environments="{{environments}}"
-        echo "Environments are - ${environments}"
-        if echo ",${environments}," | grep -q ",${COPILOT_ENVIRONMENT},"; then
-          echo "Copilot environment is ${COPILOT_ENVIRONMENT}"
-          /work/cli deploy --send-notifications
-        else
-          exit 1
-        fi
+      - echo "Copilot environment is ${COPILOT_ENVIRONMENT}"
+      - /work/cli deploy --send-notifications
 
   post_build:
     commands:

dbt_platform_helper/templates/pipelines/environments/buildspec.yml

@@ -14,21 +14,24 @@ phases:
           echo "Cannot find .copilot-version file"
           exit 1
         fi
+      - COPILOT_VERSION=$(cat .copilot-version)
+      # Install pyyaml and dbt-platform-helper
+      - pip install PyYAML dbt-platform-helper
+      # Reinstall if we require a different version to the latest
+      - CURRENT_PLATFORM_HELPER_VERSION=$(platform-helper --version)
+      - export PLATFORM_HELPER_VERSION=$(platform-helper version get-platform-helper-for-project)
       - |
-        if [ ! -f .platform-helper-version ]; then
-          echo "Cannot find .platform-helper-version file"
-          exit 1
+        if [ ! "${PLATFORM_HELPER_VERSION}" == "${CURRENT_PLATFORM_HELPER_VERSION}" ]
+        then
+          pip uninstall dbt-platform-helper
+          pip install dbt-platform-helper==$PLATFORM_HELPER_VERSION
         fi
-      - COPILOT_VERSION=`cat .copilot-version`
-      - PLATFORM_HELPER_VERSION=`cat .platform-helper-version`
       - mkdir ./build-tools
       - cd ./build-tools
       # Install copilot
       - wget -q "https://ecs-cli-v2-release.s3.amazonaws.com/copilot-linux-v${COPILOT_VERSION}"
       - mv "./copilot-linux-v${COPILOT_VERSION}" ./copilot
       - chmod +x ./copilot
-      # Install pyyaml and dbt-platform-helper
-      - pip install PyYAML dbt-platform-helper==$PLATFORM_HELPER_VERSION
       # Install dyff - yaml differ
       - wget -q "https://github.com/homeport/dyff/releases/download/v${DYFF_VERSION}/dyff_${DYFF_VERSION}_linux_amd64.tar.gz"
       - tar -zxvf "dyff_${DYFF_VERSION}_linux_amd64.tar.gz"
@@ -36,7 +39,6 @@ phases:
   build:
     commands:
       - cd $CODEBUILD_SRC_DIR
-      - PLATFORM_HELPER_VERSION=`cat .platform-helper-version`
       - cp -r copilot/ current-copilot/
       - platform-helper copilot make-addons
       - >

dbt_platform_helper/utils/versioning.py

@@ -40,7 +40,7 @@ class PlatformHelperVersions:
         self.latest_release = latest_release
         self.platform_helper_file_version = platform_helper_file_version
         self.platform_config_default = platform_config_default
-        self.pipeline_overrides = pipeline_overrides
+        self.pipeline_overrides = pipeline_overrides if pipeline_overrides else {}
 
 
 def string_version(input_version: VersionTuple) -> str:
@@ -164,12 +164,12 @@ def _process_version_file_warnings(versions: PlatformHelperVersions):
         )
 
     if not versions.platform_config_default and not versions.platform_helper_file_version:
-        messages.append(f"Cannot get dbt-platform-helper version from '{PLATFORM_CONFIG_FILE}'.")
-        messages.append(
-            f"{missing_default_version_message}{string_version(versions.local_version)}\n"
-        )
+        message = f"Cannot get dbt-platform-helper version from '{PLATFORM_CONFIG_FILE}'.\n"
+        message += f"{missing_default_version_message}{string_version(versions.local_version)}\n"
+        click.secho(message, fg="red")
 
-    click.secho("\n".join(messages), fg="yellow")
+    if messages:
+        click.secho("\n".join(messages), fg="yellow")
 
 
 def validate_version_compatibility(
@@ -245,7 +245,9 @@ def check_platform_helper_version_mismatch():
 
     versions = get_platform_helper_versions()
     local_version = versions.local_version
-    platform_helper_file_version = versions.platform_helper_file_version
+    platform_helper_file_version = parse_version(
+        get_required_platform_helper_version(versions=versions)
+    )
 
     if not check_version_on_file_compatibility(local_version, platform_helper_file_version):
         message = (
@@ -259,8 +261,11 @@ def running_as_installed_package():
     return "site-packages" in __file__
 
 
-def get_required_platform_helper_version(pipeline: str = None) -> str:
-    versions = get_platform_helper_versions()
+def get_required_platform_helper_version(
+    pipeline: str = None, versions: PlatformHelperVersions = None
+) -> str:
+    if not versions:
+        versions = get_platform_helper_versions()
     pipeline_version = versions.pipeline_overrides.get(pipeline)
     version_precedence = [
         pipeline_version,
@@ -271,4 +276,9 @@ def get_required_platform_helper_version(pipeline: str = None) -> str:
         string_version(v) if isinstance(v, tuple) else v for v in version_precedence if v
     ]
 
-    return non_null_version_precedence[0] if non_null_version_precedence else None
+    out = non_null_version_precedence[0] if non_null_version_precedence else None
+
+    if not out:
+        raise SystemExit(1)
+
+    return out

{dbt_platform_helper-10.7.0.dist-info → dbt_platform_helper-10.7.2.dist-info}/METADATA

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

@@ -63,7 +63,7 @@ dbt_platform_helper/templates/environments/main.tf,sha256=6tgxyGLvllZCiN2ryYwNM6
 dbt_platform_helper/templates/pipelines/codebase/manifest.yml,sha256=Mby5ri_w0K9r3cJVdUN-c9adnu2cVvDgHpY4qvHggCE,1980
 dbt_platform_helper/templates/pipelines/codebase/overrides/.gitignore,sha256=duFipE4GPjdkrYo-sO1jjCXdmSMoYNoFJLZ19lUKfL0,169
 dbt_platform_helper/templates/pipelines/codebase/overrides/bin/override.ts,sha256=iD6Tsl8YTd3DW7NDk6ythkROmtX2OouU8DMSeWAqd_Y,227
-dbt_platform_helper/templates/pipelines/codebase/overrides/buildspec.deploy.yml,sha256=5YJMb2fzW4wSDI7sw-7fdDXs4q7jDh44qrsoLPaM-ZU,1314
+dbt_platform_helper/templates/pipelines/codebase/overrides/buildspec.deploy.yml,sha256=neXXpwjCrNRPTOxec3m8nRIFZ0bI4zq2WaPHf5eSU_Y,1090
 dbt_platform_helper/templates/pipelines/codebase/overrides/buildspec.image.yml,sha256=oHtRzH27IXJRyORWp7zvtjln-kTf3FgTdc9W_pBFBfU,1480
 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
@@ -71,7 +71,7 @@ dbt_platform_helper/templates/pipelines/codebase/overrides/package.json,sha256=X
 dbt_platform_helper/templates/pipelines/codebase/overrides/stack.ts,sha256=vJNqtku74BEJ_sew1485_JQLKxpozI4md08tokg2LgE,20895
 dbt_platform_helper/templates/pipelines/codebase/overrides/tsconfig.json,sha256=k6KabP-WwhFNgA1AFHNuonTEAnES6eR74jUuYUJEGOM,651
 dbt_platform_helper/templates/pipelines/codebase/overrides/types.ts,sha256=Sp4nEppsreaY1nKZC2q3lditLtMP9lUOKAIzdd4M2yM,1214
-dbt_platform_helper/templates/pipelines/environments/buildspec.yml,sha256=NPeoJQA1GYXdtiyz3kfThWIqlE93E52H3G2lNTqPPjA,3199
+dbt_platform_helper/templates/pipelines/environments/buildspec.yml,sha256=hTCUhSfrnTUMOpUo8EjQmvit2aX7J0cKNeqV2DChaA0,3365
 dbt_platform_helper/templates/pipelines/environments/manifest.yml,sha256=UyHL6wH2mznldZIyjPSbG72yO6zErglNcaoliHOKYvM,1765
 dbt_platform_helper/templates/pipelines/environments/overrides/cfn.patches.yml,sha256=VLjm3Dz4clUz44B5RSQy7mu1sRzm7Yf2S_TSnor_b_k,638
 dbt_platform_helper/templates/svc/maintenance_pages/default.html,sha256=OTZ-qwwSXu7PFbsgp4kppdm1lsg_iHK7FCFqhPnvrEs,741
@@ -94,10 +94,10 @@ dbt_platform_helper/utils/messages.py,sha256=aLx6s9utt__IqlDdeIYq4n82ERwludu2Zfq
 dbt_platform_helper/utils/platform_config.py,sha256=dEGB6peHB1ywYSdS71JGxbWIuTFRaeQfWelksX9v6bQ,608
 dbt_platform_helper/utils/template.py,sha256=raRx4QUCVJtKfvJK08Egg6gwWcs3r3V4nPWcJW4xNhA,574
 dbt_platform_helper/utils/validation.py,sha256=OPajVss8pWth_3FD_1iPodNjeysTZ28-dMEvMRc4I1c,22735
-dbt_platform_helper/utils/versioning.py,sha256=T11gQN9CHHFkYJj62xQ97F-pwGOIHqR7LkjWZKkEQPs,10199
+dbt_platform_helper/utils/versioning.py,sha256=ceLM5yvhfDl2PpY6yNoZlKUgqE_xZ9NyasLdVN1b3F0,10435
 platform_helper.py,sha256=zjsZKcbyrEQbKfERi0JG8JEL-MgG6EjxIMiWT66kCVg,2299
-dbt_platform_helper-10.7.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-dbt_platform_helper-10.7.0.dist-info/METADATA,sha256=jzYB4TmSs22HpAMiTc4ETSt3_aRVHGhf8ck1LUkD7O8,3126
-dbt_platform_helper-10.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dbt_platform_helper-10.7.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
-dbt_platform_helper-10.7.0.dist-info/RECORD,,
+dbt_platform_helper-10.7.2.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+dbt_platform_helper-10.7.2.dist-info/METADATA,sha256=Vr8eLzkCy6xS_5_xbo9HxGDZSov9dR93VheqccO-2Rs,3126
+dbt_platform_helper-10.7.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dbt_platform_helper-10.7.2.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
+dbt_platform_helper-10.7.2.dist-info/RECORD,,