@aws/nx-plugin 0.109.0 → 0.110.0

package/src/utils/files/terraform/src/core/runtime-config/read/read.tf.template

@@ -4,23 +4,79 @@ terraform {
       source  = "hashicorp/local"
       version = "~> 2.0"
     }
+    null = {
+      source  = "hashicorp/null"
+      version = ">= 3.0"
+    }
   }
 }
 
 variable "namespace" {
-  description = "Namespace to read (e.g., 'connection'). If not set, reads all namespaces."
+  description = "Namespace to read (e.g., 'connection')."
   type        = string
   default     = "connection"
 }
 
 locals {
-  config_dir       = "${path.module}/../../../../../../../dist/packages/common/terraform/runtime-config"
-  config_file_path = "${local.config_dir}/${var.namespace}.json"
+  config_dir      = "${path.module}/../../../../../../../dist/packages/common/terraform/runtime-config"
+  entries_dir     = "${local.config_dir}/entries/${var.namespace}"
+  namespace_path  = "${local.config_dir}/${var.namespace}.json"
+}
+
+# Aggregate leaf entry files into the namespace JSON on every apply. The
+# `entry` module writes `local_file` resources into `entries/<namespace>/`,
+# and the same aggregation runs in the `appconfig` module — we duplicate
+# it here so `read` can be used independently (eg the static-website
+# module reads `connection.json` without needing an AppConfig application).
+resource "null_resource" "aggregate_namespace" {
+  triggers = {
+    namespace = var.namespace
+    always    = timestamp()
+  }
+
+  provisioner "local-exec" {
+    command = <<-EOT
+      uv run python -c "
+import json
+import pathlib
+import sys
+
+entries_dir = pathlib.Path('${local.entries_dir}')
+output_file = pathlib.Path('${local.namespace_path}')
+
+def deep_merge(target: dict, source: dict) -> dict:
+    for k, v in source.items():
+        if k in target and isinstance(target[k], dict) and isinstance(v, dict):
+            deep_merge(target[k], v)
+        else:
+            target[k] = v
+    return target
+
+merged: dict = {}
+if entries_dir.is_dir():
+    for entry_path in sorted(entries_dir.glob('*.json')):
+        section = entry_path.stem.rsplit('-', 1)[0]
+        try:
+            contribution = json.loads(entry_path.read_text())
+        except json.JSONDecodeError as e:
+            print(f'Skipping malformed entry {entry_path}: {e}', file=sys.stderr)
+            continue
+        existing = merged.get(section)
+        if isinstance(existing, dict) and isinstance(contribution, dict):
+            deep_merge(existing, contribution)
+        else:
+            merged[section] = contribution
+
+output_file.parent.mkdir(parents=True, exist_ok=True)
+output_file.write_text(json.dumps(merged, indent=2))
+"
+    EOT
+  }
 }
 
-# Read the namespaced runtime config file
 data "local_file" "runtime_config" {
-  filename = local.config_file_path
+  filename   = local.namespace_path
+  depends_on = [null_resource.aggregate_namespace]
 }
 
 # Outputs

package/src/utils/function-constructs/files/terraform/app/lambda-functions/__functionNameKebabCase__/__functionNameKebabCase__.tf.template

@@ -1,3 +1,16 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 6.0"
+    }
+    archive = {
+      source  = "hashicorp/archive"
+      version = "~> 2.0"
+    }
+  }
+}
+
 variable "tags" {
   description = "Tags to apply to resources"
   type        = map(string)
@@ -20,12 +33,17 @@ variable "additional_iam_policy_statements" {
   default = []
 }
 
+variable "asset_bucket_name" {
+  description = "Name of the shared asset S3 bucket used to stage the Lambda deployment zip. Instantiate the `core/asset-bucket` module once per deployment and pass its `bucket_name` output here."
+  type        = string
+}
+
 data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 locals {
   aws_account_id = data.aws_caller_identity.current.account_id
-  aws_region     = data.aws_region.current.name
+  aws_region     = data.aws_region.current.region
 }
 
 resource "random_string" "suffix" {
@@ -100,19 +118,29 @@ data "archive_file" "lambda_zip" {
   output_path = "${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/<%- functionNameKebabCase %>/lambda.zip"
 }
 
+resource "aws_s3_object" "lambda_zip" {
+  bucket      = var.asset_bucket_name
+  key         = "lambdas/<%- functionNameKebabCase %>/${data.archive_file.lambda_zip.output_base64sha256}.zip"
+  source      = data.archive_file.lambda_zip.output_path
+  source_hash = data.archive_file.lambda_zip.output_base64sha256
+  etag        = data.archive_file.lambda_zip.output_md5
+}
+
 resource "aws_lambda_function" "lambda_function" {
   #checkov:skip=CKV_AWS_117:Lambda function does not need to be in VPC for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
   #checkov:skip=CKV_AWS_115:Concurrent execution limit not required for this use case
   #checkov:skip=CKV_AWS_173:Lambda environment variables encrypted by managed key
-  filename         = data.archive_file.lambda_zip.output_path
-  function_name    = "<%- functionNameKebabCase %>-${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_role.arn
-  handler         = "<%- handler %>"
-  source_code_hash = data.archive_file.lambda_zip.output_base64sha256
-  runtime         = "<%- runtime %>"
-  timeout         = 30
+  s3_bucket         = aws_s3_object.lambda_zip.bucket
+  s3_key            = aws_s3_object.lambda_zip.key
+  s3_object_version = aws_s3_object.lambda_zip.version_id
+  function_name     = "<%- functionNameKebabCase %>-${random_string.suffix.result}"
+  role              = aws_iam_role.lambda_role.arn
+  handler           = "<%- handler %>"
+  source_code_hash  = data.archive_file.lambda_zip.output_base64sha256
+  runtime           = "<%- runtime %>"
+  timeout           = 30
 
   tracing_config {
     mode = "Active"

package/src/utils/identity-constructs/files/terraform/core/user-identity/identity/identity.tf.template

@@ -65,7 +65,7 @@ resource "aws_iam_role" "cognito_sms_role" {
             "aws:SourceAccount" = data.aws_caller_identity.current.account_id
           }
           ArnLike = {
-            "aws:SourceArn" = "arn:aws:cognito-idp:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:userpool/*"
+            "aws:SourceArn" = "arn:aws:cognito-idp:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:userpool/*"
           }
         }
       }
@@ -124,7 +124,7 @@ resource "aws_cognito_user_pool" "user_pool" {
   sms_configuration {
     external_id    = random_uuid.sms_external_id.result
     sns_caller_arn = aws_iam_role.cognito_sms_role.arn
-    sns_region     = data.aws_region.current.name
+    sns_region     = data.aws_region.current.region
   }
 
   depends_on = [aws_iam_role_policy.cognito_sms_policy]
@@ -250,13 +250,13 @@ resource "aws_cognito_user_pool_client" "web_client" {
   callback_urls = concat([
     "http://localhost:4200",
     "http://localhost:4300",
-    "https://${data.aws_region.current.name}.console.aws.amazon.com"
+    "https://${data.aws_region.current.region}.console.aws.amazon.com"
   ], var.callback_urls)
 
   logout_urls = concat([
     "http://localhost:4200",
     "http://localhost:4300",
-    "https://${data.aws_region.current.name}.console.aws.amazon.com"
+    "https://${data.aws_region.current.region}.console.aws.amazon.com"
   ], var.logout_urls)
 
   # Security settings
@@ -379,7 +379,7 @@ module "add_cognito_to_runtime_config" {
   namespace = "connection"
   key       = "cognitoProps"
   value = {
-    region              = data.aws_region.current.name
+    region              = data.aws_region.current.region
     identityPoolId      = aws_cognito_identity_pool.identity_pool.id
     userPoolId          = aws_cognito_user_pool.user_pool.id
     userPoolWebClientId = aws_cognito_user_pool_client.web_client.id
@@ -389,7 +389,7 @@ module "add_cognito_to_runtime_config" {
 # Outputs
 output "region" {
   description = "AWS region"
-  value       = data.aws_region.current.name
+  value       = data.aws_region.current.region
 }
 
 output "user_pool_id" {

package/src/utils/pnpm-workspace.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Tree } from '@nx/devkit';
+/**
+ * Merge `allowBuilds` (pnpm 11) / `onlyBuiltDependencies` (pnpm 10) entries
+ * into the generated workspace's `pnpm-workspace.yaml`. No-op for non-pnpm
+ * workspaces.
+ *
+ * Generators call this when they introduce a dependency whose install
+ * script pnpm would otherwise reject under pnpm 11's default
+ * `strictDepBuilds=true`. Keeping the allowlist explicit — rather than
+ * globally disabling strictness — preserves the supply-chain audit pnpm 11
+ * intends: each build-script dep is reviewed by the generator author and
+ * entered as either `true` (run the script) or `false` (known dep we
+ * don't want to run but have seen).
+ *
+ * Only `true` entries are also added to `onlyBuiltDependencies` (pnpm 10's
+ * allowlist has no equivalent of the `false` decision).
+ */
+export declare const registerPnpmBuiltDependencies: (tree: Tree, entries: Record<string, boolean>) => void;

package/src/utils/pnpm-workspace.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerPnpmBuiltDependencies = void 0;
+const tslib_1 = require("tslib");
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const devkit_1 = require("@nx/devkit");
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const WORKSPACE_FILE = 'pnpm-workspace.yaml';
+/**
+ * Merge `allowBuilds` (pnpm 11) / `onlyBuiltDependencies` (pnpm 10) entries
+ * into the generated workspace's `pnpm-workspace.yaml`. No-op for non-pnpm
+ * workspaces.
+ *
+ * Generators call this when they introduce a dependency whose install
+ * script pnpm would otherwise reject under pnpm 11's default
+ * `strictDepBuilds=true`. Keeping the allowlist explicit — rather than
+ * globally disabling strictness — preserves the supply-chain audit pnpm 11
+ * intends: each build-script dep is reviewed by the generator author and
+ * entered as either `true` (run the script) or `false` (known dep we
+ * don't want to run but have seen).
+ *
+ * Only `true` entries are also added to `onlyBuiltDependencies` (pnpm 10's
+ * allowlist has no equivalent of the `false` decision).
+ */
+const registerPnpmBuiltDependencies = (tree, entries) => {
+    if ((0, devkit_1.detectPackageManager)(tree.root) !== 'pnpm') {
+        return;
+    }
+    if (!tree.exists(WORKSPACE_FILE)) {
+        return;
+    }
+    const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';
+    const parsed = js_yaml_1.default.load(original) ?? {};
+    const allowBuilds = { ...(parsed.allowBuilds ?? {}) };
+    const onlyBuiltDependencies = new Set(parsed.onlyBuiltDependencies ?? []);
+    let changed = false;
+    for (const [pkg, decision] of Object.entries(entries)) {
+        if (allowBuilds[pkg] !== decision) {
+            allowBuilds[pkg] = decision;
+            changed = true;
+        }
+        if (decision === true && !onlyBuiltDependencies.has(pkg)) {
+            onlyBuiltDependencies.add(pkg);
+            changed = true;
+        }
+    }
+    if (!changed) {
+        return;
+    }
+    parsed.allowBuilds = allowBuilds;
+    parsed.onlyBuiltDependencies = [...onlyBuiltDependencies];
+    tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
+};
+exports.registerPnpmBuiltDependencies = registerPnpmBuiltDependencies;
+//# sourceMappingURL=pnpm-workspace.js.map

package/src/utils/pnpm-workspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pnpm-workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pnpm-workspace.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAwD;AACxD,8DAA2B;AAE3B,MAAM,cAAc,GAAG,qBAAqB,CAAC;AAQ7C;;;;;;;;;;;;;;;GAeG;AACI,MAAM,6BAA6B,GAAG,CAC3C,IAAU,EACV,OAAgC,EAC1B,EAAE;IACR,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,MAAM,WAAW,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;IAC1E,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,qBAAqB,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAE1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AArCW,QAAA,6BAA6B,iCAqCxC"}

package/src/utils/shared-constructs.js

@@ -63,9 +63,10 @@ async function sharedConstructsGenerator(tree, options) {
                 projectConfig.targets['reset-runtime-config'] = {
                     executor: 'nx:run-commands',
                     options: {
-                        command: "node -e \"const fs=require('fs');fs.mkdirSync(process.env.DIST_DIR,{recursive:true});fs.writeFileSync(process.env.DIST_DIR+'/runtime-config.json','{}');\"",
+                        command: 'tsx scripts/reset-runtime-config.ts',
+                        cwd: '{projectRoot}',
                         env: {
-                            DIST_DIR: 'dist/{projectRoot}',
+                            DIST_DIR: '{workspaceRoot}/dist/{projectRoot}',
                         },
                     },
                 };
@@ -81,6 +82,7 @@ async function sharedConstructsGenerator(tree, options) {
             (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {}, {
                 overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
             });
+            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['tsx']));
             await (0, format_1.formatFilesInSubtree)(tree);
         }
     }

package/src/utils/shared-constructs.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":";;AAiCA,8DAsHC;;AAvJD;;;GAGG;AACH,uCAQoB;AACpB,2CAA8D;AAC9D,4EAAqD;AACrD,uFAAuE;AACvE,yCAA0C;AAC1C,qCAAgD;AAChD,+CAAiE;AACjE,+EAMuC;AACvC,0CAAuD;AAOhD,KAAK,UAAU,yBAAyB,CAC7C,IAAU,EACV,OAAyC;IAEzC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,eAAe,CAAC,IAAI,CAAC,CAAC;IAEtB,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;QAC1B,IACE,CAAC,IAAI,CAAC,MAAM,CACV,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,cAAc,CAAC,CACvE,EACD,CAAC;YACD,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,oDAAsB;gBAC5B,SAAS,EAAE,0CAAY;gBACvB,YAAY,EAAE,mDAAqB;aACpC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,KAAK,CAAC,CAC9D,CAAC;YACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,mDAAqB,EAAE,KAAK,CAAC,EACnE,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,KAAK,CAAC,EAC7D;gBACE,cAAc;gBACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC;gBACxC,IAAI,EAAE,CAAC,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE;aACtD,EACD;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;aAClD,CACF,CAAC;YACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,CAAC,EACtD;gBACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,oDAAsB,EAAE;gBAChE,IAAI,EAAE,oDAAsB;gBAC5B,SAAS,EAAE,IAAA,8CAAgC,GAAE,CAAC,IAAI;aACnD,EACD;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;aAC/C,CACF,CAAC;YACF,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,EAC3C,IAAA,uBAAY,EAAC,CAAC,aAAa,CAAC,CAAC,CAC9B,CAAC;YACF,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;QAChC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,0CAAY,EACZ,kDAAoB,CACrB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;YACtE,MAAM,IAAA,mBAAyB,EAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,mDAAqB;gBAC3B,SAAS,EAAE,IAAA,0BAAiB,EAAC,0CAAY,EAAE,QAAQ,CAAC;gBACpD,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;YAEH,0FAA0F;YAC1F,gGAAgG;YAChG,iDAAiD;YACjD,+FAA+F;YAC/F,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,kDAAoB,EAAE,cAAc,CAAC,EACrE,CAAC,aAAmC,EAAE,EAAE;gBACtC,aAAa,CAAC,OAAO,KAAK,EAAE,CAAC;gBAC7B,aAAa,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG;oBAC9C,QAAQ,EAAE,iBAAiB;oBAC3B,OAAO,EAAE;wBACP,OAAO,EAAE,qCAAqC;wBAC9C,GAAG,EAAE,eAAe;wBACpB,GAAG,EAAE;4BACH,QAAQ,EAAE,oCAAoC;yBAC/C;qBACF;iBACF,CAAC;gBACF,aAAa,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC;gBACnC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG;oBACtC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACrD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,sBAAsB,CACpC;oBACD,sBAAsB;iBACvB,CAAC;gBACF,OAAO,aAAa,CAAC;YACvB,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,gBAAgB,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YAEnE,uDAAuD;YACvD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,EAClD,gBAAgB,EAChB,EAAE,EACF;gBACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;aAClD,CACF,CAAC;YAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,IAAA,uBAAY,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE9D,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,IAAU,EAAE,EAAE;IACrC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;QACzC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC;QAClC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,KAAK,GAAG,uBAAuB,CAAC;IACtC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACrD,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,SAAS,yBAAyB,CAAC,CAAC;AAClE,CAAC,CAAC"}

package/src/utils/versions.d.ts

@@ -10,6 +10,7 @@ export declare const TS_VERSIONS: {
     readonly '@aws/aws-distro-opentelemetry-node-autoinstrumentation': "0.10.0";
     readonly '@aws-sdk/client-dynamodb': "3.1039.0";
     readonly '@aws-sdk/client-bedrock-runtime': "3.1039.0";
+    readonly '@aws-sdk/client-s3': "3.1039.0";
     readonly '@aws-sdk/client-sts': "3.1039.0";
     readonly '@aws-sdk/credential-providers': "3.1039.0";
     readonly '@aws-smithy/server-apigateway': "1.0.0-alpha.10";
@@ -52,6 +53,8 @@ export declare const TS_VERSIONS: {
     readonly '@types/cors': "2.8.19";
     readonly '@types/ws': "8.18.1";
     readonly '@types/express': "5.0.6";
+    readonly '@smithy/config-resolver': "4.4.17";
+    readonly '@smithy/node-config-provider': "4.3.14";
     readonly '@smithy/node-http-handler': "4.6.1";
     readonly '@smithy/types': "4.14.1";
     readonly '@vitest/coverage-v8': "4.1.5";
@@ -115,7 +118,7 @@ export type ITsDepVersion = keyof typeof TS_VERSIONS;
  * Add versions to the given dependencies
  */
 export declare const withVersions: (deps: ITsDepVersion[]) => {
-    [k: string]: "22.7.1" | "3.8.3" | "1.29.0" | "22.1.3" | "3.3.3" | "6.0.3" | "4.1.5" | "4.4.1" | "0.3.13" | "0.10.0" | "3.1039.0" | "1.0.0-alpha.10" | "2.33.0" | "7.3.3" | "10.2.1" | "0.19.0" | "0.0.53" | "0.2.0" | "1.56.5" | "7.8.2" | "1.0.0" | "1.168.26" | "1.167.29" | "1.166.37" | "1.161.7" | "3.0.175" | "1.0.123" | "3.0.1287" | "1.0.58" | "5.100.6" | "11.17.0" | "25.6.0" | "8.10.161" | "2.8.19" | "8.18.1" | "5.0.6" | "4.6.1" | "4.14.1" | "5.0.4" | "0.38.4" | "6.1.10" | "1.0.20" | "2.1120.0" | "2.251.0" | "2.251.0-alpha.0" | "3.12.0" | "10.6.0" | "2.8.6" | "5.6.2" | "0.7.1" | "2.1.1" | "14.0.3" | "3.7.5" | "0.28.0" | "1.0.31" | "1.0.5" | "8.59.1" | "5.5.5" | "5.2.1" | "11.3.4" | "11.0.4" | "3.1.0" | "4.0.0" | "2.0.0" | "19.6.6" | "3.5.0" | "3.3.1" | "19.2.5" | "6.1.3" | "1.0.0-rc.15" | "3.36.0" | "0.5.21" | "0.26.1" | "4.2.2" | "4.21.0" | "1.14.0" | "1.4.3" | "4.6.0" | "1.4.0" | "8.0.8" | "8.20.0";
+    [k: string]: "22.7.1" | "3.8.3" | "1.29.0" | "22.1.3" | "3.3.3" | "6.0.3" | "4.1.5" | "4.4.1" | "0.3.13" | "0.10.0" | "3.1039.0" | "1.0.0-alpha.10" | "2.33.0" | "7.3.3" | "10.2.1" | "0.19.0" | "0.0.53" | "0.2.0" | "1.56.5" | "7.8.2" | "1.0.0" | "1.168.26" | "1.167.29" | "1.166.37" | "1.161.7" | "3.0.175" | "1.0.123" | "3.0.1287" | "1.0.58" | "5.100.6" | "11.17.0" | "25.6.0" | "8.10.161" | "2.8.19" | "8.18.1" | "5.0.6" | "4.4.17" | "4.3.14" | "4.6.1" | "4.14.1" | "5.0.4" | "0.38.4" | "6.1.10" | "1.0.20" | "2.1120.0" | "2.251.0" | "2.251.0-alpha.0" | "3.12.0" | "10.6.0" | "2.8.6" | "5.6.2" | "0.7.1" | "2.1.1" | "14.0.3" | "3.7.5" | "0.28.0" | "1.0.31" | "1.0.5" | "8.59.1" | "5.5.5" | "5.2.1" | "11.3.4" | "11.0.4" | "3.1.0" | "4.0.0" | "2.0.0" | "19.6.6" | "3.5.0" | "3.3.1" | "19.2.5" | "6.1.3" | "1.0.0-rc.15" | "3.36.0" | "0.5.21" | "0.26.1" | "4.2.2" | "4.21.0" | "1.14.0" | "1.4.3" | "4.6.0" | "1.4.0" | "8.0.8" | "8.20.0";
 };
 /**
  * Versions for Python dependencies added by generators

package/src/utils/versions.js

@@ -13,6 +13,7 @@ exports.TS_VERSIONS = {
     '@aws/aws-distro-opentelemetry-node-autoinstrumentation': '0.10.0',
     '@aws-sdk/client-dynamodb': '3.1039.0',
     '@aws-sdk/client-bedrock-runtime': '3.1039.0',
+    '@aws-sdk/client-s3': '3.1039.0',
     '@aws-sdk/client-sts': '3.1039.0',
     '@aws-sdk/credential-providers': '3.1039.0',
     '@aws-smithy/server-apigateway': '1.0.0-alpha.10',
@@ -55,6 +56,8 @@ exports.TS_VERSIONS = {
     '@types/cors': '2.8.19',
     '@types/ws': '8.18.1',
     '@types/express': '5.0.6',
+    '@smithy/config-resolver': '4.4.17',
+    '@smithy/node-config-provider': '4.3.14',
     '@smithy/node-http-handler': '4.6.1',
     '@smithy/types': '4.14.1',
     '@vitest/coverage-v8': '4.1.5',

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/versions.ts"],"names":[],"mappings":"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"}

package/src/utils/website-constructs/files/terraform/core/static-website/static-website.tf.template

@@ -458,6 +458,13 @@ resource "aws_cloudfront_distribution" "website" {
       aws_wafv2_web_acl.cloudfront_waf
     ]
   }
+
+  # CloudFront validates access to the distribution logs bucket when it
+  # creates the distribution.
+  depends_on = [
+    aws_s3_bucket_acl.distribution_logs_acl,
+    aws_s3_bucket_policy.distribution_logs_ssl_policy,
+  ]
 }
 
 # S3 Bucket Policy for CloudFront OAC