@adobe/aio-cli-plugin-app 10.0.3 → 10.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.0.3",
+  "version": "10.1.0",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
@@ -15,7 +15,7 @@
     "@adobe/aio-lib-runtime": "^5.0.0",
     "@adobe/aio-lib-templates": "^2.2.0",
     "@adobe/aio-lib-web": "^6.0.1",
-    "@adobe/generator-aio-app": "^4.0.0",
+    "@adobe/generator-aio-app": "^5.1.0",
     "@adobe/generator-app-common-lib": "^0.3.3",
     "@adobe/inquirer-table-checkbox": "^1.2.0",
     "@oclif/core": "^1.15.0",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@adobe/aio-lib-test-proxy": "^1.0.0",
     "@adobe/eslint-config-aio-lib-config": "^2.0.0",
-    "@types/jest": "^28",
+    "@types/jest": "^29",
     "babel-runtime": "^6.26.0",
     "core-js": "^3",
     "eol": "^0.9.1",
@@ -95,7 +95,7 @@
     "prepack": "oclif manifest && oclif readme --no-aliases",
     "test": "npm run unit-tests && npm run lint",
     "unit-tests": "jest -c jest.config.js",
-    "version": "oclif readme && git add README.md",
+    "version": "oclif readme --no-aliases && git add README.md",
     "update-openwhisk-runtimes": "node bin/openwhisk-standalone-config/get-runtimes.js > bin/openwhisk-standalone-config/runtimes.json"
   },
   "bin": {

package/src/TemplatesCommand.js

@@ -150,6 +150,14 @@ class TemplatesCommand extends AddCommand {
   } = {}) {
     const spinner = ora()
 
+    if (templates.length <= 0) {
+      aioLogger.debug('installTemplates: standalone-app')
+      await this.config.runHook('telemetry', { data: 'installTemplates:standalone-app' })
+    } else {
+      aioLogger.debug(`installTemplates: ${templates}`)
+      await this.config.runHook('telemetry', { data: `installTemplates:${templates}` })
+    }
+
     // install the templates in sequence
     for (const template of templates) {
       spinner.info(`Installing template ${template}`)

package/src/commands/app/add/service.js

@@ -9,6 +9,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
+const { importConsoleConfig, downloadConsoleConfigToBuffer } = require('../../../lib/import')
 const path = require('path')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:add:service', { provider: 'debug' })
 const config = require('@adobe/aio-lib-core-config')
@@ -130,8 +131,16 @@ class AddServiceCommand extends BaseCommand {
         path.join(this.config.dataDir, ENTP_INT_CERTS_FOLDER),
         newServiceProperties
       )
-      // update the service configuration with the latest subscriptions
-      setWorkspaceServicesConfig(newServiceProperties)
+
+      // update environment
+      const config = {
+        org: { id: projectConfig.org.id },
+        project: { id: projectConfig.id },
+        workspace: { id: projectConfig.workspace.id }
+      }
+      const buffer = await downloadConsoleConfigToBuffer(consoleCLI, config, supportedServices)
+      await importConsoleConfig(buffer, flags)
+
       // success !
       this.log(chalk.green(chalk.bold(`Successfully updated Service Subscriptions in Workspace ${workspace.name}`)))
       return newServiceProperties

package/src/commands/app/deploy.js

@@ -37,7 +37,7 @@ class Deploy extends BuildCommand {
 
     // if there are no extensions, then set publish to false
     flags.publish = flags.publish && !isStandaloneApp
-    let libConsoleCLI
+    let libConsoleCLI // <= this can be undefined later on, and it was not checked
     if (flags.publish) {
       // force login at beginning (if required)
       libConsoleCLI = await this.getLibConsoleCLI()
@@ -158,6 +158,11 @@ class Deploy extends BuildCommand {
         try {
           const script = await runScript(config.hooks['deploy-actions'])
           if (!script) {
+            await this.config.runHook('deploy-actions', {
+              appConfig: config,
+              filterEntities: filterActions || [],
+              isLocalDev: false
+            })
             deployedRuntimeEntities = await rtLib.deployActions(config, { filterEntities }, onProgress)
           }
 

package/src/commands/app/init.js

@@ -21,7 +21,7 @@ const TemplateRegistryAPI = require('@adobe/aio-lib-templates')
 const inquirer = require('inquirer')
 const hyperlinker = require('hyperlinker')
 
-const { loadAndValidateConfigFile, importConfigJson } = require('../../lib/import')
+const { loadAndValidateConfigFile, importConfigJson } = require('../../lib/import-helper')
 const { SERVICE_API_KEY_ENV } = require('../../lib/defaults')
 
 const DEFAULT_WORKSPACE = 'Stage'

package/src/commands/app/run.js

@@ -104,8 +104,8 @@ class Run extends BaseCommand {
         spinner.info(chalk.dim(`${info}`))
         spinner.start()
       }
-
-    const frontendUrl = await runDev(config, this.config.dataDir, runOptions, onProgress)
+    const inprocHook = this.config.runHook.bind(this.config)
+    const frontendUrl = await runDev(config, this.config.dataDir, runOptions, onProgress, inprocHook)
     try {
       await runScript(config.hooks['post-app-run'])
     } catch (err) {

package/src/commands/app/use.js

@@ -10,14 +10,15 @@ governing permissions and limitations under the License.
 */
 
 const BaseCommand = require('../../BaseCommand')
-const { CONSOLE_CONFIG_KEY, importConfigJson, loadAndValidateConfigFile } = require('../../lib/import')
+const { CONSOLE_CONFIG_KEY } = require('../../lib/import-helper')
+const { importConsoleConfig, downloadConsoleConfigToBuffer } = require('../../lib/import')
 const { Flags } = require('@oclif/core')
 const inquirer = require('inquirer')
 const config = require('@adobe/aio-lib-core-config')
 const { EOL } = require('os')
 const { warnIfOverwriteServicesInProductionWorkspace } = require('../../lib/app-helper')
 const path = require('path')
-const { SERVICE_API_KEY_ENV, ENTP_INT_CERTS_FOLDER } = require('../../lib/defaults')
+const { ENTP_INT_CERTS_FOLDER } = require('../../lib/defaults')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:use', { provider: 'debug' })
 const chalk = require('chalk')
 
@@ -45,7 +46,7 @@ class Use extends BaseCommand {
     this.log(`You are currently in:${EOL}${currentConfigString}${EOL}`)
 
     if (args.config_file_path) {
-      const consoleConfig = await this.importConsoleConfig(args.config_file_path, flags)
+      const consoleConfig = await importConsoleConfig(args.config_file_path, flags)
       this.finalLogMessage(consoleConfig)
       return
     }
@@ -107,9 +108,9 @@ class Use extends BaseCommand {
     }
 
     // download the console configuration for the newly selected org, project, workspace
-    const buffer = await this.downloadConsoleConfigToBuffer(consoleCLI, newConfig, supportedServices)
+    const buffer = await downloadConsoleConfigToBuffer(consoleCLI, newConfig, supportedServices)
 
-    const consoleConfig = await this.importConsoleConfig(buffer, flags)
+    const consoleConfig = await importConsoleConfig(buffer, flags)
     this.finalLogMessage(consoleConfig)
   }
 
@@ -308,36 +309,6 @@ class Use extends BaseCommand {
     console.error(`✔ Successfully updated Services in Project ${newConfig.project.name} and Workspace ${newConfig.workspace.name}.`)
   }
 
-  async importConsoleConfig (consoleConfigFileOrBuffer, flags) {
-    const overwrite = flags.overwrite
-    const merge = flags.merge
-    let interactive = true
-
-    if (overwrite || merge) {
-      interactive = false
-    }
-
-    // before importing the config, first extract the service api key id
-    const { values: config } = loadAndValidateConfigFile(consoleConfigFileOrBuffer)
-    const project = config.project
-    const jwtConfig = project.workspace.details.credentials && project.workspace.details.credentials.find(c => c.jwt)
-    const serviceClientId = (jwtConfig && jwtConfig.jwt.client_id) || ''
-    const extraEnvVars = { [SERVICE_API_KEY_ENV]: serviceClientId }
-
-    await importConfigJson(consoleConfigFileOrBuffer, process.cwd(), { interactive, overwrite, merge }, extraEnvVars)
-    return config
-  }
-
-  async downloadConsoleConfigToBuffer (consoleCLI, config, supportedServices) {
-    const workspaceConfig = await consoleCLI.getWorkspaceConfig(
-      config.org.id,
-      config.project.id,
-      config.workspace.id,
-      supportedServices
-    )
-    return Buffer.from(JSON.stringify(workspaceConfig))
-  }
-
   async finalLogMessage (consoleConfig) {
     const config = { org: consoleConfig.project.org, project: consoleConfig.project, workspace: consoleConfig.project.workspace }
     const configString = this.configString(config)

package/src/lib/actions-watcher.js

@@ -61,10 +61,9 @@ module.exports = async (watcherOptions) => {
  * @param {Array<string>} filterActions add filters to deploy only specified OpenWhisk actions
  */
 async function buildAndDeploy (watcherOptions, filterActions) {
-  const { config, isLocal, log } = watcherOptions
-
+  const { config, isLocal, log, inprocHook } = watcherOptions
   await buildActions(config, filterActions)
-  await deployActions(config, isLocal, log, filterActions)
+  await deployActions(config, isLocal, log, filterActions, inprocHook)
 }
 
 /**

package/src/lib/deploy-actions.js

@@ -22,7 +22,7 @@ const { deployActions } = require('@adobe/aio-lib-runtime')
  * @param {boolean} filter true if a filter by built actions is desired.
  */
 /** @private */
-module.exports = async (config, isLocalDev = false, log = () => {}, filter = false) => {
+module.exports = async (config, isLocalDev = false, log = () => {}, filter = false, inprocHook) => {
   utils.runScript(config.hooks['pre-app-deploy'])
   const script = await utils.runScript(config.hooks['deploy-actions'])
   if (!script) {
@@ -32,6 +32,14 @@ module.exports = async (config, isLocalDev = false, log = () => {}, filter = fal
         byBuiltActions: filter
       }
     }
+    if (inprocHook) {
+      const hookFilterEntities = Array.isArray(filter) ? filter : []
+      await inprocHook('deploy-actions', {
+        appConfig: config,
+        filterEntities: hookFilterEntities,
+        isLocalDev
+      })
+    }
     const entities = await deployActions(config, deployConfig, log)
     if (entities.actions) {
       const web = entities.actions.filter(utils.createWebExportFilter(true))