Skip to content

Fix async v3 credential hydration for SSM resolution #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaswot77 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix async v3 credential hydration for SSM resolution #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 42 additions & 22 deletions lib/plugins/aws/provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,11 +1802,9 @@ class AwsProvider {
*/
async _requestV3(service, method, params = {}, options = {}) {
try {
if (!this.clientFactory) {
this.clientFactory = new AWSClientFactory(this._getV3BaseConfig());
}
await this._ensureV3ClientFactory();

const clientConfig = this._buildV3ClientConfig(service, method, options);
const clientConfig = await this._buildV3ClientConfig(service, method, options);

const command = createCommand(service, method, params);

Expand All @@ -1823,43 +1821,65 @@ class AwsProvider {
* @param {Object} options - Client configuration options
* @returns {Object} AWS SDK v3 client instance
*/
getV3Client(service, options = {}) {
if (!this.clientFactory) {
this.clientFactory = new AWSClientFactory(this._getV3BaseConfig());
}
async getV3Client(service, options = {}) {
await this._ensureV3ClientFactory();

const clientConfig = this._buildV3ClientConfig(service, null, options);
const clientConfig = await this._buildV3ClientConfig(service, null, options);
return this.clientFactory.getClient(service, clientConfig);
}

async _ensureV3ClientFactory() {
if (this.clientFactory) {
return;
}

const baseConfig = await this._getV3BaseConfig();
this.clientFactory = new AWSClientFactory(baseConfig);
}

/**
* Build base configuration for AWS SDK v3 clients
* @private
*/
_getV3BaseConfig() {
// Convert v2 credentials format to v3 format
const { credentials: v2Creds } = this.getCredentials();
const credentials =
v2Creds && v2Creds.accessKeyId
? {
accessKeyId: v2Creds.accessKeyId,
secretAccessKey: v2Creds.secretAccessKey,
sessionToken: v2Creds.sessionToken,
}
: undefined;
async _getV3BaseConfig() {
const credentials = await this._resolveV2CredentialsForV3();

return buildClientConfig({
region: this.getRegion(),
credentials,
});
}

async _resolveV2CredentialsForV3() {
const { credentials: v2Creds } = this.getCredentials();
if (!v2Creds) {
return undefined;
}

// Hydrate lazy v2 credentials before copying
if (typeof v2Creds.getPromise === 'function') {
await v2Creds.getPromise();
} else if (typeof v2Creds.refreshPromise === 'function') {
await v2Creds.refreshPromise();
}

if (!v2Creds.accessKeyId || !v2Creds.secretAccessKey) {
return undefined;
}

return {
accessKeyId: v2Creds.accessKeyId,
secretAccessKey: v2Creds.secretAccessKey,
sessionToken: v2Creds.sessionToken,
};
}

/**
* Build client-specific configuration for AWS SDK v3
* @private
*/
_buildV3ClientConfig(service, method, options) {
const baseConfig = this._getV3BaseConfig();
async _buildV3ClientConfig(service, method, options) {
const baseConfig = await this._getV3BaseConfig();
const requestOptions = _.isObject(options) ? options : {};

// Override region if specified
Expand Down