Merge branch 'main' into maria-db-minor

packages/@aws-cdk-testing/cli-integ/bin/query-github

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./query-github.js');
+require('../lib/cli/query-github.js');

packages/@aws-cdk-testing/cli-integ/bin/run-suite

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./run-suite.js');
+require('../lib/cli/run-suite.js');

packages/@aws-cdk-testing/cli-integ/bin/stage-distribution

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./stage-distribution.js');
+require('../lib/cli/stage-distribution.js');

packages/@aws-cdk-testing/cli-integ/bin/test-root

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./test-root.js');
+require('../lib/cli/test-root.js');

packages/@aws-cdk-testing/cli-integ/bin/query-github.ts → packages/@aws-cdk-testing/cli-integ/lib/cli/query-github.ts

@@ -1,5 +1,5 @@
 import * as yargs from 'yargs';
-import { fetchPreviousVersion } from '../lib/github';
+import { fetchPreviousVersion } from '../github';
 
 async function main() {
   const args = await yargs

packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts → packages/@aws-cdk-testing/cli-integ/lib/cli/run-suite.ts

@@ -2,10 +2,10 @@
 import * as path from 'path';
 import * as jest from 'jest';
 import * as yargs from 'yargs';
-import { ReleasePackageSourceSetup } from '../lib/package-sources/release-source';
-import { RepoPackageSourceSetup, autoFindRoot } from '../lib/package-sources/repo-source';
-import { IPackageSourceSetup } from '../lib/package-sources/source';
-import { serializeForSubprocess } from '../lib/package-sources/subprocess';
+import { ReleasePackageSourceSetup } from '../package-sources/release-source';
+import { RepoPackageSourceSetup, autoFindRoot } from '../package-sources/repo-source';
+import { IPackageSourceSetup } from '../package-sources/source';
+import { serializeForSubprocess } from '../package-sources/subprocess';
 
 async function main() {
   const args = await yargs
@@ -126,7 +126,7 @@ async function main() {
       ...args.verbose ? ['--verbose'] : [],
       ...passWithNoTests ? ['--passWithNoTests'] : [],
       ...args['test-file'] ? [args['test-file']] : [],
-    ], path.resolve(__dirname, '..', 'resources', 'integ.jest.config.js'));
+    ], path.resolve(__dirname, '..', '..', 'resources', 'integ.jest.config.js'));
 
   } finally {
     await packageSource.cleanup();

packages/@aws-cdk-testing/cli-integ/bin/stage-distribution.ts → packages/@aws-cdk-testing/cli-integ/lib/cli/stage-distribution.ts

@@ -3,13 +3,13 @@ import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as glob from 'glob';
 import * as yargs from 'yargs';
-import { shell } from '../lib';
-import { TestRepository } from '../lib/staging/codeartifact';
-import { uploadJavaPackages, mavenLogin } from '../lib/staging/maven';
-import { uploadNpmPackages, npmLogin } from '../lib/staging/npm';
-import { uploadDotnetPackages, nugetLogin } from '../lib/staging/nuget';
-import { uploadPythonPackages, pypiLogin } from '../lib/staging/pypi';
-import { UsageDir } from '../lib/staging/usage-dir';
+import { shell } from '..';
+import { TestRepository } from '../staging/codeartifact';
+import { uploadJavaPackages, mavenLogin } from '../staging/maven';
+import { uploadNpmPackages, npmLogin } from '../staging/npm';
+import { uploadDotnetPackages, nugetLogin } from '../staging/nuget';
+import { uploadPythonPackages, pypiLogin } from '../staging/pypi';
+import { UsageDir } from '../staging/usage-dir';
 
 async function main() {
   await yargs

packages/@aws-cdk-testing/cli-integ/bin/test-root.ts → packages/@aws-cdk-testing/cli-integ/lib/cli/test-root.ts

@@ -1,3 +1,3 @@
 import * as path from 'path';
 // eslint-disable-next-line no-console
-console.log(path.resolve(__dirname, '..'));
+console.log(path.resolve(__dirname, '..', '..'));

packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts

@@ -8,11 +8,16 @@ const POOL_NAME = 'resource-pool.test';
 test('take and dispose', async () => {
   const pool = ResourcePool.withResources(POOL_NAME, ['a']);
   const take1 = pool.take();
-  const take2 = pool.take();
 
   let released = false;
 
   const lease1 = await take1;
+
+  // We must start the take2 only after take1 has definitely
+  // succeeded, otherwise we have a race condition if take2 happens to
+  // win the race (we expect take1 to succeed and take2 to wait).
+  const take2 = pool.take();
+
   // awaiting 'take2' would now block but we add an async
   // handler to it to flip a boolean to see when it gets activated.
   void(take2.then(() => released = true));

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.js.snapshot/cdk-integ-opensearch-instance-store.template.json

@@ -1,6 +1,6 @@
 {
  "Resources": {
-  "Domain66AC69E0": {
+  "Domain19FCBCB91": {
    "Type": "AWS::OpenSearchService::Domain",
    "Properties": {
     "ClusterConfig": {
@@ -20,7 +20,65 @@
     "EncryptionAtRestOptions": {
      "Enabled": false
     },
-    "EngineVersion": "OpenSearch_2.5",
+    "EngineVersion": "OpenSearch_2.17",
+    "LogPublishingOptions": {},
+    "NodeToNodeEncryptionOptions": {
+     "Enabled": false
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "Domain2644FE48C": {
+   "Type": "AWS::OpenSearchService::Domain",
+   "Properties": {
+    "ClusterConfig": {
+     "DedicatedMasterEnabled": false,
+     "InstanceCount": 1,
+     "InstanceType": "i4i.xlarge.search",
+     "MultiAZWithStandbyEnabled": false,
+     "ZoneAwarenessEnabled": false
+    },
+    "DomainEndpointOptions": {
+     "EnforceHTTPS": false,
+     "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
+    },
+    "EBSOptions": {
+     "EBSEnabled": false
+    },
+    "EncryptionAtRestOptions": {
+     "Enabled": false
+    },
+    "EngineVersion": "OpenSearch_2.17",
+    "LogPublishingOptions": {},
+    "NodeToNodeEncryptionOptions": {
+     "Enabled": false
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "Domain3BE108C7A": {
+   "Type": "AWS::OpenSearchService::Domain",
+   "Properties": {
+    "ClusterConfig": {
+     "DedicatedMasterEnabled": false,
+     "InstanceCount": 1,
+     "InstanceType": "r7gd.xlarge.search",
+     "MultiAZWithStandbyEnabled": false,
+     "ZoneAwarenessEnabled": false
+    },
+    "DomainEndpointOptions": {
+     "EnforceHTTPS": false,
+     "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
+    },
+    "EBSOptions": {
+     "EBSEnabled": false
+    },
+    "EncryptionAtRestOptions": {
+     "Enabled": false
+    },
+    "EngineVersion": "OpenSearch_2.17",
     "LogPublishingOptions": {},
     "NodeToNodeEncryptionOptions": {
      "Enabled": false

packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.ebs.ts

@@ -7,23 +7,24 @@ class TestStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
-    // deploy the latest opensearch domain with instance store only (no EBS)
-    const domainProps: opensearch.DomainProps = {
-      removalPolicy: RemovalPolicy.DESTROY,
-      version: opensearch.EngineVersion.OPENSEARCH_2_5,
-      // specify the instance type that supports instance store
-      capacity: {
-        multiAzWithStandbyEnabled: false,
-        dataNodeInstanceType: 'i4g.large.search',
-        dataNodes: 1,
-      },
-      // force ebs configuration to be disabled
-      ebs: {
-        enabled: false,
-      },
-    };
+    const instanceTypes = ['i4g.large.search', 'i4i.xlarge.search', 'r7gd.xlarge.search'];
 
-    new opensearch.Domain(this, 'Domain', domainProps);
+    instanceTypes.forEach((instanceType, index) => {
+      new opensearch.Domain(this, `Domain${index + 1}`, {
+        removalPolicy: RemovalPolicy.DESTROY,
+        version: opensearch.EngineVersion.OPENSEARCH_2_17,
+        // specify the instance type that supports instance store
+        capacity: {
+          multiAzWithStandbyEnabled: false,
+          dataNodeInstanceType: instanceType,
+          dataNodes: 1,
+        },
+        // force ebs configuration to be disabled
+        ebs: {
+          enabled: false,
+        },
+      });
+    });
   }
 }
 

packages/@aws-cdk/cli-lib-alpha/.eslintrc.js

@@ -1,5 +1,6 @@
 const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
+baseConfig.ignorePatterns.push('**/*.template.ts');
 
 baseConfig.rules['import/no-extraneous-dependencies'] = ['error', { devDependencies: true, peerDependencies: true } ];
 baseConfig.rules['import/order'] = 'off';