silence warning messages when calling is__Published

aws · May 19, 2023 · 93dad51 · 93dad51
1 parent 48270f4
commit 93dad51
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts b/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts
@@ -174,6 +174,7 @@ export class SdkProvider {
     environment: cxapi.Environment,
     mode: Mode,
     options?: CredentialsOptions,
+    quiet = false,
   ): Promise<SdkForEnvironment> {
     const env = await this.resolveEnvironment(environment);
 
@@ -213,7 +214,8 @@ export class SdkProvider {
       // but if we can't then let's just try with available credentials anyway.
       if (baseCreds.source === 'correctDefault' || baseCreds.source === 'plugin') {
         debug(e.message);
-        warning(`${fmtObtainedCredentials(baseCreds)} could not be used to assume '${options.assumeRoleArn}', but are for the right account. Proceeding anyway.`);
+        const logger = quiet ? debug : warning;
+        logger(`${fmtObtainedCredentials(baseCreds)} could not be used to assume '${options.assumeRoleArn}', but are for the right account. Proceeding anyway.`);
         return { sdk: new SDK(baseCreds.credentials, env.region, this.sdkOptions), didAssumeRole: false };
       }
 

diff --git a/packages/aws-cdk/lib/util/asset-publishing.ts b/packages/aws-cdk/lib/util/asset-publishing.ts
@@ -169,6 +169,7 @@ export class PublishingAws implements cdk_assets.IAws {
       env, // region, name, account
       assumeRuleArn: options.assumeRoleArn,
       assumeRoleExternalId: options.assumeRoleExternalId,
+      quiet: options.quiet,
     });
 
     const maybeSdk = this.sdkCache.get(cacheKey);
@@ -179,7 +180,7 @@ export class PublishingAws implements cdk_assets.IAws {
     const sdk = (await this.aws.forEnvironment(env, Mode.ForWriting, {
       assumeRoleArn: options.assumeRoleArn,
       assumeRoleExternalId: options.assumeRoleExternalId,
-    })).sdk;
+    }, options.quiet)).sdk;
     this.sdkCache.set(cacheKey, sdk);
 
     return sdk;

diff --git a/packages/cdk-assets/lib/aws.ts b/packages/cdk-assets/lib/aws.ts
@@ -18,6 +18,7 @@ export interface ClientOptions {
   region?: string;
   assumeRoleArn?: string;
   assumeRoleExternalId?: string;
+  quiet?: boolean;
 }
 
 /**

diff --git a/packages/cdk-assets/lib/private/handlers/container-images.ts b/packages/cdk-assets/lib/private/handlers/container-images.ts
@@ -47,7 +47,7 @@ export class ContainerImageAssetHandler implements IAssetHandler {
 
   public async isPublished(): Promise<boolean> {
     try {
-      const initOnce = await this.initOnce();
+      const initOnce = await this.initOnce({ quiet: true });
       return initOnce.destinationAlreadyExists;
     } catch (e: any) {
       this.host.emitMessage(EventType.DEBUG, `${e.message}`);
@@ -73,13 +73,16 @@ export class ContainerImageAssetHandler implements IAssetHandler {
     await dockerForPushing.push(initOnce.imageUri);
   }
 
-  private async initOnce(): Promise<ContainerImageAssetHandlerInit> {
+  private async initOnce(options: { quiet?: boolean } = {}): Promise<ContainerImageAssetHandlerInit> {
     if (this.init) {
       return this.init;
     }
 
     const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);
-    const ecr = await this.host.aws.ecrClient(destination);
+    const ecr = await this.host.aws.ecrClient({
+      ...destination,
+      quiet: options.quiet,
+    });
     const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId;
 
     const repoUri = await repositoryUri(ecr, destination.repositoryName);

diff --git a/packages/cdk-assets/lib/private/handlers/files.ts b/packages/cdk-assets/lib/private/handlers/files.ts
@@ -33,7 +33,10 @@ export class FileAssetHandler implements IAssetHandler {
     const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws);
     const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`;
     try {
-      const s3 = await this.host.aws.s3Client(destination);
+      const s3 = await this.host.aws.s3Client({
+        ...destination,
+        quiet: true,
+      });
       this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`);
 
       if (await objectExists(s3, destination.bucketName, destination.objectKey)) {