Merge branch 'main' into designIpv6Vpc

aws · Jan 12, 2024 · 911a995 · 911a995
2 parents 8d19bf5 + d07deec
commit 911a995
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts b/packages/aws-cdk-lib/aws-elasticsearch/lib/elasticsearch-access-policy.ts
@@ -33,6 +33,7 @@ export class ElasticsearchAccessPolicy extends cr.AwsCustomResource {
   constructor(scope: Construct, id: string, props: ElasticsearchAccessPolicyProps) {
     super(scope, id, {
       resourceType: 'Custom::ElasticsearchAccessPolicy',
+      installLatestAwsSdk: false,
       onUpdate: {
         action: 'updateElasticsearchDomainConfig',
         service: 'ES',

diff --git a/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts b/packages/aws-cdk-lib/aws-opensearchservice/lib/opensearch-access-policy.ts
@@ -33,6 +33,7 @@ export class OpenSearchAccessPolicy extends cr.AwsCustomResource {
   constructor(scope: Construct, id: string, props: OpenSearchAccessPolicyProps) {
     super(scope, id, {
       resourceType: 'Custom::OpenSearchAccessPolicy',
+      installLatestAwsSdk: false,
       onUpdate: {
         action: 'updateDomainConfig',
         service: 'OpenSearch',

diff --git a/packages/aws-cdk/lib/api/cxapp/exec.ts b/packages/aws-cdk/lib/api/cxapp/exec.ts
@@ -118,6 +118,7 @@ export async function execProgram(aws: SdkProvider, config: Configuration): Prom
         if (code === 0) {
           return ok();
         } else {
+          debug('failed command:', commandAndArgs);
           return fail(new Error(`Subprocess exited with error ${code}`));
         }
       });