Skip to content

refactor: env var set error handling #463

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

Merged
merged 4 commits into from
Jul 20, 2022
Merged

refactor: env var set error handling #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ad917f
refactor: env var set error handling
RasPhilCo Jul 18, 2022
b6b9406
test: retry test b/c of weird race condition
RasPhilCo Jul 18, 2022
a3f0f10
rm comment
RasPhilCo Jul 19, 2022
7f5e559
Merge branch 'pn/json-flag-help' into pn/envvarset-error-handling
RasPhilCo Jul 20, 2022
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
83 changes: 15 additions & 68 deletions src/commands/env/var/set.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,55 +52,6 @@ export default class ConfigSet extends Command {
}, {});
}

parseErrors(errorObject: any, targetCompute: string) {
// may have create a cleaner way to parse the errors
// to fit the sfdx json error object, but this currently works

const errObj = errorObject.stack;
const isInvalidEnvironment = errObj.includes("Error: Couldn't");
const hasNoInput = errObj.includes('Error: Usage:');
const isInvalidInput = !hasNoInput;

if (isInvalidEnvironment) {
const errorStackStartIndex = errObj.indexOf('at');
const errStack = errObj.substr(errorStackStartIndex);
errorObject.message = `Couldn't find that app <${targetCompute}>`;
errorObject.stack = errStack;
this.error(errObj);
}

if (isInvalidInput) {
const errorIndex = errObj.indexOf(':') + 1;
const keyValueIndex = errObj.indexOf('value') + 5;

// eslint-disable-next-line no-control-regex
const errMessage = errObj
.substr(errorIndex, keyValueIndex)
// eslint-disable-next-line no-control-regex
.replace(/\u001b\[.*?m/g, '')
.replace('\n', '')
.replace(' ', '');
// eslint-disable-next-line no-control-regex
const errStack = errObj
.substr(keyValueIndex)
// eslint-disable-next-line no-control-regex
.replace(/\u001b\[.*?m\r?\n|\r/g, '')
.replace(' ', '');

errorObject.message = errMessage;
errorObject.stack = errStack;
this.error(errObj);
}

if (hasNoInput) {
const errorStackStartIndex = errObj.indexOf('at');
const errStack = errObj.substr(errorStackStartIndex);
errorObject.message = 'Must specify KEY and VALUE to set.';
errorObject.stack = errStack;
this.error(errObj);
}
}

async run() {
const { flags, argv } = await this.parse(ConfigSet);
this.postParseHook(flags);
Expand All @@ -122,32 +73,28 @@ export default class ConfigSet extends Command {

const appName = await resolveAppNameForEnvironment(targetCompute);

if (flags.json) {
try {
const configPairs = this.parseKeyValuePairs(argv);
const configPairs = this.parseKeyValuePairs(argv);

await this.client.patch(`/apps/${appName}/config-vars`, {
data: configPairs,
});

return [];
} catch (err: any) {
this.parseErrors(err, targetCompute);
}
} else {
const configPairs = this.parseKeyValuePairs(argv);

cli.action.start(
`Setting ${Object.keys(configPairs)
.map((key) => herokuColor.configVar(key))
.join(', ')} and restarting ${herokuColor.app(targetCompute)}`
);
cli.action.start(
`Setting ${Object.keys(configPairs)
.map((key) => herokuColor.configVar(key))
.join(', ')} and restarting ${herokuColor.app(targetCompute)}`
);

try {
await this.client.patch(`/apps/${appName}/config-vars`, {
data: configPairs,
});

cli.action.stop();

return [];
} catch (error: any) {
cli.action.stop('failed');
if (error.data?.message?.includes("Couldn't find that app")) {
this.error(new Error(`Could not find environment <${appName}>`));
}
this.error(error);
}
}
}
3 changes: 3 additions & 0 deletions test/commands/env/var/unset.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ describe('sf env:var:unset', () => {
test
.stdout()
.stderr()
// Adding retries here because there is some kind of race condition that causes fancy-test to not
// fully capture the value of stderr when running in CI (╯°□°)╯︵ ┻━┻
.retries(2)
.nock('https://api.heroku.com', (api) =>
api
.patch('/apps/my-environment/config-vars', {
Expand Down