dbt-platform-helper 12.0.0__tar.gz → 12.0.2__tar.gz

{dbt_platform_helper-12.0.0 → dbt_platform_helper-12.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 12.0.0
+Version: 12.0.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-12.0.0 → dbt_platform_helper-12.0.2}/dbt_platform_helper/COMMANDS.md

@@ -881,12 +881,12 @@ platform-helper version get-platform-helper-for-project
 ## Usage
 
 ```
-platform-helper version get-platform-helper-for-project [--pipeline (main|test|prod-main)] 
+platform-helper version get-platform-helper-for-project [--pipeline <pipeline>] 
 ```
 
 ## Options
 
-- `--pipeline <choice>`
+- `--pipeline <text>`
   - Take into account platform-tools version overrides in the specified pipeline
 - `--help <boolean>` _Defaults to False._
   - Show this message and exit.

{dbt_platform_helper-12.0.0 → dbt_platform_helper-12.0.2}/dbt_platform_helper/commands/version.py

@@ -1,7 +1,6 @@
 import click
 
 from dbt_platform_helper.utils.click import ClickDocOptGroup
-from dbt_platform_helper.utils.platform_config import get_environment_pipeline_names
 from dbt_platform_helper.utils.versioning import get_required_platform_helper_version
 
 
@@ -19,7 +18,7 @@ class VersionCommand:
     @click.option(
         "--pipeline",
         required=False,
-        type=click.Choice(get_environment_pipeline_names()),
+        type=str,
         help="Take into account platform-tools version overrides in the specified pipeline",
     )
     def get_platform_helper_for_project(pipeline):

{dbt_platform_helper-12.0.0 → dbt_platform_helper-12.0.2}/dbt_platform_helper/domain/maintenance_page.py

@@ -384,6 +384,13 @@ def create_header_rule(
     )
 
 
+def normalise_to_cidr(ip: str):
+    if "/" in ip:
+        return ip
+    SINGLE_IPV4_CIDR_PREFIX_LENGTH = "32"
+    return f"{ip}/{SINGLE_IPV4_CIDR_PREFIX_LENGTH}"
+
+
 def create_source_ip_rule(
     lb_client: boto3.client,
     listener_arn: str,
@@ -395,10 +402,11 @@ def create_source_ip_rule(
     conditions = get_host_conditions(lb_client, listener_arn, target_group_arn)
 
     # add new condition to existing conditions
+
     combined_conditions = [
         {
             "Field": "source-ip",
-            "SourceIpConfig": {"Values": [value + "/32" for value in values]},
+            "SourceIpConfig": {"Values": [normalise_to_cidr(value) for value in values]},
         }
     ] + conditions
 

{dbt_platform_helper-12.0.0 → dbt_platform_helper-12.0.2}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "12.0.0"
+version = "12.0.2"
 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"