@adobe/aio-cli-plugin-app 8.5.0 → 8.6.1-pre.2022-06-25.2ab6c018

package/src/commands/app/init.js

@@ -16,7 +16,7 @@ const fs = require('fs-extra')
 const ora = require('ora')
 const chalk = require('chalk')
 // const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:init', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const generators = require('@adobe/generator-aio-app')
 
 const { loadAndValidateConfigFile, importConfigJson } = require('../../lib/import')
@@ -29,7 +29,7 @@ const DEFAULT_WORKSPACE = 'Stage'
 
 class InitCommand extends AddCommand {
   async run () {
-    const { args, flags } = this.parse(InitCommand)
+    const { args, flags } = await this.parse(InitCommand)
 
     if (!flags.login && flags.workspace !== DEFAULT_WORKSPACE) {
       this.error('--no-login and --workspace flags cannot be used together.')
@@ -128,6 +128,24 @@ class InitCommand extends AddCommand {
     this.log(chalk.blue(chalk.bold(`Project initialized for Workspace ${workspace.name}, you can run 'aio app use -w <workspace>' to switch workspace.`)))
   }
 
+  async ensureDevTermAccepted (consoleCLI, orgId) {
+    const isTermAccepted = await consoleCLI.checkDevTermsForOrg(orgId)
+    if (!isTermAccepted) {
+      const terms = await consoleCLI.getDevTermsForOrg()
+      const confirmDevTerms = await consoleCLI.prompt.promptConfirm(`${terms.text}
+      \nDo you agree with the new Developer Terms?`)
+      if (!confirmDevTerms) {
+        this.error('The Developer Terms of Service were declined')
+      } else {
+        const accepted = await consoleCLI.acceptDevTermsForOrg(orgId)
+        if (!accepted) {
+          this.error('The Developer Terms of Service could not be accepted')
+        }
+        this.log(`The Developer Terms of Service were successfully accepted for org ${orgId}`)
+      }
+    }
+  }
+
   async selectExtensionPoints (flags, orgSupportedServices = null) {
     if (!flags.extensions) {
       return [implPromptChoices.find(i => i.value.name === 'application').value]
@@ -167,6 +185,7 @@ class InitCommand extends AddCommand {
   async selectConsoleOrg (consoleCLI) {
     const organizations = await consoleCLI.getOrganizations()
     const selectedOrg = await consoleCLI.promptForSelectOrganization(organizations)
+    await this.ensureDevTermAccepted(consoleCLI, selectedOrg.id)
     return selectedOrg
   }
 
@@ -310,38 +329,38 @@ InitCommand.description = `Create a new Adobe I/O App
 
 InitCommand.flags = {
   ...AddCommand.flags,
-  yes: flags.boolean({
+  yes: Flags.boolean({
     description: 'Skip questions, and use all default values',
     default: false,
     char: 'y'
   }),
-  import: flags.string({
+  import: Flags.string({
     description: 'Import an Adobe I/O Developer Console configuration file',
     char: 'i'
   }),
-  login: flags.boolean({
+  login: Flags.boolean({
     description: 'Login using your Adobe ID for interacting with Adobe I/O Developer Console',
     default: true,
     allowNo: true
   }),
-  extensions: flags.boolean({
+  extensions: Flags.boolean({
     description: 'Use --no-extensions to create a blank application that does not integrate with Exchange',
     default: true,
     allowNo: true
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Extension point(s) to implement',
     char: 'e',
     multiple: true,
     exclusive: ['extensions']
   }),
-  workspace: flags.string({
+  workspace: Flags.string({
     description: 'Specify the Adobe Developer Console Workspace to init from, defaults to Stage',
     default: DEFAULT_WORKSPACE,
     char: 'w',
     exclusive: ['import'] // also no-login
   }),
-  'confirm-new-workspace': flags.boolean({
+  'confirm-new-workspace': Flags.boolean({
     description: 'Skip and confirm prompt for creating a new workspace',
     default: false
   })

package/src/commands/app/list/extension-points.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:list:extension-points', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const { EXTENSION_POINT_LIST } = require('../../../lib/defaults')
 const chalk = require('chalk')
@@ -20,7 +20,7 @@ const yaml = require('js-yaml')
 
 class ListExtensionPointsCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(ListExtensionPointsCommand)
+    const { flags } = await this.parse(ListExtensionPointsCommand)
     aioLogger.debug(`list all extensions points with flags: ${JSON.stringify(flags)}`)
 
     // print
@@ -45,11 +45,11 @@ ListExtensionPointsCommand.description = `List all extension points for the sele
 `
 ListExtensionPointsCommand.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
   })

package/src/commands/app/list/extension.js

@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../BaseCommand')
 
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:list:extensions', { provider: 'debug' })
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const { EXTENSION_POINT_LIST } = require('../../../lib/defaults')
 const chalk = require('chalk')
@@ -20,7 +20,7 @@ const yaml = require('js-yaml')
 
 class ListExtensionCommand extends BaseCommand {
   async run () {
-    const { flags } = this.parse(ListExtensionCommand)
+    const { flags } = await this.parse(ListExtensionCommand)
     aioLogger.debug(`list extensions with flags: ${JSON.stringify(flags)}`)
 
     const extConfig = this.getAppExtConfigs(flags)
@@ -81,11 +81,11 @@ ListExtensionCommand.description = `List implemented extensions
 `
 ListExtensionCommand.flags = {
   ...BaseCommand.flags,
-  json: flags.boolean({
+  json: Flags.boolean({
     description: 'Output json',
     char: 'j'
   }),
-  yml: flags.boolean({
+  yml: Flags.boolean({
     description: 'Output yml',
     char: 'y'
   })

package/src/commands/app/list/index.js

@@ -9,13 +9,13 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const HHelp = require('@oclif/plugin-help').default
+const { Help } = require('@oclif/core')
 const BaseCommand = require('../../../BaseCommand')
 
 class ListCommand extends BaseCommand {
   async run () {
-    const help = new HHelp(this.config)
-    help.showHelp(['app:list', '--help'])
+    const help = new Help(this.config)
+    await help.showHelp(['app:list', '--help'])
   }
 }
 

package/src/commands/app/logs.js

@@ -10,28 +10,32 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 const { wrapError } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
 
+const SECURED = 'require-adobe-auth'
+
 class Logs extends BaseCommand {
   _processEachAction (fullConfig, processFn) {
+    const isSecuredAction = (pkg, aName) => pkg && pkg.actions && pkg.actions[aName] &&
+      pkg.actions[aName].annotations && pkg.actions[aName].annotations[SECURED]
+
     Object.entries(fullConfig.all).forEach(([, config]) => {
       Object.entries(config.manifest.full.packages).forEach(([packageName, pkg]) => {
         // handle default package
         packageName = packageName.replace(/__APP_PACKAGE__/g, config.ow.package)
-
         Object.keys(pkg.actions).forEach((aName) => {
-          processFn(packageName, aName)
+          processFn(packageName, aName, isSecuredAction(pkg, aName))
         })
       })
     })
   }
 
   async run () {
-    const { flags } = this.parse(Logs)
+    const { flags } = await this.parse(Logs)
     const fullConfig = this.getFullConfig()
 
     // has any backend
@@ -80,14 +84,18 @@ class Logs extends BaseCommand {
         }
       })
     } else {
-      this._processEachAction(fullConfig, (packageName, aName) => {
+      this._processEachAction(fullConfig, (packageName, aName, isSecured) => {
+        if (isSecured) {
+          const securedAName = '__secured_' + aName
+          filterActions.push(`${packageName}/${securedAName}`)
+        }
         filterActions.push(`${packageName}/${aName}`)
       })
     }
 
     try {
       const owConfig = { ow: Object.values(fullConfig.all)[0].ow }
-      await rtLib.printActionLogs(owConfig, this.log, flags.limit, filterActions, flags.strip, flags.poll || flags.tail || flags.watch)
+      await rtLib.printActionLogs(owConfig, this.log.bind(this), flags.limit, filterActions, flags.strip, flags.poll || flags.tail || flags.watch)
     } catch (error) {
       this.error(wrapError(error))
     }
@@ -99,34 +107,34 @@ Logs.description = `Fetch logs for an Adobe I/O App
 
 Logs.flags = {
   ...BaseCommand.flags,
-  limit: flags.integer({
+  limit: Flags.integer({
     description: 'Limit number of activations to fetch logs from ( 1-50 )',
     default: 1,
     char: 'l'
   }),
-  action: flags.string({
+  action: Flags.string({
     description: 'Fetch logs for a specific action',
     char: 'a',
     multiple: true
   }),
-  strip: flags.boolean({
+  strip: Flags.boolean({
     char: 'r',
     description: 'strip timestamp information and output first line only',
     default: false
   }),
-  tail: flags.boolean({
+  tail: Flags.boolean({
     description: 'Fetch logs continuously',
     char: 't',
     default: false,
     exclusive: ['watch', 'poll']
   }),
-  watch: flags.boolean({
+  watch: Flags.boolean({
     description: 'Fetch logs continuously',
     default: false,
     char: 'w',
     exclusive: ['tail', 'poll']
   }),
-  poll: flags.boolean({
+  poll: Flags.boolean({
     description: 'Fetch logs continuously',
     default: false,
     char: 'o',

package/src/commands/app/run.js

@@ -15,9 +15,8 @@ const chalk = require('chalk')
 const fs = require('fs-extra')
 const https = require('https')
 const getPort = require('get-port')
-const { cli } = require('cli-ux')
 
-const { flags } = require('@oclif/command')
+const { Flags, CliUx: { ux: cli } } = require('@oclif/core')
 const coreConfig = require('@adobe/aio-lib-core-config')
 
 const BaseCommand = require('../../BaseCommand')
@@ -33,7 +32,7 @@ const CONFIG_KEY = 'aio-dev.dev-keys'
 class Run extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Run)
+    const { flags } = await this.parse(Run)
     // aliases
     flags.actions = flags.actions && !flags['skip-actions']
 
@@ -42,7 +41,7 @@ class Run extends BaseCommand {
     const runConfigs = this.getAppExtConfigs(flags)
     const entries = Object.entries(runConfigs)
     if (entries.length > 1) {
-      this.error('You can only run one implementation at the time, please filter with the \'-e\' flag.')
+      this.error('Your app implements multiple extensions. You can only run one at the time, please select which extension to run with the \'-e\' flag.')
     }
     const name = entries[0][0]
     const config = entries[0][1]
@@ -60,6 +59,7 @@ class Run extends BaseCommand {
   async runOneExtensionPoint (name, config, flags, spinner) {
     const hasBackend = config.app.hasBackend
     const hasFrontend = config.app.hasFrontend
+    const headlessApp = hasBackend && !hasFrontend
 
     if (!hasBackend && !hasFrontend) {
       this.error(new Error('nothing to run.. there is no frontend and no manifest.yml, are you in a valid app?'))
@@ -97,7 +97,8 @@ class Run extends BaseCommand {
       }
     }
 
-    const onProgress = !flags.verbose
+    const verboseOutput = flags.verbose || flags.local || headlessApp
+    const onProgress = !verboseOutput
       ? info => {
         spinner.text = info
       }
@@ -201,31 +202,31 @@ Run.description = 'Run an Adobe I/O App'
 
 Run.flags = {
   ...BaseCommand.flags,
-  local: flags.boolean({
+  local: Flags.boolean({
     description: 'Run/debug actions locally ( requires Docker running )',
     exclusive: ['skip-actions']
   }),
-  serve: flags.boolean({
+  serve: Flags.boolean({
     description: '[default: true] Start frontend server (experimental)',
     default: true,
     allowNo: true
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions',
     exclusive: ['local'],
     default: false
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Run actions, defaults to true, to skip actions use --no-actions',
     exclusive: ['local'], // no-actions and local don't work together
     default: true,
     allowNo: true
   }),
-  open: flags.boolean({
+  open: Flags.boolean({
     description: 'Open the default web browser after a successful run, only valid if your app has a front-end',
     default: false
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Run only a specific extension, this flag can only be specified once',
     char: 'e',
     // we do not support multiple yet

package/src/commands/app/test.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 
 const { runScript } = require('../../lib/app-helper')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const BaseCommand = require('../../BaseCommand')
 const chalk = require('chalk')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:test', { provider: 'debug' })
@@ -19,7 +19,7 @@ const path = require('path')
 
 class Test extends BaseCommand {
   async run () {
-    const { flags } = this.parse(Test)
+    const { flags } = await this.parse(Test)
     let { all, unit, e2e, action, extension } = flags
 
     // 'all' overrides the setting of either the unit or e2e flag
@@ -201,27 +201,27 @@ class Test extends BaseCommand {
 }
 
 Test.flags = {
-  extension: flags.string({
+  extension: Flags.string({
     char: 'e',
     description: 'the extension(s) to test',
     exclusive: ['action'],
     multiple: true
   }),
-  action: flags.string({
+  action: Flags.string({
     char: 'a',
     description: 'the action(s) to test',
     exclusive: ['extension'],
     multiple: true
   }),
-  all: flags.boolean({
+  all: Flags.boolean({
     description: 'run both unit and e2e tests',
     default: false
   }),
-  e2e: flags.boolean({
+  e2e: Flags.boolean({
     description: 'run e2e tests',
     default: false
   }),
-  unit: flags.boolean({
+  unit: Flags.boolean({
     description: 'run unit tests',
     default: false
   })

package/src/commands/app/undeploy.js

@@ -14,7 +14,7 @@ const ora = require('ora')
 const chalk = require('chalk')
 // const path = require('path')
 
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const webLib = require('@adobe/aio-lib-web')
@@ -24,7 +24,7 @@ const rtLib = require('@adobe/aio-lib-runtime')
 class Undeploy extends BaseCommand {
   async run () {
     // cli input
-    const { flags } = this.parse(Undeploy)
+    const { flags } = await this.parse(Undeploy)
 
     // flags
     flags['web-assets'] = flags['web-assets'] && !flags['skip-static'] && !flags['skip-web-assets'] && !flags.action
@@ -146,36 +146,36 @@ Undeploy.description = `Undeploys an Adobe I/O App
 
 Undeploy.flags = {
   ...BaseCommand.flags,
-  'skip-static': flags.boolean({
+  'skip-static': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-web-assets': flags.boolean({
+  'skip-web-assets': Flags.boolean({
     description: '[deprecated] Please use --no-web-assets'
   }),
-  'skip-actions': flags.boolean({
+  'skip-actions': Flags.boolean({
     description: '[deprecated] Please use --no-actions'
   }),
-  actions: flags.boolean({
+  actions: Flags.boolean({
     description: '[default: true] Undeploy actions if any',
     default: true,
     allowNo: true
   }),
-  'web-assets': flags.boolean({
+  'web-assets': Flags.boolean({
     description: '[default: true] Undeploy web-assets if any',
     default: true,
     allowNo: true
   }),
-  extension: flags.string({
+  extension: Flags.string({
     description: 'Undeploy only a specific extension, the flags can be specified multiple times',
     char: 'e',
     multiple: true
   }),
-  unpublish: flags.boolean({
+  unpublish: Flags.boolean({
     description: '[default: true] Unpublish selected extension(s) from Exchange',
     allowNo: true,
     default: true
   }),
-  'force-unpublish': flags.boolean({
+  'force-unpublish': Flags.boolean({
     description: 'Force unpublish extension(s) from Exchange, will delete all extension points',
     default: false,
     exclusive: ['unpublish'] // unpublish is excluded

package/src/commands/app/use.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../BaseCommand')
 const { CONSOLE_CONFIG_KEY, importConfigJson, loadAndValidateConfigFile } = require('../../lib/import')
-const { flags } = require('@oclif/command')
+const { Flags } = require('@oclif/core')
 const inquirer = require('inquirer')
 const config = require('@adobe/aio-lib-core-config')
 const { EOL } = require('os')
@@ -25,7 +25,7 @@ const chalk = require('chalk')
 
 class Use extends BaseCommand {
   async run () {
-    const { flags, args } = this.parse(Use)
+    const { flags, args } = await this.parse(Use)
 
     flags.workspace = flags.workspace || flags['workspace-name'] || ''
 
@@ -370,49 +370,49 @@ To download the configuration file for your project, select the 'Download' butto
 
 Use.flags = {
   ...BaseCommand.flags,
-  overwrite: flags.boolean({
+  overwrite: Flags.boolean({
     description: 'Overwrite any .aio and .env files during import of the Adobe Developer Console configuration file',
     default: false,
     exclusive: ['merge']
   }),
-  merge: flags.boolean({
+  merge: Flags.boolean({
     description: 'Merge any .aio and .env files during import of the Adobe Developer Console configuration file',
     default: false,
     exclusive: ['overwrite']
   }),
-  global: flags.boolean({
+  global: Flags.boolean({
     description: 'Use the global Adobe Developer Console Org / Project / Workspace configuration, which can be set via `aio console` commands',
     default: false,
     char: 'g',
     exclusive: ['workspace']
   }),
-  workspace: flags.string({
+  workspace: Flags.string({
     description: 'Specify the Adobe Developer Console Workspace name or Workspace id to import the configuration from',
     default: '',
     char: 'w',
     exclusive: ['global', 'workspace-name']
   }),
-  'confirm-new-workspace': flags.boolean({
+  'confirm-new-workspace': Flags.boolean({
     description: 'Skip and confirm prompt for creating a new workspace',
     default: false
   }),
-  'workspace-name': flags.string({
+  'workspace-name': Flags.string({
     description: '[DEPRECATED]: please use --workspace instead',
     default: '',
     char: 'w',
     exclusive: ['global', 'workspace']
   }),
-  'no-service-sync': flags.boolean({
+  'no-service-sync': Flags.boolean({
     description: 'Skip the Service sync prompt and do not attach current Service subscriptions to the new Workspace',
     default: false,
     exclusive: ['confirm-service-sync']
   }),
-  'confirm-service-sync': flags.boolean({
+  'confirm-service-sync': Flags.boolean({
     description: 'Skip the Service sync prompt and overwrite Service subscriptions in the new Workspace with current subscriptions',
     default: false,
     exclusive: ['no-service-sync']
   }),
-  'no-input': flags.boolean({
+  'no-input': Flags.boolean({
     description: 'Skip user prompts by setting --no-service-sync and --merge. Requires one of config_file_path or --global or --workspace',
     default: false
   })

package/src/lib/build-actions.js

@@ -18,12 +18,13 @@ const { buildActions } = require('@adobe/aio-lib-runtime')
  *
  * @param {object} config see src/lib/config-loader.js
  * @param {Array<string>} filterActions add filters to deploy only specified OpenWhisk actions
+ * @param {boolean} [forceBuild=false] force a build (skip file changed hash check)
  */
-module.exports = async (config, filterActions) => {
+module.exports = async (config, filterActions, forceBuild = false) => {
   utils.runScript(config.hooks['pre-app-build'])
   const script = await utils.runScript(config.hooks['build-actions'])
   if (!script) {
-    await buildActions(config, filterActions)
+    await buildActions(config, filterActions, forceBuild)
   }
   utils.runScript(config.hooks['post-app-build'])
 }

package/src/lib/deploy-actions.js

@@ -17,17 +17,17 @@ const { deployActions } = require('@adobe/aio-lib-runtime')
  * Deploys actions.
  *
  * @param {object} config see src/lib/config-loader.js
- * @param {boolean} isLocal default false, set to true if it's a local deploy
+ * @param {boolean} isLocalDev default false, set to true if it's a local deploy
  * @param {Function} [log] a log function
  * @param {boolean} filter true if a filter by built actions is desired.
  */
 /** @private */
-module.exports = async (config, isLocal = false, log = () => {}, filter = false) => {
+module.exports = async (config, isLocalDev = false, log = () => {}, filter = false) => {
   utils.runScript(config.hooks['pre-app-deploy'])
   const script = await utils.runScript(config.hooks['deploy-actions'])
   if (!script) {
     const deployConfig = {
-      isLocalDev: isLocal,
+      isLocalDev,
       filterEntities: {
         byBuiltActions: filter
       }

package/src/lib/run-dev.js

@@ -19,7 +19,7 @@ const bundleServe = require('./bundle-serve')
 const { defaultHttpServerPort: SERVER_DEFAULT_PORT } = require('./defaults')
 const serve = require('./serve')
 const Cleanup = require('./cleanup')
-const runLocalRuntime = require('./run-local-runtime')
+const { runLocalRuntime } = require('./run-local-runtime')
 
 const buildActions = require('./build-actions')
 const deployActions = require('./deploy-actions')
@@ -80,9 +80,8 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
 
       // build and deploy actions
       log('building actions..')
-      await buildActions(devConfig)
+      await buildActions(devConfig, null, true /* force build */)
 
-      log(`watching action files at ${devConfig.actions.src}...`)
       const { cleanup: watcherCleanup } = await actionsWatcher({ config: devConfig, isLocal, log })
       cleanup.add(() => watcherCleanup(), 'stopping action watcher...')
     }
@@ -95,7 +94,7 @@ async function runDev (config, dataDir, options = {}, log = () => {}) {
         // note the condition: we still write backend urls EVEN if skipActions is set
         // the urls will always point to remotely deployed actions if skipActions is set
         log('injecting backend urls into frontend config')
-        urls = rtLibUtils.getActionUrls(devConfig, true, isLocal && !skipActions)
+        urls = rtLibUtils.getActionUrls(devConfig, true, isLocal && !skipActions, true)
       }
       utils.writeConfig(devConfig.web.injectedConfig, urls)