Add allowed values for cnab actions

endjin · Jan 17, 2020 · a878836 · a878836
1 parent 5a57283
commit a878836
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
@@ -44,10 +44,17 @@ func GenerateTemplate(options GenerateTemplateOptions) error {
 
 	bundleName := bundle.Name
 	bundleTag, err := getBundleTag(bundle)
+	bundleActions := make([]string, 0, len(bundle.Actions)+3)
+	defaultActions := []string{"install", "upgrade", "uninstall"}
+	bundleActions = append(bundleActions, defaultActions...)
+	for action := range bundle.Actions {
+		bundleActions = append(bundleActions, action)
+	}
 
 	generatedTemplate := template.NewCnabArmDriverTemplate(
 		bundleName,
 		bundleTag,
+		bundleActions,
 		template.CnabArmDriverImageName,
 		options.Version,
 		options.Simplify)

diff --git a/pkg/generator/testdata/azuredeploy-simple.json b/pkg/generator/testdata/azuredeploy-simple.json
@@ -14,6 +14,12 @@
 		"cnab_action": {
 			"type": "string",
 			"defaultValue": "install",
+			"allowedValues": [
+				"install",
+				"upgrade",
+				"uninstall",
+				"endjin.customAction"
+			],
 			"metadata": {
 				"description": "The name of the action to be performed on the application instance."
 			}

diff --git a/pkg/generator/testdata/azuredeploy.json b/pkg/generator/testdata/azuredeploy.json
@@ -54,6 +54,12 @@
 		"cnab_action": {
 			"type": "string",
 			"defaultValue": "install",
+			"allowedValues": [
+				"install",
+				"upgrade",
+				"uninstall",
+				"endjin.customAction"
+			],
 			"metadata": {
 				"description": "The name of the action to be performed on the application instance."
 			}

diff --git a/pkg/generator/testdata/bundle.json b/pkg/generator/testdata/bundle.json
@@ -1,4 +1,9 @@
 {
+    "actions": {
+        "endjin.customAction": {
+            "description": "A custom action"
+        }
+    },
     "credentials": {
         "password": {
             "description": "A secret password",

diff --git a/pkg/template/cnab-arm-driver-template.go b/pkg/template/cnab-arm-driver-template.go
@@ -12,7 +12,7 @@ const (
 )
 
 // NewCnabArmDriverTemplate creates a new instance of Template for running a CNAB bundle using cnab-azure-driver
-func NewCnabArmDriverTemplate(bundleName string, bundleTag string, containerImageName string, containerImageVersion string, simplify bool) Template {
+func NewCnabArmDriverTemplate(bundleName string, bundleTag string, bundleActions []string, containerImageName string, containerImageVersion string, simplify bool) Template {
 
 	resources := []Resource{
 		{
@@ -141,8 +141,9 @@ func NewCnabArmDriverTemplate(bundleName string, bundleTag string, containerImag
 
 	parameters := map[string]Parameter{
 		"cnab_action": {
-			Type:         "string",
-			DefaultValue: "install",
+			Type:          "string",
+			DefaultValue:  bundleActions[0],
+			AllowedValues: bundleActions,
 			Metadata: &Metadata{
 				Description: "The name of the action to be performed on the application instance.",
 			},