@adobe/aio-cli-plugin-app 10.6.0 → 10.7.1

package/README.md

@@ -71,7 +71,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/index.ts)_
 
 ## `aio app add`
 
@@ -89,7 +89,7 @@ DESCRIPTION
   Add a new component to an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/add/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/index.ts)_
+_See code: [src/commands/app/add/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/index.ts)_
 
 ## `aio app add action`
 
@@ -114,7 +114,7 @@ ALIASES
   $ aio app add actions
 ```
 
-_See code: [src/commands/app/add/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/action.ts)_
+_See code: [src/commands/app/add/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/action.ts)_
 
 ## `aio app add ci`
 
@@ -132,7 +132,7 @@ DESCRIPTION
   Add CI files
 ```
 
-_See code: [src/commands/app/add/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/ci.ts)_
+_See code: [src/commands/app/add/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/ci.ts)_
 
 ## `aio app add event`
 
@@ -159,7 +159,7 @@ ALIASES
   $ aio app add events
 ```
 
-_See code: [src/commands/app/add/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/event.ts)_
+_See code: [src/commands/app/add/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/event.ts)_
 
 ## `aio app add extension`
 
@@ -185,7 +185,7 @@ ALIASES
   $ aio app add extensions
 ```
 
-_See code: [src/commands/app/add/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/extension.ts)_
+_See code: [src/commands/app/add/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/extension.ts)_
 
 ## `aio app add service`
 
@@ -209,7 +209,7 @@ ALIASES
   $ aio app add services
 ```
 
-_See code: [src/commands/app/add/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/service.ts)_
+_See code: [src/commands/app/add/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/service.ts)_
 
 ## `aio app add web-assets`
 
@@ -230,7 +230,7 @@ DESCRIPTION
   Add web assets support
 ```
 
-_See code: [src/commands/app/add/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/add/web-assets.ts)_
+_See code: [src/commands/app/add/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/add/web-assets.ts)_
 
 ## `aio app build`
 
@@ -259,7 +259,7 @@ DESCRIPTION
   This will always force a rebuild unless --no-force-build is set.
 ```
 
-_See code: [src/commands/app/build.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/build.ts)_
+_See code: [src/commands/app/build.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/build.ts)_
 
 ## `aio app create [PATH]`
 
@@ -281,7 +281,7 @@ DESCRIPTION
   Create a new Adobe I/O App with default parameters
 ```
 
-_See code: [src/commands/app/create.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/create.ts)_
 
 ## `aio app delete`
 
@@ -299,7 +299,7 @@ DESCRIPTION
   Delete a component from an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/delete/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/index.ts)_
+_See code: [src/commands/app/delete/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/index.ts)_
 
 ## `aio app delete action [ACTION-NAME]`
 
@@ -325,7 +325,7 @@ ALIASES
   $ aio app delete actions
 ```
 
-_See code: [src/commands/app/delete/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/action.ts)_
+_See code: [src/commands/app/delete/action.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/action.ts)_
 
 ## `aio app delete ci`
 
@@ -344,7 +344,7 @@ DESCRIPTION
   Delete existing CI files
 ```
 
-_See code: [src/commands/app/delete/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/ci.ts)_
+_See code: [src/commands/app/delete/ci.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/ci.ts)_
 
 ## `aio app delete event [EVENT-ACTION-NAME]`
 
@@ -370,7 +370,7 @@ ALIASES
   $ aio app delete events
 ```
 
-_See code: [src/commands/app/delete/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/event.ts)_
+_See code: [src/commands/app/delete/event.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/event.ts)_
 
 ## `aio app delete extension`
 
@@ -396,7 +396,7 @@ ALIASES
   $ aio app delete extensions
 ```
 
-_See code: [src/commands/app/delete/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/extension.ts)_
+_See code: [src/commands/app/delete/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/extension.ts)_
 
 ## `aio app delete service`
 
@@ -420,7 +420,7 @@ ALIASES
   $ aio app delete services
 ```
 
-_See code: [src/commands/app/delete/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/service.ts)_
+_See code: [src/commands/app/delete/service.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/service.ts)_
 
 ## `aio app delete web-assets`
 
@@ -439,7 +439,7 @@ DESCRIPTION
   Delete existing web assets
 ```
 
-_See code: [src/commands/app/delete/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/delete/web-assets.ts)_
+_See code: [src/commands/app/delete/web-assets.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/delete/web-assets.ts)_
 
 ## `aio app deploy`
 
@@ -479,7 +479,7 @@ DESCRIPTION
   This will always force a rebuild unless --no-force-build is set.
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/deploy.ts)_
 
 ## `aio app get-url [ACTION]`
 
@@ -502,7 +502,7 @@ DESCRIPTION
   Get action URLs
 ```
 
-_See code: [src/commands/app/get-url.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/get-url.ts)_
+_See code: [src/commands/app/get-url.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/get-url.ts)_
 
 ## `aio app info`
 
@@ -524,7 +524,7 @@ DESCRIPTION
   Display settings/configuration in use by an Adobe I/O App
 ```
 
-_See code: [src/commands/app/info.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/info.ts)_
+_See code: [src/commands/app/info.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/info.ts)_
 
 ## `aio app init [PATH]`
 
@@ -558,7 +558,7 @@ DESCRIPTION
   Create a new Adobe I/O App
 ```
 
-_See code: [src/commands/app/init.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/init.ts)_
+_See code: [src/commands/app/init.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/init.ts)_
 
 ## `aio app list`
 
@@ -576,7 +576,7 @@ DESCRIPTION
   List components for Adobe I/O App
 ```
 
-_See code: [src/commands/app/list/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/list/index.ts)_
+_See code: [src/commands/app/list/index.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/list/index.ts)_
 
 ## `aio app list extension`
 
@@ -601,7 +601,7 @@ ALIASES
   $ aio app list extensions
 ```
 
-_See code: [src/commands/app/list/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/list/extension.ts)_
+_See code: [src/commands/app/list/extension.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/list/extension.ts)_
 
 ## `aio app logs`
 
@@ -625,7 +625,7 @@ DESCRIPTION
   Fetch logs for an Adobe I/O App
 ```
 
-_See code: [src/commands/app/logs.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/logs.ts)_
+_See code: [src/commands/app/logs.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/logs.ts)_
 
 ## `aio app run`
 
@@ -648,7 +648,7 @@ DESCRIPTION
   Run an Adobe I/O App
 ```
 
-_See code: [src/commands/app/run.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/run.ts)_
+_See code: [src/commands/app/run.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/run.ts)_
 
 ## `aio app test`
 
@@ -676,7 +676,7 @@ DESCRIPTION
   If the extension has a hook called 'test' in its 'ext.config.yaml', the script specified will be run instead.
 ```
 
-_See code: [src/commands/app/test.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/test.ts)_
+_See code: [src/commands/app/test.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/test.ts)_
 
 ## `aio app undeploy`
 
@@ -701,7 +701,7 @@ DESCRIPTION
   Undeploys an Adobe I/O App
 ```
 
-_See code: [src/commands/app/undeploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/undeploy.ts)_
+_See code: [src/commands/app/undeploy.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/undeploy.ts)_
 
 ## `aio app use [CONFIG_FILE_PATH]`
 
@@ -749,5 +749,5 @@ DESCRIPTION
   page in https://developer.adobe.com/console/
 ```
 
-_See code: [src/commands/app/use.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.6.0/src/commands/app/use.ts)_
+_See code: [src/commands/app/use.ts](https://github.com/adobe/aio-cli-plugin-app/blob/10.7.1/src/commands/app/use.ts)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "10.6.0",
+  "version": "10.7.1",
   "commands": {
     "app:build": {
       "id": "app:build",

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.6.0",
+  "version": "10.7.1",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
     "@adobe/aio-cli-lib-app-config": "^1.1.0",
+    "@adobe/aio-cli-lib-app-config-next": "npm:@adobe/aio-cli-lib-app-config@^3.0.0",
     "@adobe/aio-cli-lib-console": "^4.1.0",
     "@adobe/aio-lib-core-config": "^4.0.0",
     "@adobe/aio-lib-core-logging": "^2.0.0",

package/schema/config.schema.json

@@ -212,8 +212,7 @@
                 "redirect_uri": {
                     "type": "array",
                     "items": {
-                        "type": "string",
-                        "format": "uri"
+                        "type": "string"
                     }
                 }
             },
@@ -230,8 +229,7 @@
                 "redirect_uri": {
                     "type": "array",
                     "items": {
-                        "type": "string",
-                        "format": "uri"
+                        "type": "string"
                     }
                 }
             },

package/schema/deploy.yaml.schema.json

@@ -19,7 +19,7 @@
       "type": "object",
       "properties": {
         "id": { "type": "string" },
-        "version": { "type": "string" }
+        "version": { "type": "string", "pattern": "^[0-9]+.[0-9]+.[0-9]+$" }
       },
       "required": ["id", "version"]
     },
@@ -29,22 +29,6 @@
       "default": []
     },
     "meshConfig": {
-      "type": "object",
-      "properties": {
-        "meshConfig": { "$ref": "#/definitions/meshConfigNested" },
-        "meshId": {
-          "type": "string"
-        },
-        "lastUpdatedBy": { "type": "object" },
-        "lastUpdated": {
-          "type": "string",
-          "pattern": "(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}(?:\\.\\d*)?)((-(\\d{2}):(\\d{2})|Z)?)"
-        },
-        "meshStatus": { "type": "string" }
-      },
-      "required": ["meshConfig", "meshId"]
-    },
-    "meshConfigNested": {
       "type": "object",
       "properties": {
         "sources": {

package/schema/index.js

@@ -10,10 +10,9 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE, IMPORT_CONFIG_FILE } = require('../src/lib/defaults')
+const { DEPLOY_CONFIG_FILE, IMPORT_CONFIG_FILE } = require('../src/lib/defaults')
 
 module.exports = {
   [IMPORT_CONFIG_FILE]: require('./config.schema.json'),
-  [USER_CONFIG_FILE]: require('./app.config.yaml.schema.json'),
   [DEPLOY_CONFIG_FILE]: require('./deploy.yaml.schema.json')
 }

package/src/commands/app/install.js

@@ -18,19 +18,19 @@ const fs = require('fs-extra')
 const execa = require('execa')
 const unzipper = require('unzipper')
 const { validateJsonWithSchema } = require('../../lib/install-helper')
-const { loadConfigFile, writeFile } = require('../../lib/import-helper')
-const { getObjectValue } = require('../../lib/app-helper')
 const jsYaml = require('js-yaml')
 const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE } = require('../../lib/defaults')
 const ora = require('ora')
 const chalk = require('chalk')
 
+// eslint-disable-next-line node/no-missing-require
+const libConfigNext = require('@adobe/aio-cli-lib-app-config-next')
+
 class InstallCommand extends BaseCommand {
   async run () {
     const { args, flags } = await this.parse(InstallCommand)
 
     this.preRelease()
-    const appConfig = this.getFullConfig()
 
     aioLogger.debug(`flags: ${JSON.stringify(flags, null, 2)}`)
     aioLogger.debug(`args: ${JSON.stringify(args, null, 2)}`)
@@ -52,9 +52,8 @@ class InstallCommand extends BaseCommand {
     try {
       await this.validateZipDirectoryStructure(args.path)
       await this.unzipFile(args.path, outputPath)
-      await this.addCodeDownloadAnnotation(outputPath, appConfig)
-      await this.validateConfig(outputPath, USER_CONFIG_FILE)
-      await this.validateConfig(outputPath, DEPLOY_CONFIG_FILE)
+      await this.validateAppConfig(outputPath, USER_CONFIG_FILE)
+      await this.validateDeployConfig(outputPath, DEPLOY_CONFIG_FILE)
       await this.npmInstall(flags.verbose)
       await this.runTests()
       this.spinner.succeed('Install done.')
@@ -111,7 +110,16 @@ class InstallCommand extends BaseCommand {
       .then(() => this.spinner.succeed(`Extracted app package to ${destFolderPath}`))
   }
 
-  async validateConfig (outputPath, configFileName, configFilePath = path.join(outputPath, configFileName)) {
+  async validateAppConfig (outputPath, configFileName, configFilePath = path.join(outputPath, configFileName)) {
+    this.spinner.start(`Validating ${configFileName}...`)
+    aioLogger.debug(`validateConfig: ${configFileName} at ${configFilePath}`)
+    // first coalesce the app config (resolving $include files), then validate it
+    const config = (await libConfigNext.coalesce(configFilePath)).config
+    await libConfigNext.validate(config, { throws: true }) // throws on error
+    this.spinner.succeed(`Validated ${configFileName}`)
+  }
+
+  async validateDeployConfig (outputPath, configFileName, configFilePath = path.join(outputPath, configFileName)) {
     this.spinner.start(`Validating ${configFileName}...`)
     aioLogger.debug(`validateConfig: ${configFileName} at ${configFilePath}`)
 
@@ -143,67 +151,6 @@ class InstallCommand extends BaseCommand {
       }
     })
   }
-
-  /**
-   * An annotation called disable-download will be added to all actions in app.config.yaml
-   * (and linked yaml configs for example in extensions). This value will be set to true.
-   * The annotation will by default be false if not set.
-   *
-   * @param {object} outputPath the path to the app package
-   * @param {object} appConfig the app's configuration file
-   */
-  async addCodeDownloadAnnotation (outputPath, appConfig) {
-    this.spinner.start('Adding disable-download annotations...')
-    // get each annotation key relative to the file it is defined in
-    /// iterate only over extensions that have actions defined
-    const fileToAnnotationKey = {}
-    Object.entries(appConfig.all)
-      .filter(([_, extConf]) => extConf.manifest?.full?.packages)
-      .forEach(([ext, extConf]) => {
-        Object.entries(extConf.manifest.full.packages)
-          .filter(([pkg, pkgConf]) => pkgConf.actions)
-          .forEach(([pkg, pkgConf]) => {
-            Object.entries(pkgConf.actions).forEach(([action, actionConf]) => {
-              const baseFullKey = ext === 'application'
-                ? `application.runtimeManifest.packages.${pkg}.actions.${action}`
-                : `extensions.${ext}.runtimeManifest.packages.${pkg}.actions.${action}`
-
-              let index
-              if (actionConf.annotations) {
-                index = appConfig.includeIndex[`${baseFullKey}.annotations`]
-              } else {
-                // the annotation object is not defined, take the parent key
-                index = appConfig.includeIndex[baseFullKey]
-              }
-              if (!fileToAnnotationKey[index.file]) {
-                fileToAnnotationKey[index.file] = []
-              }
-              fileToAnnotationKey[index.file].push(index.key) // index.key is relative to the file
-            })
-          })
-      })
-
-    // rewrite config files
-    for (const [file, keys] of Object.entries(fileToAnnotationKey)) {
-      const configFilePath = path.join(outputPath, file)
-      const { values } = loadConfigFile(configFilePath)
-
-      keys.forEach(key => {
-        const object = getObjectValue(values, key)
-        if (key.endsWith('.annotations') || key === 'annotations') {
-          // object is the annotations object
-          object['disable-download'] = true
-        } else {
-          // annotation object is not defined, the object is the action object
-          object.annotations = { 'disable-download': true }
-        }
-      })
-
-      // write back the modified manifest to disk
-      await writeFile(configFilePath, jsYaml.dump(values), { overwrite: true })
-    }
-    this.spinner.succeed('Added disable-download annotations')
-  }
 }
 
 InstallCommand.hidden = true // hide from help for pre-release

package/src/commands/app/pack.js

@@ -17,10 +17,14 @@ const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-
 const archiver = require('archiver')
 const yaml = require('js-yaml')
 const execa = require('execa')
-const { writeFile } = require('../../lib/import-helper')
+const { loadConfigFile, writeFile } = require('../../lib/import-helper')
+const { getObjectValue } = require('../../lib/app-helper')
 const ora = require('ora')
 const chalk = require('chalk')
 
+// eslint-disable-next-line node/no-missing-require
+const libConfigNext = require('@adobe/aio-cli-lib-app-config-next')
+
 const DEFAULTS = {
   OUTPUT_ZIP_FILE: 'app.zip',
   ARTIFACTS_FOLDER: 'app-package',
@@ -36,7 +40,8 @@ class Pack extends BaseCommand {
     aioLogger.debug(`flags: ${JSON.stringify(flags, null, 2)}`)
     aioLogger.debug(`args: ${JSON.stringify(args, null, 2)}`)
 
-    const appConfig = this.getFullConfig()
+    // this will also validate the app.config.yaml
+    const appConfig = await libConfigNext.load()
 
     // resolve to absolute path before any chdir
     const outputZipFile = path.resolve(flags.output)
@@ -69,6 +74,10 @@ class Pack extends BaseCommand {
       await this.createDeployYamlFile(appConfig)
       this.spinner.succeed('Created configuration files')
 
+      this.spinner.start('Adding code-download annotations...')
+      await this.addCodeDownloadAnnotation(appConfig)
+      this.spinner.succeed('Added code-download annotations')
+
       // doing this before zip so other things can be added to the zip
       await this.config.runHook('post-pack', { appConfig, artifactsFolder: DEFAULTS.ARTIFACTS_FOLDER })
 
@@ -123,6 +132,10 @@ class Pack extends BaseCommand {
       version: appConfig.packagejson.version
     }
 
+    if (!application.version.match(/^[0-9]+.[0-9]+.[0-9]+$/)) {
+      throw new Error('Application version format must be "X.Y.Z", where X, Y, and Z are non-negative integers.')
+    }
+
     let meshConfig
     // ACNA-2041
     // get the mesh config by running the `aio api-mesh:get` command (if available)
@@ -135,7 +148,7 @@ class Pack extends BaseCommand {
         const { stdout } = await execa('aio', ['api-mesh', 'get'], { cwd: process.cwd() })
         // until we get the --json flag, we parse the output
         const idx = stdout.indexOf('{')
-        meshConfig = JSON.parse(stdout.substring(idx))
+        meshConfig = JSON.parse(stdout.substring(idx)).meshConfig
         aioLogger.debug(`api-mesh:get - ${JSON.stringify(meshConfig, null, 2)}`)
         this.spinner.succeed('Got api-mesh config')
       } catch (err) {
@@ -238,6 +251,64 @@ class Pack extends BaseCommand {
       .map(file => file.path)
       .filter(file => !filesToExclude.includes(file))
   }
+
+  /**
+   * An annotation called code-download will be added to all actions in app.config.yaml
+   * (and linked yaml configs for example in extensions). This value will be set to false.
+   * The annotation will by default be true if not set.
+   *
+   * @param {object} appConfig the app's configuration file
+   */
+  async addCodeDownloadAnnotation (appConfig) {
+    // get each annotation key relative to the file it is defined in
+    /// iterate only over extensions that have actions defined
+    const fileToAnnotationKey = {}
+    Object.entries(appConfig.all)
+      .filter(([_, extConf]) => extConf.manifest?.full?.packages)
+      .forEach(([ext, extConf]) => {
+        Object.entries(extConf.manifest.full.packages)
+          .filter(([pkg, pkgConf]) => pkgConf.actions)
+          .forEach(([pkg, pkgConf]) => {
+            Object.entries(pkgConf.actions).forEach(([action, actionConf]) => {
+              const baseFullKey = ext === 'application'
+                ? `application.runtimeManifest.packages.${pkg}.actions.${action}`
+                : `extensions.${ext}.runtimeManifest.packages.${pkg}.actions.${action}`
+
+              let index
+              if (actionConf.annotations) {
+                index = appConfig.includeIndex[`${baseFullKey}.annotations`]
+              } else {
+                // the annotation object is not defined, take the parent key
+                index = appConfig.includeIndex[baseFullKey]
+              }
+              if (!fileToAnnotationKey[index.file]) {
+                fileToAnnotationKey[index.file] = []
+              }
+              fileToAnnotationKey[index.file].push(index.key) // index.key is relative to the file
+            })
+          })
+      })
+
+    // rewrite config files
+    for (const [file, keys] of Object.entries(fileToAnnotationKey)) {
+      const configFilePath = path.join(DEFAULTS.ARTIFACTS_FOLDER, file)
+      const { values } = loadConfigFile(configFilePath)
+
+      keys.forEach(key => {
+        const object = getObjectValue(values, key)
+        if (key.endsWith('.annotations') || key === 'annotations') {
+          // object is the annotations object
+          object['code-download'] = false
+        } else {
+          // annotation object is not defined, the object is the action object
+          object.annotations = { 'code-download': false }
+        }
+      })
+
+      // write back the modified manifest to disk
+      await writeFile(configFilePath, yaml.dump(values), { overwrite: true })
+    }
+  }
 }
 
 Pack.hidden = true // hide from help for pre-release

package/schema/app.config.yaml.schema.json

@@ -1,157 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://adobe.io/schemas/app-builder/app.config.yaml.json/v1",
-  "type": "object",
-  "properties": {
-    "application": { "$ref": "#/definitions/application" },
-    "extensions": { "$ref": "#/definitions/extensions" }
-  },
-  "oneOf": [
-    {
-      "required": ["application"],
-      "allOf": [
-        { "not": { "required": ["extensions"] } }
-      ]
-    },
-    {
-      "required": ["extensions"],
-      "allOf": [
-        { "not": { "required": ["application"] } }
-      ]
-    }
-  ],
-  "definitions": {
-    "application": {
-      "type": "object",
-      "properties": {
-        "runtimeManifest": { "$ref": "#/definitions/runtimeManifest" },
-        "actions": { "type": "string" },
-        "unitTest": { "type": "string" },
-        "e2eTest": { "type": "string" },
-        "dist": { "type": "string" },
-        "tvmurl": { "type": "string" },
-        "awsaccesskeyid": { "type": "string" },
-        "awssecretaccesskey": { "type": "string" },
-        "s3bucket": { "type": "string" },
-        "events": { "type": "object" },
-        "hostname": { "type": "string" },
-        "htmlcacheduration": { "type": "number" },
-        "jscacheduration": { "type": "number" },
-        "csscacheduration": { "type": "number" },
-        "imagecacheduration": { "type": "number" },
-        "hooks": { "$ref": "#/definitions/hooks" },
-        "web": { "$ref": "#/definitions/web" }
-      },
-      "required": ["runtimeManifest"]
-    },
-    "extensions": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_/\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/extension"
-        }
-      },
-      "additionalProperties": false
-    },
-    "extension": {
-      "type": "object",
-      "properties": {
-        "$include": { "type": "string" }
-      }
-    },
-    "web": {
-      "anyOf": [
-        {
-          "type": "string"
-        }, 
-        {
-          "type": "object",
-          "properties": {
-            "response-headers": { "type": "object" }
-          }
-        }
-      ]
-    },
-    "runtimeManifest": {
-      "type": "object",
-      "properties": {
-        "packages": { "$ref": "#/definitions/packages" }
-      },
-      "required": ["packages"]
-    },
-    "packages": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/package"
-        }
-      },
-      "additionalProperties": false
-    },
-    "package": {
-      "type": "object",
-      "properties": {
-        "license": { "type": "string" },
-        "actions": { "$ref": "#/definitions/actions" }
-      }
-    },
-    "actions": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "$ref": "#/definitions/action"
-        }
-      },
-      "additionalProperties": false
-    },
-    "action": {
-      "type": "object",
-      "properties": {
-        "function": { "type": "string" },
-        "web": { "type": "string" },
-        "runtime": { "type": "string" },
-        "inputs": { "$ref": "#/definitions/inputs" },
-        "annotations": { "$ref": "#/definitions/annotations" }
-      },
-      "required": ["function", "runtime"]
-    },
-    "inputs": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "type": ["string", "boolean"]
-        }
-      },
-      "additionalProperties": false
-    },
-    "annotations": {
-      "type": "object",
-      "patternProperties": {
-        "^[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$": { 
-          "type": ["string", "boolean"]
-        }
-      },
-      "additionalProperties": false
-    },
-    "hooks": {
-      "type": "object",
-      "properties": {
-        "pre-app-build": { "type": "string" },
-        "post-app-build": { "type": "string" },
-        "build-actions": { "type": "string" },
-        "build-static": { "type": "string" },
-        "pre-app-deploy": { "type": "string" },
-        "post-app-deploy": { "type": "string" },
-        "deploy-actions": { "type": "string" },
-        "deploy-static": { "type": "string" },
-        "pre-app-undeploy": { "type": "string" },
-        "post-app-undeploy": { "type": "string" },
-        "undeploy-actions": { "type": "string" },
-        "undeploy-static": { "type": "string" },
-        "pre-app-run": { "type": "string" },
-        "post-app-run": { "type": "string" },
-        "serve-static": { "type": "string" }
-      }
-    }
-  }
-}