dbt-platform-helper 10.6.0__tar.gz → 10.6.1__tar.gz

{dbt_platform_helper-10.6.0 → dbt_platform_helper-10.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 10.6.0
+Version: 10.6.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

{dbt_platform_helper-10.6.0 → dbt_platform_helper-10.6.1}/dbt_platform_helper/commands/codebase.py

@@ -86,6 +86,38 @@ def prepare():
         click.echo(mkfile(Path("./.copilot"), f"phases/{phase}.sh", phase_contents, overwrite=True))
 
 
+def list_latest_images(ecr_client, ecr_repository_name, codebase_repository):
+    paginator = ecr_client.get_paginator("describe_images")
+    describe_images_response_iterator = paginator.paginate(
+        repositoryName=ecr_repository_name,
+        filter={"tagStatus": "TAGGED"},
+    )
+    images = []
+    for page in describe_images_response_iterator:
+        images += page["imageDetails"]
+
+    sorted_images = sorted(
+        images,
+        key=lambda i: i["imagePushedAt"],
+        reverse=True,
+    )
+
+    MAX_RESULTS = 20
+
+    for image in sorted_images[:MAX_RESULTS]:
+        try:
+            commit_tag = next(t for t in image["imageTags"] if t.startswith("commit-"))
+            if not commit_tag:
+                continue
+
+            commit_hash = commit_tag.replace("commit-", "")
+            click.echo(
+                f"  - https://github.com/{codebase_repository}/commit/{commit_hash} - published: {image['imagePushedAt']}"
+            )
+        except StopIteration:
+            continue
+
+
 @codebase.command()
 @click.option("--app", help="AWS application name", required=True)
 @click.option(
@@ -116,29 +148,9 @@ def list(app, with_images):
     for codebase in codebases:
         click.echo(f"- {codebase['name']} (https://github.com/{codebase['repository']})")
         if with_images:
-            describe_images_response = ecr_client.describe_images(
-                repositoryName=f"{application.name}/{codebase['name']}",
-                maxResults=20,
-                filter={"tagStatus": "TAGGED"},
+            list_latest_images(
+                ecr_client, f"{application.name}/{codebase['name']}", codebase["repository"]
             )
-            images = sorted(
-                describe_images_response["imageDetails"],
-                key=lambda i: i["imagePushedAt"],
-                reverse=True,
-            )
-
-            for image in images:
-                try:
-                    commit_tag = next(t for t in image["imageTags"] if t.startswith("commit-"))
-                    if not commit_tag:
-                        continue
-
-                    commit_hash = commit_tag.replace("commit-", "")
-                    click.echo(
-                        f"  - https://github.com/{codebase['repository']}/commit/{commit_hash} - published: {image['imagePushedAt']}"
-                    )
-                except StopIteration:
-                    continue
 
     click.echo("")
 

{dbt_platform_helper-10.6.0 → dbt_platform_helper-10.6.1}/dbt_platform_helper/templates/environments/main.tf

@@ -36,3 +36,12 @@ module "extensions" {
   environment = "{{ environment }}"
   vpc_name    = "{{ config.vpc }}"
 }
+
+/* 
+Clean up because terraform modules were initially deployed with a -tf suffix.  This block moves those modules to naming without a suffix.
+Can be removed once all services have moved to the new naming.
+*/
+moved {
+  from = module.extensions-tf
+  to   = module.extensions
+}

{dbt_platform_helper-10.6.0 → dbt_platform_helper-10.6.1}/pyproject.toml

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