Skip to content

Commit 1992fa2

Browse files
committed
Revert "hard-coded region"
This reverts commit 3844f1a.
1 parent 3844f1a commit 1992fa2

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/awscli-compatible.ts

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Agent } from 'node:https';
22
import { format } from 'node:util';
33
import type { SDKv3CompatibleCredentialProvider } from '@aws-cdk/cli-plugin-contract';
44
import { createCredentialChain, fromEnv, fromIni, fromNodeProviderChain } from '@aws-sdk/credential-providers';
5-
// import { MetadataService } from '@aws-sdk/ec2-metadata-service';
5+
import { MetadataService } from '@aws-sdk/ec2-metadata-service';
66
import { loadSharedConfigFiles } from '@smithy/shared-ini-file-loader';
77
import type { RequestHandlerSettings } from './base-credentials';
88
import { makeCachingProvider } from './provider-caching';
@@ -172,21 +172,20 @@ export class AwsCliCompatible {
172172
* @returns The region for the instance identity
173173
*/
174174
private async regionFromMetadataService() {
175-
return 'us-east-1';
176-
// await this.ioHelper.defaults.debug('Looking up AWS region in the EC2 Instance Metadata Service (IMDS).');
177-
// try {
178-
// const metadataService = new MetadataService({
179-
// httpOptions: {
180-
// timeout: 1000,
181-
// },
182-
// });
183-
//
184-
// await metadataService.fetchMetadataToken();
185-
// const document = await metadataService.request('/latest/dynamic/instance-identity/document', {});
186-
// return JSON.parse(document).region;
187-
// } catch (e) {
188-
// await this.ioHelper.defaults.debug(`Unable to retrieve AWS region from IMDS: ${e}`);
189-
// }
175+
await this.ioHelper.defaults.debug('Looking up AWS region in the EC2 Instance Metadata Service (IMDS).');
176+
try {
177+
const metadataService = new MetadataService({
178+
httpOptions: {
179+
timeout: 1000,
180+
},
181+
});
182+
183+
await metadataService.fetchMetadataToken();
184+
const document = await metadataService.request('/latest/dynamic/instance-identity/document', {});
185+
return JSON.parse(document).region;
186+
} catch (e) {
187+
await this.ioHelper.defaults.debug(`Unable to retrieve AWS region from IMDS: ${e}`);
188+
}
190189
}
191190

192191
/**

0 commit comments

Comments
 (0)