@forge/cli
12.9.0-next.16-experimental-4bd2ca012.9.0-next.17
~
Modified (8 files)
Index: package/out/command-line/register-webtrigger-commands.js
===================================================================
--- package/out/command-line/register-webtrigger-commands.js
+++ package/out/command-line/register-webtrigger-commands.js
@@ -25,52 +25,75 @@
return async () => {
await getValidWebtriggers(configFile);
};
}
-const registerCommands = ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }) => {
- const validateWebtriggerKey = async (functionKey) => {
- const availableWebTriggers = await getValidWebtriggers(configFile);
- if (functionKey) {
- if (!availableWebTriggers.has(functionKey)) {
- throw new cli_shared_2.ValidationError(cli_shared_1.Text.webtrigger.error.funcKey);
- }
- return functionKey;
+async function validateWebtriggerKey(ui, configFile, functionKey) {
+ const availableWebTriggers = await getValidWebtriggers(configFile);
+ if (functionKey) {
+ if (!availableWebTriggers.has(functionKey)) {
+ throw new cli_shared_2.ValidationError(cli_shared_1.Text.webtrigger.error.funcKey);
}
- else {
- const values = [...availableWebTriggers.values()];
- return await ui.promptForList(cli_shared_1.Text.webtrigger.promptFuncKey, values);
- }
- };
- cmd
- .command('webtrigger')
+ return functionKey;
+ }
+ else {
+ const values = [...availableWebTriggers.values()];
+ return await ui.promptForList(cli_shared_1.Text.webtrigger.promptFuncKey, values);
+ }
+}
+async function webtriggerCreateAction(deps, { functionKey, site, environment, product }) {
+ const { ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } } = deps;
+ let selectedInstallationId = '';
+ if (site && product) {
+ ui.info(cli_shared_1.Text.webtrigger.overviewFuncKey);
+ const installation = await installationsService.findOnlyMatchingInstallation({
+ site,
+ environment,
+ product
+ });
+ selectedInstallationId = (0, installation_helper_1.validateInstallationId)(installation?.id);
+ }
+ else {
+ const appInstallation = await installationsService.listNonTechnicalAppInstallations({
+ site,
+ environment,
+ product
+ });
+ const installation = await (0, installation_helper_1.selectSingleInstallation)(ui, appInstallation.installations, cli_shared_1.Text.webtrigger.promptInstallationTable, cli_shared_1.Text.webtrigger.overViewInstallationTable);
+ selectedInstallationId = (0, installation_helper_1.validateInstallationId)(installation.id);
+ }
+ const url = await getWebTriggerURLCommand.execute(selectedInstallationId, await validateWebtriggerKey(ui, configFile, functionKey));
+ ui.info(cli_shared_1.Text.webtrigger.copy(url));
+}
+function registerDeprecatedWebtriggerCreateCommand(deps) {
+ deps.cmd
+ .command('__create', { isDefault: true, hidden: true })
.requireAppId()
- .description(cli_shared_1.Text.webtrigger.cmd)
- .option('-f, --functionKey [function]', cli_shared_1.Text.webtrigger.optionFuncKey)
+ .option('-f, --functionKey <functionKey>', cli_shared_1.Text.webtrigger.optionFuncKey)
.contextOption()
.environmentOption()
- .precondition(manifestDefinesTriggers(configFile))
- .action(async ({ functionKey, site, environment, product }) => {
- let selectedInstallationId = '';
- if (site && product) {
- ui.info(cli_shared_1.Text.webtrigger.overviewFuncKey);
- const installation = await installationsService.findOnlyMatchingInstallation({
- site,
- environment,
- product
- });
- selectedInstallationId = (0, installation_helper_1.validateInstallationId)(installation?.id);
- }
- else {
- const appInstallation = await installationsService.listNonTechnicalAppInstallations({
- site,
- environment,
- product
- });
- const installation = await (0, installation_helper_1.selectSingleInstallation)(ui, appInstallation.installations, cli_shared_1.Text.webtrigger.promptInstallationTable, cli_shared_1.Text.webtrigger.overViewInstallationTable);
- selectedInstallationId = (0, installation_helper_1.validateInstallationId)(installation.id);
- }
- const url = await getWebTriggerURLCommand.execute(selectedInstallationId, await validateWebtriggerKey(functionKey));
- ui.info(cli_shared_1.Text.webtrigger.copy(url));
+ .precondition(manifestDefinesTriggers(deps.configFile))
+ .action(async (args) => {
+ deps.ui.emptyLine();
+ deps.ui.warn(cli_shared_1.Text.warning.oldCreateCommandDeprecation);
+ await webtriggerCreateAction(deps, args);
});
+}
+function registerWebtriggerCreateCommand(deps) {
+ deps.cmd
+ .command('create')
+ .requireAppId()
+ .description(cli_shared_1.Text.webtrigger.create.cmd)
+ .option('-f, --functionKey <functionKey>', cli_shared_1.Text.webtrigger.create.optionFunctionKey)
+ .contextOption()
+ .environmentOption()
+ .precondition(manifestDefinesTriggers(deps.configFile))
+ .action(async (args) => {
+ await webtriggerCreateAction(deps, args);
+ });
+}
+const registerCommands = (deps) => {
+ const webtrigger = deps.cmd.command('webtrigger').description(cli_shared_1.Text.webtrigger.cmd);
+ registerWebtriggerCreateCommand({ ...deps, cmd: webtrigger });
+ registerDeprecatedWebtriggerCreateCommand({ ...deps, cmd: webtrigger });
};
exports.registerCommands = registerCommands;
//# sourceMappingURL=register-webtrigger-commands.js.map
\ No newline at end of fileIndex: package/out/autocomplete/autocomplete-config.json
===================================================================
--- package/out/autocomplete/autocomplete-config.json
+++ package/out/autocomplete/autocomplete-config.json
@@ -240,20 +240,8 @@
"webtrigger": {
"--verbose": {
"requireUserArg": false
},
- "--functionKey": {
- "requireUserArg": true
- },
- "--site": {
- "requireUserArg": true
- },
- "--product": {
- "requireUserArg": true
- },
- "--environment": {
- "requireUserArg": true
- },
"--help": {
"requireUserArg": false
}
}, File too large for inline diff
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/cli",
- "version": "12.9.0-next.16-experimental-4bd2ca0",
+ "version": "12.9.0-next.17",
"description": "A command line interface for managing Atlassian-hosted apps",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"bin": {
@@ -20,16 +20,16 @@
"generate:custom-scopes-schema": "yaml -1js --indent 2 < src/custom-scopes/validation/schema.yaml > src/custom-scopes/validation/schema.json",
"generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
},
"dependencies": {
- "@forge/bundler": "6.1.12-next.11-experimental-4bd2ca0",
- "@forge/cli-shared": "8.9.1-next.10-experimental-4bd2ca0",
+ "@forge/bundler": "6.1.12-next.12",
+ "@forge/cli-shared": "8.10.0-next.11",
"@forge/egress": "2.1.1",
- "@forge/lint": "5.12.1-next.11-experimental-4bd2ca0",
- "@forge/manifest": "11.1.0-next.6-experimental-4bd2ca0",
+ "@forge/lint": "5.12.1-next.12",
+ "@forge/manifest": "11.1.0-next.6",
"@forge/i18n": "0.0.7",
"@forge/runtime": "6.1.1",
- "@forge/tunnel": "6.3.3-next.11-experimental-4bd2ca0",
+ "@forge/tunnel": "6.3.3-next.12",
"@forge/util": "2.0.1",
"@sentry/node": "7.106.0",
"ajv": "^8.12.0",
"archiver": "^7.0.1",Index: package/out/command-line/register-webtrigger-commands.d.ts.map
===================================================================
--- package/out/command-line/register-webtrigger-commands.d.ts.map
+++ package/out/command-line/register-webtrigger-commands.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,uGAM1B,YAAY,SA0Dd,CAAC"}
\ No newline at end of file
+{"version":3,"file":"register-webtrigger-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA8ItD,eAAO,MAAM,gBAAgB,SAAU,YAAY,SAIlD,CAAC"}
\ No newline at end of fileIndex: package/out/command-line/register-webtrigger-commands.js.map
===================================================================
--- package/out/command-line/register-webtrigger-commands.js.map
+++ package/out/command-line/register-webtrigger-commands.js.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"register-webtrigger-commands.js","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"register-webtrigger-commands.js","sourceRoot":"","sources":["../../src/command-line/register-webtrigger-commands.ts"],"names":[],"mappings":"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"}
\ No newline at end of file File too large for inline diff
Index: package/out/command-line/register-webtrigger-commands.d.ts
===================================================================
--- package/out/command-line/register-webtrigger-commands.d.ts
+++ package/out/command-line/register-webtrigger-commands.d.ts
@@ -1,3 +1,3 @@
import { Dependencies } from './dependency-injection';
-export declare const registerCommands: ({ cmd, ui, configFile, services: { installationsService }, commands: { getWebTriggerURLCommand } }: Dependencies) => void;
+export declare const registerCommands: (deps: Dependencies) => void;
//# sourceMappingURL=register-webtrigger-commands.d.ts.map
\ No newline at end of file