Merge branch 'main' into huijbers/too-large-msk

aws · Nov 27, 2023 · 6b2585a · 6b2585a
2 parents b4e942f + 030782a
commit 6b2585a
Show file tree

Hide file tree

Showing 30 changed files with 85 additions and 66 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@25ef3926d147cd02fc7e931c1ef50772bbb0d25d
+        uses: tj-actions/changed-files@da093c1609db0edd0a037ce9664e135f74bf30d9
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json b/...ce/test/integ.opensearch.min.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
diff --git a/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json b/...-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.assets.json
diff --git a/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json b/...pensearchservice/test/integ.opensearch.min.js.snapshot/cdk-integ-opensearch.template.json
@@ -22,7 +22,7 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.9",
+    "EngineVersion": "OpenSearch_2.11",
     "LogPublishingOptions": {},
     "NodeToNodeEncryptionOptions": {
      "Enabled": false

diff --git a/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out b/.../framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/cdk.out
diff --git a/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json b/...amework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/integ.json
diff --git a/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json b/...work-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/manifest.json
diff --git a/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json b/...ramework-integ/test/aws-opensearchservice/test/integ.opensearch.min.js.snapshot/tree.json
diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts b/.../@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.min.ts
@@ -9,7 +9,7 @@ class TestStack extends Stack {
 
     // deploy the latest opensearch domain with minimal configuration
     const domainProps: opensearch.DomainProps = {
-      version: opensearch.EngineVersion.OPENSEARCH_2_9,
+      version: opensearch.EngineVersion.OPENSEARCH_2_11,
       removalPolicy: RemovalPolicy.DESTROY,
       capacity: {
         multiAzWithStandbyEnabled: false,

diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -23,8 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.30",
-    "@aws-cdk/service-spec-types": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
+    "@aws-cdk/service-spec-types": "^0.0.32",
     "chalk": "^4",
     "diff": "^5.1.0",
     "fast-deep-equal": "^3.1.3",

diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
@@ -74,7 +74,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
     "cdk-assets": "0.0.0",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",

diff --git a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.backupgateway"
+      "package": "software.amazon.awscdk.services.backupgateway"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.BackupGateway"

diff --git a/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json b/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.cleanrooms"
+      "package": "software.amazon.awscdk.services.cleanrooms"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.CleanRooms"

diff --git a/packages/aws-cdk-lib/aws-ec2/README.md b/packages/aws-cdk-lib/aws-ec2/README.md
@@ -1945,6 +1945,8 @@ const launchTemplate = new ec2.LaunchTemplate(this, 'LaunchTemplate', {
 });
 ```
 
+Please note this feature does not support Launch Configurations.
+
 ## Detailed Monitoring
 
 The following demonstrates how to enable [Detailed Monitoring](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html) for an EC2 instance. Keep in mind that Detailed Monitoring results in [additional charges](http://aws.amazon.com/cloudwatch/pricing/).

diff --git a/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json b/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.entityresolution"
+      "package": "software.amazon.awscdk.services.entityresolution"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.EntityResolution"

diff --git a/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json b/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.healthimaging"
+      "package": "software.amazon.awscdk.services.healthimaging"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.HealthImaging"

diff --git a/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json b/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.mediapackagev2"
+      "package": "software.amazon.awscdk.services.mediapackagev2"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.MediaPackageV2"

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/version.ts
@@ -90,6 +90,12 @@ export class EngineVersion {
   /** AWS OpenSearch 2.9 */
   public static readonly OPENSEARCH_2_9 = EngineVersion.openSearch('2.9');
 
+  /** AWS OpenSearch 2.10 */
+  public static readonly OPENSEARCH_2_10 = EngineVersion.openSearch('2.10');
+
+  /** AWS OpenSearch 2.11 */
+  public static readonly OPENSEARCH_2_11 = EngineVersion.openSearch('2.11');
+
   /**
    * Custom ElasticSearch version
    * @param version custom version number

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts b/packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts
@@ -40,6 +40,8 @@ const testedOpenSearchVersions = [
   EngineVersion.OPENSEARCH_2_5,
   EngineVersion.OPENSEARCH_2_7,
   EngineVersion.OPENSEARCH_2_9,
+  EngineVersion.OPENSEARCH_2_10,
+  EngineVersion.OPENSEARCH_2_11,
 ];
 
 each(testedOpenSearchVersions).test('connections throws if domain is not placed inside a vpc', (engineVersion) => {
@@ -203,6 +205,8 @@ each([
   [EngineVersion.OPENSEARCH_2_5, 'OpenSearch_2.5'],
   [EngineVersion.OPENSEARCH_2_7, 'OpenSearch_2.7'],
   [EngineVersion.OPENSEARCH_2_9, 'OpenSearch_2.9'],
+  [EngineVersion.OPENSEARCH_2_10, 'OpenSearch_2.10'],
+  [EngineVersion.OPENSEARCH_2_11, 'OpenSearch_2.11'],
 ]).test('minimal example renders correctly', (engineVersion, expectedCfVersion) => {
   new Domain(stack, 'Domain', { version: engineVersion });
 

diff --git a/packages/aws-cdk-lib/aws-osis/.jsiirc.json b/packages/aws-cdk-lib/aws-osis/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.osis"
+      "package": "software.amazon.awscdk.services.osis"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.OSIS"

diff --git a/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json b/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.pcaconnectorad"
+      "package": "software.amazon.awscdk.services.pcaconnectorad"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.PCAConnectorAD"

diff --git a/packages/aws-cdk-lib/aws-proton/.jsiirc.json b/packages/aws-cdk-lib/aws-proton/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.proton"
+      "package": "software.amazon.awscdk.services.proton"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.Proton"

diff --git a/packages/aws-cdk-lib/aws-shield/.jsiirc.json b/packages/aws-cdk-lib/aws-shield/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.shield"
+      "package": "software.amazon.awscdk.services.shield"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.Shield"

diff --git a/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json b/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.verifiedpermissions"
+      "package": "software.amazon.awscdk.services.verifiedpermissions"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.VerifiedPermissions"

diff --git a/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json b/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.workspacesweb"
+      "package": "software.amazon.awscdk.services.workspacesweb"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.WorkSpacesWeb"

diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
@@ -133,7 +133,7 @@
     "yaml": "1.10.2"
   },
   "devDependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",

diff --git a/packages/aws-cdk/lib/import.ts b/packages/aws-cdk/lib/import.ts
@@ -290,7 +290,7 @@ export class ResourceImporter {
       for (const idProp of idProps) {
         // If we have a value from the template, use it as default. This will only be a partial
         // identifier if present, otherwise we would have done the import already above.
-        const defaultValue = typeof resourceProps[idProp] ?? '';
+        const defaultValue = resourceProps[idProp] ?? '';
 
         const prompt = [
           promptPattern.replace(/%/g, chalk.blue(idProp)),

diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts
@@ -13,7 +13,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string) {
   const javaGroupId = 'software.amazon.awscdk';
   const javaPackage =
     moduleFamily === 'AWS'
-      ? `services.${lowcaseModuleName}`
+      ? `software.amazon.awscdk.services.${lowcaseModuleName}`
       : `${moduleFamily.toLocaleLowerCase()}.${lowcaseModuleName}`;
   const javaArtifactId =
     moduleFamily === 'AWS' ? lowcaseModuleName : `${moduleFamily.toLocaleLowerCase()}-${lowcaseModuleName}`;

diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json
@@ -32,9 +32,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.30",
-    "@aws-cdk/service-spec-importers": "^0.0.7",
-    "@aws-cdk/service-spec-types": "^0.0.30",
+    "@aws-cdk/aws-service-spec": "^0.0.32",
+    "@aws-cdk/service-spec-importers": "^0.0.8",
+    "@aws-cdk/service-spec-types": "^0.0.32",
     "@cdklabs/tskb": "^0.0.3",
     "@cdklabs/typewriter": "^0.0.3",
     "camelcase": "^6",