Skip to content

fix: prevent account override for post-deploy commands #726

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
konippi wants to merge 1 commit into
base: v0.x
Choose a base branch
from
Open

fix: prevent account override for post-deploy commands #726

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
23 changes: 10 additions & 13 deletions src/lib/schemas/io/config-io.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,10 @@ export class ConfigIO {
/**
* Read and validate the AWS configuration file.
* Region is preserved as saved. Use resolveAWSDeploymentTargets() for environment/profile overrides.
* TODO: Account is still overridden via AWS_PROFILE — consider moving to resolveAWSDeploymentTargets() for consistency.
*/
async readAWSDeploymentTargets(): Promise<AwsDeploymentTarget[]> {
const filePath = this.pathResolver.getAWSTargetsConfigPath();
let targets = await this.readAndValidate(filePath, 'AWS Targets', AwsDeploymentTargetsSchema);

// Override account from credentials if AWS_PROFILE is set
if (process.env.AWS_PROFILE) {
const account = await detectAwsAccount();
if (account) {
targets = targets.map(t => ({ ...t, account }));
}
}

return targets;
return this.readAndValidate(filePath, 'AWS Targets', AwsDeploymentTargetsSchema);
}

/**
Expand All @@ -188,7 +177,15 @@ export class ConfigIO {
* Environment/profile region is only used as a fallback when no region is saved in aws-targets.json.
*/
async resolveAWSDeploymentTargets(): Promise<AwsDeploymentTarget[]> {
const targets = await this.readAWSDeploymentTargets();
let targets = await this.readAWSDeploymentTargets();

// Override account from credentials if AWS_PROFILE is set
if (process.env.AWS_PROFILE) {
const account = await detectAwsAccount();
if (account) {
targets = targets.map(t => ({ ...t, account }));
}
}

// Only resolve region for targets that don't already have one saved
const fallbackRegion = await this.resolveRegionFallback();
Expand Down
Loading