From 442c190d817d7da34f94ccf57e2d00737ff87c4f Mon Sep 17 00:00:00 2001 From: Calvin Combs Date: Fri, 21 Oct 2022 13:35:32 -0700 Subject: [PATCH] uneeded change --- packages/@aws-cdk/aws-eks/test/bucket-pinger/function/index.py | 2 +- .../test/sdk-call-integ-test-docker-app/app/.dockerignore | 2 +- .../aws-eks/test/sdk-call-integ-test-docker-app/app/Dockerfile | 2 +- packages/@aws-cdk/core/lib/fs/fingerprint.ts | 2 +- packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/@aws-cdk/aws-eks/test/bucket-pinger/function/index.py b/packages/@aws-cdk/aws-eks/test/bucket-pinger/function/index.py index 09cb21b8662bb..ee574409fb1de 100644 --- a/packages/@aws-cdk/aws-eks/test/bucket-pinger/function/index.py +++ b/packages/@aws-cdk/aws-eks/test/bucket-pinger/function/index.py @@ -27,4 +27,4 @@ def handler(event, context): # If the bucket does not exist, then this error will be thrown raise RuntimeError(f'failed to delete bucket: {str(error)}') - return {'Data': {'Value': f'confirmed that bucket with name {s3_bucket_name} exists...bucket has been deleted' }} \ No newline at end of file + return {'Data': {'Value': f'confirmed that bucket with name {s3_bucket_name} exists...bucket has been deleted' }} diff --git a/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/.dockerignore b/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/.dockerignore index b512c09d47662..3c3629e647f5d 100644 --- a/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/.dockerignore +++ b/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/.dockerignore @@ -1 +1 @@ -node_modules \ No newline at end of file +node_modules diff --git a/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/Dockerfile b/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/Dockerfile index 085558f3e7fa0..e40cbe1e47989 100644 --- a/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/Dockerfile +++ b/packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/Dockerfile @@ -13,4 +13,4 @@ COPY . /usr/src/app USER node -CMD [ "node", "sdk-call.js" ] \ No newline at end of file +CMD [ "node", "sdk-call.js" ] diff --git a/packages/@aws-cdk/core/lib/fs/fingerprint.ts b/packages/@aws-cdk/core/lib/fs/fingerprint.ts index af4c6bf962a66..58dd602cc1590 100644 --- a/packages/@aws-cdk/core/lib/fs/fingerprint.ts +++ b/packages/@aws-cdk/core/lib/fs/fingerprint.ts @@ -105,7 +105,7 @@ export function contentFingerprint(file: string): string { // We also must suppress typescript typechecks as we are using a version of // @types/node that only supports node 10 declarations. - const stats = fs.statSync(file/*, { bigint: true }*/); + const stats = fs.statSync(file, { bigint: true }); const cacheKey = JSON.stringify({ mtime_unix: stats.mtime.toUTCString(), mtime_ms: stats.mtimeMs.toString(), diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts b/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts index 53c739db6580c..7980a98643e51 100644 --- a/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts +++ b/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts @@ -210,7 +210,6 @@ export class SdkProvider { 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.`); - warning(`${e.message}`); return { sdk: new SDK(baseCreds.credentials, env.region, this.sdkOptions), didAssumeRole: false }; }