@adobe/aio-cli-plugin-app 10.2.0 → 10.2.2

package/README.md

@@ -71,7 +71,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/10.2.0/src/commands/app/index.js)_
+_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/10.2.2/src/commands/app/index.js)_
 
 ## `aio app add`
 

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "10.2.0",
+  "version": "10.2.2",
   "commands": {
     "app:build": {
       "id": "app:build",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "10.2.0",
+  "version": "10.2.2",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
@@ -77,7 +77,7 @@
     "bin/openwhisk-standalone-config/",
     "oclif.manifest.json",
     "src",
-    "schema/config.schema.json"
+    "schema"
   ],
   "homepage": "https://github.com/adobe/aio-cli-plugin-app",
   "keywords": [

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

@@ -0,0 +1,157 @@
+{
+  "$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" }
+      }
+    }
+  }
+}

package/schema/config.schema.json

@@ -125,7 +125,8 @@
                         "apikey", 
                         "oauthwebapp", 
                         "oauthnativeapp", 
-                        "oauthsinglepageapp"
+                        "oauthsinglepageapp",
+                        "oauth_server_to_server"
                     ]
                 },
                 "jwt": { "$ref": "#/definitions/jwt" },
@@ -138,7 +139,9 @@
             "oneOf": [
                 { "required": ["oauth2"] },
                 { "required": ["jwt"] },
-                { "required": ["api_key"] }
+                { "required": ["api_key"] },
+                { "required": ["oauth_server_to_server"] }
+
             ]
         },
         "service": {
@@ -176,6 +179,26 @@
             },
             "required": [ "client_id", "client_secret", "redirect_uri", "defaultRedirectUri" ]
         },
+        "oauth_server_to_server": {
+            "properties": {
+                "client_id": { "type": "string" },
+                "client_secrets": { "type": "array" },
+                "technical_account_email": {
+                    "type": "string",
+                    "format": "email"
+                },
+                "technical_account_id": {
+                    "type": "string",
+                    "format": "email"
+                },
+                "scopes": {
+                    "type": "array",
+                    "items": { "type": "string" },
+                    "default": []
+                }
+            },
+            "required": [ "client_id", "client_secrets", "technical_account_email", "technical_account_id", "scopes" ]
+        },
         "oauthsinglepageapp": {
             "type": "object",
             "properties": {

package/schema/deploy.yaml.schema.json

@@ -0,0 +1,107 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://adobe.io/schemas/app-builder/deploy.yaml.json/v1",
+  "type": "object",
+  "properties": {
+    "application": { "$ref": "#/definitions/application" },
+    "workspaces": { "$ref": "#/definitions/workspaces" },
+    "meshConfig": { "$ref": "#/definitions/meshConfig" },
+    "extensions": { "$ref": "#/definitions/extensions" },
+    "apis": { "$ref": "#/definitions/apis" },
+    "runtime": { 
+      "type": "boolean",
+      "default": true
+    }
+  },
+  "required": ["application", "runtime"],
+  "definitions": {
+    "application": {
+      "type": "object",
+      "properties": {
+        "id": { "type": "string" },
+        "version": { "type": "string" }
+      },
+      "required": ["id", "version"]
+    },
+    "workspaces": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/workspace" },
+      "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": {
+          "type": "array",
+          "items": { "$ref": "#/definitions/meshConfigSource" },
+          "default": []
+        }
+      }
+    },
+    "meshConfigSource": {
+      "type": "object",
+      "properties": {
+        "name": { "type": "string" },
+        "handler": { "$ref": "#/definitions/meshConfigSourceHandler" }
+      },
+      "required": ["name", "handler"]
+    },
+    "meshConfigSourceHandler": {
+      "type": "object",
+      "properties": {
+        "graphql": { "$ref": "#/definitions/graphql" }
+      }
+    },
+    "graphql": {
+      "type": "object",
+      "properties": {
+        "handler": {
+          "type": "string",
+          "format": "uri"
+        }
+      }
+    },
+    "workspace": {
+      "type": "string",
+      "pattern": "^[A-Za-z0-9\u00C0-\u00D6\u00D8-\u00f6\u00f8-\u00ff]{1,20}$"
+    },
+    "extensions": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/extension" } 
+    },
+    "extension": {
+      "type": "object",
+      "properties": {
+        "extensionPointId": { "type": "string" }
+      },
+      "required": ["extensionPointId"]
+    },
+    "apis": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/api" } 
+    },
+    "api": {
+      "type": "object",
+      "properties": {
+        "code": { "type": "string" }
+      },
+      "required": ["code"]
+    }
+  }
+}

package/schema/index.js

@@ -0,0 +1,19 @@
+/*
+Copyright 2023 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 { USER_CONFIG_FILE, 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')
+}