Merge pull request #268 from vmware/220-abx-project-templates-must-be…

…-updated 220 abx project templates must be updated
vmware · May 27, 2024 · e3000c1 · e3000c1
2 parents 356afe6 + 7eae003
commit e3000c1
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Enhancements
+* [artifact-manager] Issue 220 / mvn archetype:generate for abx project - updated the package.json template for generating abx actions
+=======
 ### Fixes
 * [vro-scripting-api] Revert 110 / Mocking for configuration elements is incorrect.
 

diff --git a/docs/versions/latest/Release.md b/docs/versions/latest/Release.md
@@ -88,6 +88,18 @@ Here
 [//]: # (Improvements -> Bugfixes/hotfixes or general improvements)
 ## Improvements
 
+### Update the package.json template for generating abx actions
+
+Fix Issue #220
+
+#### Previous Behavior
+
+The package.json template for generating abx actions was missing some of the recently implemented parameters.
+
+#### Current Behavior
+
+The package.json template for generating abx actions now contains the recently implemented parameters: base, memoryLimitMb, timeoutSec, provider and abx (inputSecrets, inputConstants, etc.).
+
 ### Add missing types to AD Plugin
 
 Fix Issue #251

diff --git a/maven/archetypes/polyglot/src/main/resources/archetype-resources/package.json b/maven/archetypes/polyglot/src/main/resources/archetype-resources/package.json
@@ -1,25 +1,49 @@
 {
-  "name": "${artifactId}",
-  "version": "${version}",
-  "description": "Autogenerated ${type} actions project",
-  "private": true,
-  "scripts": {
-    "build": "polyglotpkg --env ${type}",
-    "clean": "run-script-os",
-    "clean:win32": "rmdir /S /Q out dist tmp || echo Nothing to clean",
-    "clean:default": "rm -Rf out dist tmp",
-    "test": "echo \"Error: no test specified\""
-  },
-  "keywords": [
-    "polyglot",
-    "package",
-    "${type}"
-  ],
-  "author": "VMware WWCoE",
-  "license": "VMware Confidential",
-  "devDependencies": {
+	"id": "",
+	"name": "${artifactId}",
+	"version": "${version}",
+	"description": "Autogenerated ${type} actions project",
+	"private": true,
+	"scripts": {
+		"build": "polyglotpkg --env ${type}",
+		"clean": "run-script-os",
+		"clean:win32": "rmdir /S /Q out dist tmp || echo Nothing to clean",
+		"clean:default": "rm -Rf out dist tmp",
+		"test": "echo \"Error: no test specified\""
+	},
+	"keywords": [
+		"polyglot",
+		"package",
+		"${type}"
+	],
+	"author": "VMware WWCoE",
+	"license": "VMware Confidential",
+	"devDependencies": {
 		"run-script-os": "^1.1.6"
-  },
-  "dependencies": {
-  }
+	},
+	"dependencies": {},
+	"platform": {
+		"runtime": "",
+		"action": "findTags",
+		"tags": [],
+		"entrypoint": "handler.handler",
+		"base": "out",
+		"memoryLimitMb": 300,
+		"timeoutSec": 600,
+		"provider": ""
+	},
+	"abx": {
+		"shared": true,
+		"inputSecrets": [],
+		"inputConstants": [],
+		"inputs": {
+			"tagKey": ""
+		}
+	},
+	"files": [
+		"out",
+		"!package.json"
+	]
 }
+
+
diff --git a/typescript/polyglotpkg/test/e2e/abx_all/package.json b/typescript/polyglotpkg/test/e2e/abx_all/package.json
@@ -1,4 +1,5 @@
 {
+  "id": "",
   "name": "abx-all",
   "version": "1.0.0-SNAPSHOT",
   "description": "Autogenerated abx actions project",
@@ -21,5 +22,27 @@
     "run-script-os": "^1.1.6"
   },
   "dependencies": {
-  }
+  },
+  "platform": {
+		"runtime": "",
+		"action": "findTags",
+		"tags": [],
+		"entrypoint": "handler.handler",
+		"base": "out",
+		"memoryLimitMb": 300,
+		"timeoutSec": 600,
+		"provider": ""
+	},
+	"abx": {
+		"shared": true,
+		"inputSecrets": [],
+		"inputConstants": [],
+		"inputs": {
+			"tagKey": ""
+		}
+	},
+	"files": [
+		"out",
+		"!package.json"
+	]
 }
diff --git a/typescript/polyglotpkg/test/e2e/abxpython/package.json b/typescript/polyglotpkg/test/e2e/abxpython/package.json
@@ -1,5 +1,6 @@
 {
-	"name": "abx-python",
+	"id": "",
+  "name": "abx-python",
 	"version": "1.0.10-SNAPSHOT",
 	"description": "Autogenerated python action",
 	"private": false,
@@ -37,7 +38,12 @@
 		"memoryInMB": 300
 	},
 	"abx": {
-		"inputs": {}
+		"shared": true,
+		"inputSecrets": [],
+		"inputConstants": [],
+		"inputs": {
+			"tagKey": ""
+		}
 	},
 	"files": [
 		"src",

diff --git a/typescript/polyglotpkg/test/e2e/nodejs/package.json b/typescript/polyglotpkg/test/e2e/nodejs/package.json
@@ -1,4 +1,5 @@
 {
+  "id": "",
   "name": "nodejs",
   "version": "1.0.0-SNAPSHOT",
   "description": "Autogenerated nodejs action",
@@ -31,10 +32,19 @@
     "runtime": "nodejs",
     "action": "nodejs",
     "tags": [],
-    "entrypoint": "out/handler.handler"
+    "entrypoint": "out/handler.handler",
+    "base": "out",
+    "memoryLimitMb": 300,
+    "timeoutSec": 900,
+    "provider": ""
   },
 	"abx": {
-		"inputs": {}
+		"shared": true,
+		"inputSecrets": [],
+		"inputConstants": [],
+		"inputs": {
+			"tagKey": ""
+		}
 	},
   "files": [
     "src",

diff --git a/typescript/polyglotpkg/test/e2e/powershell/package.json b/typescript/polyglotpkg/test/e2e/powershell/package.json
@@ -1,4 +1,5 @@
 {
+  "id": "",
   "name": "powershell",
   "version": "1.0.0-SNAPSHOT",
   "description": "Autogenerated powershell action",
@@ -29,10 +30,19 @@
     "runtime": "powershell",
     "action": "powershell",
     "tags": [],
-    "entrypoint": "out/handler.handler"
+    "entrypoint": "out/handler.handler",
+    "base": "out",
+    "memoryLimitMb": 300,
+    "timeoutSec": 600,
+    "provider": ""
+  },
+  "abx": {
+    "shared": true,
+    "inputSecrets": [],
+    "inputConstants": [],
+    "inputs": {
+      "tagKey": ""
+    }
   },
-	"abx": {
-		"inputs": {}
-	},
   "files": ["out"]
 }