dbt-platform-helper 10.7.4__tar.gz → 10.8.1__tar.gz

{dbt_platform_helper-10.7.4 → dbt_platform_helper-10.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 10.7.4
+Version: 10.8.1
 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
@@ -24,7 +24,7 @@ Requires-Dist: cfn-lint (>=1.4.2,<2.0.0)
 Requires-Dist: checkov (>=3.1.67,<4.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: cloudfoundry-client (==1.35.2)
-Requires-Dist: cryptography (>=41.0.3,<43.0.0)
+Requires-Dist: cryptography (>=41.0.3,<44.0.0)
 Requires-Dist: jinja2-simple-tags (>=0.5.0,<0.6.0)
 Requires-Dist: jsonschema (>=4.17.0,<4.18.0)
 Requires-Dist: mypy-boto3-codebuild (>=1.26.0.post1,<2.0.0)

{dbt_platform_helper-10.7.4 → dbt_platform_helper-10.8.1}/dbt_platform_helper/templates/pipelines/codebase/overrides/stack.ts

@@ -177,33 +177,38 @@ export class TransformedStack extends cdk.Stack {
 
         const currentEnvironment = buildProject.environment as cdk.aws_codebuild.CfnProject.EnvironmentProperty;
         const currentEnvironmentVariables = currentEnvironment.environmentVariables as Array<cdk.aws_codebuild.CfnProject.EnvironmentVariableProperty>;
+        const deployEnvironmentVariables = [
+            ...currentEnvironmentVariables,
+            {
+                name: 'CODESTAR_CONNECTION_ID',
+                value: this.codestarConnection.id
+            },
+            {
+                name: 'DEPLOY_REPOSITORY',
+                value: this.deployRepository
+            },
+            {
+                name: 'CODEBASE_REPOSITORY',
+                value: this.codebaseConfiguration.repository
+            },
+            {
+                name: 'COPILOT_SERVICES',
+                value: this.codebaseConfiguration.services.join(' ')
+            },
+            {
+                name: 'ECR_REPOSITORY',
+                value: this.ecrRepository()
+            },
+        ];
+
+        if (this.codebaseConfiguration.deploy_repository_branch){
+            deployEnvironmentVariables.push({name: 'DEPLOY_REPOSITORY_BRANCH', value: this.codebaseConfiguration.deploy_repository_branch})
+        }
 
         buildProject.environment = {
             ...buildProject.environment,
             image: 'public.ecr.aws/uktrade/ci-image-builder:tag-latest',
-            environmentVariables: [
-                ...currentEnvironmentVariables,
-                {
-                    name: 'CODESTAR_CONNECTION_ID',
-                    value: this.codestarConnection.id
-                },
-                {
-                    name: 'DEPLOY_REPOSITORY',
-                    value: this.deployRepository
-                },
-                {
-                    name: 'CODEBASE_REPOSITORY',
-                    value: this.codebaseConfiguration.repository
-                },
-                {
-                    name: 'COPILOT_SERVICES',
-                    value: this.codebaseConfiguration.services.join(' ')
-                },
-                {
-                    name: 'ECR_REPOSITORY',
-                    value: this.ecrRepository()
-                },
-            ]
+            environmentVariables: deployEnvironmentVariables
         } as cdk.aws_codebuild.CfnProject.EnvironmentProperty;
 
         const currentSource = buildProject.source as cdk.aws_codebuild.CfnProject.SourceProperty;

{dbt_platform_helper-10.7.4 → dbt_platform_helper-10.8.1}/dbt_platform_helper/templates/pipelines/codebase/overrides/types.ts

@@ -26,6 +26,7 @@ export interface PipelinesConfiguration {
     codebase_pipelines: Array<{
         name: string;
         repository: string;
+        deploy_repository_branch?: string;
         additional_ecr_repository?: string;
         services: Array<string>;
         pipelines: Array<{

{dbt_platform_helper-10.7.4 → dbt_platform_helper-10.8.1}/dbt_platform_helper/utils/validation.py

@@ -204,6 +204,7 @@ POSTGRES_PLANS = Or(
     "small-ha",
     "small-high-io",
     "medium",
+    "medium-ha",
     "medium-high-io",
     "large",
     "large-ha",
@@ -346,6 +347,8 @@ OPENSEARCH_DEFINITION = {
             Optional("index_slow_log_retention_in_days"): int,
             Optional("audit_log_retention_in_days"): int,
             Optional("search_slow_log_retention_in_days"): int,
+            Optional("password_special_characters"): str,
+            Optional("urlencode_password"): bool,
         }
     },
 }
@@ -409,6 +412,7 @@ CODEBASE_PIPELINES_DEFINITION = [
         "name": str,
         "repository": str,
         Optional("additional_ecr_repository"): str,
+        Optional("deploy_repository_branch"): str,
         "services": list[str],
         "pipelines": [
             Or(

{dbt_platform_helper-10.7.4 → dbt_platform_helper-10.8.1}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "10.7.4"
+version = "10.8.1"
 description = "Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot."
 authors = ["Department for Business and Trade Platform Team <sre-team@digital.trade.gov.uk>"]
 license = "MIT"
@@ -30,7 +30,7 @@ schema = "0.7.5"
 cfn-flip = "1.3.0"
 aiohttp = "^3.8.4"
 certifi = ">=2023.7.22,<2025.0.0"
-cryptography = ">=41.0.3,<43.0.0"
+cryptography = ">=41.0.3,<44.0.0"
 jinja2-simple-tags = "^0.5.0"
 requests = "^2.31.0"
 prettytable = "^3.9.0"