Add/delete service commands and app use enhancements

README.md

@@ -31,13 +31,15 @@ $ aio app --help
 * [`aio app:add:action`](#aio-appaddaction)
 * [`aio app:add:ci`](#aio-appaddci)
 * [`aio app:add:event`](#aio-appaddevent)
+* [`aio app:add:service`](#aio-appaddservice)
 * [`aio app:add:web-assets`](#aio-appaddweb-assets)
 * [`aio app:build`](#aio-appbuild)
 * [`aio app:create [PATH]`](#aio-appcreate-path)
 * [`aio app:delete`](#aio-appdelete)
 * [`aio app:delete:action [ACTION-NAME]`](#aio-appdeleteaction-action-name)
 * [`aio app:delete:ci`](#aio-appdeleteci)
 * [`aio app:delete:event EVENT-ACTION-NAME`](#aio-appdeleteevent-event-action-name)
+* [`aio app:delete:service`](#aio-appdeleteservice)
 * [`aio app:delete:web-assets`](#aio-appdeleteweb-assets)
 * [`aio app:deploy`](#aio-appdeploy)
 * [`aio app:get-url [ACTION]`](#aio-appget-url-action)
@@ -140,6 +142,27 @@ OPTIONS
 
 _See code: [src/commands/app/add/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/5.4.0/src/commands/app/add/event.js)_
 
+## `aio app:add:service`
+
+Subscribe to services in the current Workspace
+
+```
+Subscribe to services in the current Workspace
+
+
+USAGE
+  $ aio app:add:service
+
+OPTIONS
+  -v, --verbose  Verbose output
+  --version      Show version
+
+ALIASES
+  $ aio app:add:services
+```
+
+_See code: [src/commands/app/add/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/5.4.0/src/commands/app/add/service.js)_
+
 ## `aio app:add:web-assets`
 
 Add web assets support
@@ -167,7 +190,7 @@ Build an Adobe I/O App
 ```
 Build an Adobe I/O App
 
-This will always force a rebuild unless --no-force-build is set. 
+This will always force a rebuild unless --no-force-build is set.
 
 
 USAGE
@@ -290,6 +313,27 @@ OPTIONS
 
 _See code: [src/commands/app/delete/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/5.4.0/src/commands/app/delete/event.js)_
 
+## `aio app:delete:service`
+
+Delete Services in the current Workspace
+
+```
+Delete Services in the current Workspace
+
+
+USAGE
+  $ aio app:delete:service
+
+OPTIONS
+  -v, --verbose  Verbose output
+  --version      Show version
+
+ALIASES
+  $ aio app:delete:services
+```
+
+_See code: [src/commands/app/delete/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/5.4.0/src/commands/app/delete/service.js)_
+
 ## `aio app:delete:web-assets`
 
 Delete existing web assets
@@ -474,10 +518,10 @@ _See code: [src/commands/app/undeploy.js](https://github.com/adobe/aio-cli-plugi
 
 ## `aio app:use [CONFIG_FILE_PATH]`
 
-Import an Adobe I/O Developer Console configuration file
+Import an Adobe Developer Console configuration file
 
 ```
-Import an Adobe I/O Developer Console configuration file
+Import an Adobe Developer Console configuration file
 
 
 USAGE
@@ -487,10 +531,33 @@ ARGUMENTS
   CONFIG_FILE_PATH  path to an Adobe I/O Developer Console configuration file
 
 OPTIONS
-  -m, --merge      Merge any .aio and .env files during import of the Adobe I/O Developer Console configuration file
-  -v, --verbose    Verbose output
-  -w, --overwrite  Overwrite any .aio and .env files during import of the Adobe I/O Developer Console configuration file
-  --version        Show version
+  -g, --global                         Use the global Adobe Developer Console Org / Project / Workspace configuration,
+                                       which can be set via `aio console` commands
+
+  -v, --verbose                        Verbose output
+
+  -w, --workspace-name=workspace-name  Specify the Adobe Developer Console Workspace name to import the configuration
+                                       from
+
+  --confirm-service-sync               Skip the Service sync prompt and overwrite Service subscriptions in the new
+                                       Workspace with current subscriptions
+
+  --merge                              Merge any .aio and .env files during import of the Adobe Developer Console
+                                       configuration file
+
+  --no-input                           Skip user prompts by setting --no-service-sync and --merge. Requires one of
+                                       config_file_path or --global or --workspace-name
+
+  --no-service-sync                    Skip the Service sync prompt and do not attach current Service subscriptions to
+                                       the new Workspace
+
+  --overwrite                          Overwrite any .aio and .env files during import of the Adobe Developer Console
+                                       configuration file
+
+  --version                            Show version
+
+  --workspace                          Prompt for selection of a Workspace in the same Project, and import the
+                                       configuration for this Workspace
 ```
 
 _See code: [src/commands/app/use.js](https://github.com/adobe/aio-cli-plugin-app/blob/5.4.0/src/commands/app/use.js)_

package.json

@@ -11,7 +11,7 @@
     "@adobe/aio-lib-runtime": "^1.2.5",
     "@adobe/aio-lib-web": "^4.0.0",
     "@adobe/generator-aio-app": "^1.9.0",
-    "@adobe/generator-aio-console": "^2.0.1",
+    "@adobe/generator-aio-console": "^2.0.6",
     "@oclif/command": "^1.5.11",
     "@oclif/config": "^1.12.9",
     "@oclif/plugin-help": "^2.2.3",

src/commands/app/add/service.js

@@ -0,0 +1,156 @@
+/*
+Copyright 2020 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+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')
+const chalk = require('chalk')
+
+const {
+  getCliInfo,
+  setOrgServicesConfig,
+  setWorkspaceServicesConfig,
+  warnIfOverwriteServicesInProductionWorkspace
+} = require('../../../lib/app-helper')
+
+const BaseCommand = require('../../../BaseCommand')
+const LibConsoleCLI = require('@adobe/generator-aio-console/lib/console-cli')
+
+const { ENTP_INT_CERTS_FOLDER, CONSOLE_API_KEYS } = require('../../../lib/defaults')
+
+class AddServiceCommand extends BaseCommand {
+  async run () {
+    const { flags } = this.parse(AddServiceCommand)
+
+    aioLogger.debug(`adding services to the current workspace, using flags: ${JSON.stringify(flags, null, 2)}`)
+
+    // login
+    const { accessToken, env } = await getCliInfo()
+    const consoleCLI = await LibConsoleCLI.init({ accessToken, env, apiKey: CONSOLE_API_KEYS[env] })
+
+    // load console configuration from .aio and .env files
+    const projectConfig = config.get('project')
+    if (!projectConfig) {
+      this.error('Incomplete .aio configuration, please import a valid Adobe Developer Console configuration via `aio app use` first.')
+    }
+    const orgId = projectConfig.org.id
+    const project = { name: projectConfig.name, id: projectConfig.id }
+    const workspace = { name: projectConfig.workspace.name, id: projectConfig.workspace.id }
+
+    // get latest support services
+    const supportedServices = await consoleCLI.getEnabledServicesForOrg(orgId)
+
+    // get current service properties
+    const currentServiceProperties = await consoleCLI.getServicePropertiesFromWorkspace(
+      orgId,
+      project.id,
+      workspace,
+      supportedServices
+    )
+
+    // update the service config, subscriptions and supported services
+    setOrgServicesConfig(supportedServices)
+    setWorkspaceServicesConfig(currentServiceProperties)
+
+    // log currently selected services (messages on stderr)
+    const currentServiceNames = currentServiceProperties.map(s => s.name)
+    console.error(`Workspace ${workspace.name} currently subscribes to the following services:\n${JSON.stringify(currentServiceNames, null, 2)}`)
+
+    // prompt user to decide on how to add services:
+    // - select service subscription manually
+    // - or clone from existing workspace
+    const op = await consoleCLI.promptForServiceSubscriptionsOperation(
+      workspace.name,
+      { cloneChoice: true, nopChoice: true }
+    )
+
+    if (op === 'nop') {
+      return null
+    }
+
+    let newServiceProperties = []
+    if (op === 'select') {
+      // filter out already added services for selection
+      const currentServiceCodesSet = new Set(currentServiceProperties.map(s => s.sdkCode))
+      const filteredServices = supportedServices.filter(s => s.type === 'entp' && !currentServiceCodesSet.has(s.code))
+      if (filteredServices.length <= 0) {
+        LibConsoleCLI.cleanStdOut()
+        this.error(`All supported Services in the Organization have already been added to Workspace ${workspace.name}`)
+      }
+      // prompt to manually select services
+      newServiceProperties = await consoleCLI.promptForSelectServiceProperties(
+        workspace.name,
+        filteredServices
+      )
+      // now past services are appended to the selection for subscription
+      newServiceProperties.push(...currentServiceProperties)
+    }
+    if (op === 'clone') {
+      // get latest workspaces which are not the current
+      const otherWorkspaces = (
+        await consoleCLI.getWorkspaces(orgId, project.id)
+      ).filter(w => w.id !== workspace.id)
+      // prompt to select one of those as a source for clone
+      const workspaceFrom = await consoleCLI.promptForSelectWorkspace(
+        otherWorkspaces,
+        {},
+        { allowCreate: false }
+      )
+      // get serviceProperties from source workspace
+      newServiceProperties = await consoleCLI.getServicePropertiesFromWorkspace(
+        orgId,
+        project.id,
+        workspaceFrom,
+        supportedServices
+      )
+      if (currentServiceNames.length > 0) {
+        warnIfOverwriteServicesInProductionWorkspace(project.name, workspace.name)
+        if (workspace.name !== 'Production') {
+          console.error(chalk.yellow(`⚠ Service subscriptions in Workspace '${workspace.name}' will be overwritten.`))
+        }
+      }
+    }
+    // prompt confirm the new service subscription list
+    const confirm = await consoleCLI.confirmNewServiceSubscriptions(
+      workspace.name,
+      newServiceProperties
+    )
+    if (confirm) {
+      // if confirmed update the services
+      await consoleCLI.subscribeToServices(
+        orgId,
+        project,
+        workspace,
+        path.join(this.config.dataDir, ENTP_INT_CERTS_FOLDER),
+        newServiceProperties
+      )
+      // update the service configuration with the latest subscriptions
+      setWorkspaceServicesConfig(newServiceProperties)
+      // success !
+      this.log(chalk.green(chalk.bold(`Successfully updated Service Subscriptions in Workspace ${workspace.name}`)))
+      return newServiceProperties
+    }
+    // confirm == false, do nothing
+    return null
+  }
+}
+
+AddServiceCommand.description = `Subscribe to Services in the current Workspace
+`
+
+AddServiceCommand.flags = {
+  ...BaseCommand.flags
+}
+
+AddServiceCommand.aliases = ['app:add:services']
+AddServiceCommand.args = []
+
+module.exports = AddServiceCommand

src/commands/app/build.js

@@ -110,7 +110,7 @@ class Build extends BaseCommand {
 
 Build.description = `Build an Adobe I/O App
 
-This will always force a rebuild unless --no-force-build is set. 
+This will always force a rebuild unless --no-force-build is set.
 `
 
 Build.flags = {