Merge branch 'main' into huijbers/refactor-assets

aws · May 16, 2023 · 0fc6754 · 0fc6754
2 parents 5fc82da + d11021d
commit 0fc6754
Show file tree

Hide file tree

Showing 810 changed files with 22,320 additions and 19,811 deletions.
diff --git a/.github/ISSUE_TEMPLATE/notice.yml b/.github/ISSUE_TEMPLATE/notice.yml
@@ -0,0 +1,58 @@
+---
+name: "❗ Notice"
+description: Post a notice for a high impact issue
+title: "❗ NOTICE (module name): (short notice description)"
+labels: [p0, management/tracking]
+body:
+  - type: dropdown
+    attributes:
+      label: Status
+      description: What is the current status of this issue?
+      options:
+        - Investigating (Default)
+        - In-Progress
+        - Resolved
+    validations:
+      required: true        
+  - type: textarea
+    attributes:
+      label: What is the issue?
+      description: A clear and concise description of the issue you want customers to be aware of
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Error message
+      description: If available, paste the error message users are seeing (no need to backticks)
+      render: console
+  - type: textarea
+    attributes:
+      label: What is the impact?
+      description: |
+        What can occur if this issue isn't addressed?
+    validations:
+        required: true
+  - type: textarea
+    attributes:
+      label: Workaround
+      description: |
+        Please provide a detailed workaround outlining all steps required for implementation. If none exist yet, leave blank
+  - type: textarea
+    attributes:
+      label: Who is affected?
+      description: |
+        What segment of customers are affected? Think about specific construct usage, version, feature toggles, etc...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: How do I resolve this?
+      description: |
+        What actions should customers take to resolve the issue. Also elaborate on any code changes the customer may need to do. If unknown yet, say TBD
+    validations:
+      required: true        
+  - type: textarea
+    attributes:
+      label: Related issues
+      description: |
+        List all related issues here. If none related, leave blank
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.79.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.79.0-alpha.0...v2.79.1-alpha.0) (2023-05-11)
+
 ## [2.79.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.78.0-alpha.0...v2.79.0-alpha.0) (2023-05-10)
 
 

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.79.1](https://github.com/aws/aws-cdk/compare/v2.79.0...v2.79.1) (2023-05-11)
+
+
+### Bug Fixes
+
+* **bootstrap:** bootstrap doesn't work in non-aws partitions anymore (revert security hub finding fix) ([#25272](https://github.com/aws/aws-cdk/issues/25272)) ([4c4014e](https://github.com/aws/aws-cdk/commit/4c4014e0bd3fa90402cfc22971f1cbe5d372642f))
+
 ## [2.79.0](https://github.com/aws/aws-cdk/compare/v2.78.0...v2.79.0) (2023-05-10)
 
 

diff --git a/pack.sh b/pack.sh
@@ -107,9 +107,3 @@ if find dist/ | grep -F "${marker}"; then
   echo "This is expected for builds in a development environment but should not happen in CI builds!"
   exit 1
 fi
-
-# for posterity, print all files in dist
-echo "=============================================================================================="
-echo " dist contents"
-echo "=============================================================================================="
-find dist/
diff --git a/...ws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/manifest.json b/...ws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...sting/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/mesh-stack.assets.json b/...sting/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/mesh-stack.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "31.0.0",
   "files": {
-    "e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb": {
+    "66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402": {
       "source": {
         "path": "mesh-stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "e22d0f948e4b9a0aac11f68f048f52c09eeb7d8fef79972eb7e6f957111955bb.json",
+          "objectKey": "66ab683818060e1118fc673956ded609e269963fadf52391a2f080831d022402.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/mesh-stack.template.json b/...ing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/mesh-stack.template.json
@@ -1080,6 +1080,9 @@
      "Logging": {
       "AccessLog": {
        "File": {
+        "Format": {
+         "Text": "test_pattern"
+        },
         "Path": "/dev/stdout"
        }
       }
@@ -1178,6 +1181,18 @@
      "Logging": {
       "AccessLog": {
        "File": {
+        "Format": {
+         "Json": [
+          {
+           "Key": "testKey1",
+           "Value": "testValue1"
+          },
+          {
+           "Key": "testKey2",
+           "Value": "testValue2"
+          }
+         ]
+        },
         "Path": "/dev/stdout"
        }
       }

diff --git a/...s/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/tree.json b/...s/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.js.snapshot/tree.json
@@ -1604,7 +1604,10 @@
                           "logging": {
                             "accessLog": {
                               "file": {
-                                "path": "/dev/stdout"
+                                "path": "/dev/stdout",
+                                "format": {
+                                  "text": "test_pattern"
+                                }
                               }
                             }
                           }
@@ -1721,7 +1724,19 @@
                           "logging": {
                             "accessLog": {
                               "file": {
-                                "path": "/dev/stdout"
+                                "path": "/dev/stdout",
+                                "format": {
+                                  "json": [
+                                    {
+                                      "key": "testKey1",
+                                      "value": "testValue1"
+                                    },
+                                    {
+                                      "key": "testKey2",
+                                      "value": "testValue2"
+                                    }
+                                  ]
+                                }
                               }
                             }
                           }

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh.ts
@@ -114,7 +114,7 @@ const node3 = mesh.addVirtualNode('node3', {
       },
     },
   },
-  accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
+  accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout', appmesh.LoggingFormat.fromText('test_pattern')),
 });
 
 const node4 = mesh.addVirtualNode('node4', {
@@ -145,7 +145,9 @@ const node4 = mesh.addVirtualNode('node4', {
       },
     },
   },
-  accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout'),
+  accessLog: appmesh.AccessLog.fromFilePath('/dev/stdout',
+    appmesh.LoggingFormat.fromJson(
+      { testKey1: 'testValue1', testKey2: 'testValue2' })),
 });
 
 node4.addBackend(appmesh.Backend.virtualService(

diff --git a/....snapshot/asset.68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e/index.js b/....snapshot/asset.68b8fc42fe6d1eb6e6c39212ce770fac02511440fecfc5b69a904fe8a19f6b8e/index.js
diff --git a/...89b792b981d73e22dba92b2dd13caec415dfc.zip → ...a0709bf456e34b06ea7c96111eecb2fddd054.zip b/...89b792b981d73e22dba92b2dd13caec415dfc.zip → ...a0709bf456e34b06ea7c96111eecb2fddd054.zip
diff --git a/...er.js.snapshot/asset.75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip b/...er.js.snapshot/asset.75dfa9114a30421542432dcb55212f010f591a9e3bd203ae98ba3f9bedf5bb31.zip
diff --git a/...1440fecfc5b69a904fe8a19f6b8e/cluster.d.ts → ...4e4e1bca8d4aa818c442e1878ddf/cluster.d.ts b/...1440fecfc5b69a904fe8a19f6b8e/cluster.d.ts → ...4e4e1bca8d4aa818c442e1878ddf/cluster.d.ts
@@ -1,5 +1,5 @@
-import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 import { EksClient, ResourceEvent, ResourceHandler } from './common';
+import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 export declare class ClusterResourceHandler extends ResourceHandler {
     get clusterName(): string;
     private readonly newProps;

diff --git a/...511440fecfc5b69a904fe8a19f6b8e/cluster.js → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.js b/...511440fecfc5b69a904fe8a19f6b8e/cluster.js → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.js
diff --git a/...511440fecfc5b69a904fe8a19f6b8e/cluster.ts → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.ts b/...511440fecfc5b69a904fe8a19f6b8e/cluster.ts → ...ae4e4e1bca8d4aa818c442e1878ddf/cluster.ts
@@ -1,11 +1,11 @@
 /* eslint-disable no-console */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as aws from 'aws-sdk';
 import { EksClient, ResourceEvent, ResourceHandler } from './common';
 import { compareLoggingProps } from './compareLogging';
+import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 
 
 const MAX_CLUSTER_NAME_LEN = 100;

diff --git a/...11440fecfc5b69a904fe8a19f6b8e/common.d.ts → ...e4e4e1bca8d4aa818c442e1878ddf/common.d.ts b/...11440fecfc5b69a904fe8a19f6b8e/common.d.ts → ...e4e4e1bca8d4aa818c442e1878ddf/common.d.ts
@@ -1,5 +1,5 @@
-import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 import * as aws from 'aws-sdk';
+import { IsCompleteResponse, OnEventResponse } from '../../../custom-resources/lib/provider-framework/types';
 export interface EksUpdateId {
     /**
      * If this field is included in an event passed to "IsComplete", it means we