dbt-platform-helper 10.9.1__tar.gz → 10.10.0__tar.gz

{dbt_platform_helper-10.9.1 → dbt_platform_helper-10.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 10.9.1
+Version: 10.10.0
 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.9.1 → dbt_platform_helper-10.10.0}/dbt_platform_helper/commands/copilot.py

@@ -222,6 +222,9 @@ def _get_s3_kms_alias_arns(session, application_name, config):
         if environment_name not in config:
             continue
 
+        if "bucket_name" not in config[environment_name]:
+            continue
+
         bucket_name = config[environment_name]["bucket_name"]
         kms_client = application.environments[environment_name].session.client("kms")
         alias_name = f"alias/{application_name}-{environment_name}-{bucket_name}-key"
@@ -313,6 +316,8 @@ def make_addons():
         log_destination_arns = get_log_destination_arn()
 
         if addon_type in ["s3", "s3-policy"]:
+            if config[addon_name].get("serve_static_content"):
+                continue
             if is_terraform:
                 s3_kms_arns = _get_s3_kms_alias_arns(session, application_name, environments)
                 for environment_name in environments:

{dbt_platform_helper-10.9.1 → dbt_platform_helper-10.10.0}/dbt_platform_helper/custom_resources/s3_object.py

@@ -72,10 +72,12 @@ def handler(event, context):
                 Key=properties["S3ObjectKey"],
             )
         else:
+            content_type = properties.get("S3ObjectContentType", "binary/octet-stream")
             s3_client.put_object(
                 Bucket=properties["S3Bucket"],
                 Key=properties["S3ObjectKey"],
                 Body=properties["S3ObjectBody"].encode("utf-8"),
+                ContentType=content_type,
             )
 
         send_response(event, context, "SUCCESS", f"{request_type}d")

{dbt_platform_helper-10.9.1 → dbt_platform_helper-10.10.0}/dbt_platform_helper/templates/addons/env/s3.yml

@@ -201,6 +201,9 @@ Resources:
       S3Bucket: !Ref {{ addon_config.prefix }}Bucket
       S3ObjectKey: {{ s3object.key }}
       S3ObjectBody: {{ s3object.body }}
+      {% if s3object.content_type %} 
+      S3ObjectContentType: {{ s3object.content_type }}
+      {% endif %}
 {% endfor %}
 {% endif %}
 

{dbt_platform_helper-10.9.1 → dbt_platform_helper-10.10.0}/dbt_platform_helper/utils/validation.py

@@ -308,6 +308,7 @@ DATA_MIGRATION = {
 
 S3_BASE = {
     Optional("readonly"): bool,
+    Optional("serve_static_content"): bool,
     Optional("services"): Or("__all__", [str]),
     Optional("environments"): {
         ENV_NAME: {
@@ -328,12 +329,7 @@ S3_DEFINITION = dict(S3_BASE)
 S3_DEFINITION.update(
     {
         "type": "s3",
-        Optional("objects"): [
-            {
-                "key": str,
-                Optional("body"): str,
-            }
-        ],
+        Optional("objects"): [{"key": str, Optional("body"): str, Optional("content_type"): str}],
     }
 )
 

{dbt_platform_helper-10.9.1 → dbt_platform_helper-10.10.0}/pyproject.toml

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