Replace com.docker.app.status action by io.cnab.status and adapt unit and e2e tests. The com.docker.app.status is still supported by the CLI and invocation image for the backward compatibility but new apps do not expose this action in the CNAB bundle anymore.

Signed-off-by: Jean-Christophe Sirot <[email protected]>

Author: Jean-Christophe Sirot

cmd/cnab-run/main.go

@@ -12,12 +12,13 @@ type cnabAction func(string) error
 
 var (
 	cnabActions = map[string]cnabAction{
-		"install":                  installAction,
-		"upgrade":                  installAction, // upgrade is implemented as reinstall.
-		"uninstall":                uninstallAction,
-		internal.ActionStatusName:  statusAction,
-		internal.ActionInspectName: inspectAction,
-		internal.ActionRenderName:  renderAction,
+		"install":                           installAction,
+		"upgrade":                           installAction, // upgrade is implemented as reinstall.
+		"uninstall":                         uninstallAction,
+		internal.ActionStatusNameDeprecated: statusAction,
+		internal.ActionStatusName:           statusAction,
+		internal.ActionInspectName:          inspectAction,
+		internal.ActionRenderName:           renderAction,
 	}
 )
 

e2e/testdata/bundle-with-tag.json.golden

@@ -42,7 +42,7 @@
 		"com.docker.app.render": {
 			"stateless": true
 		},
-		"com.docker.app.status": {}
+		"io.cnab.status": {}
 	},
 	"parameters": {
 		"api_host": {
@@ -65,7 +65,7 @@
 				"install",
 				"upgrade",
 				"uninstall",
-				"com.docker.app.status"
+				"io.cnab.status"
 			]
 		},
 		"com.docker.app.orchestrator": {
@@ -86,7 +86,7 @@
 				"install",
 				"upgrade",
 				"uninstall",
-				"com.docker.app.status"
+				"io.cnab.status"
 			]
 		},
 		"com.docker.app.render-format": {

e2e/testdata/cnab-with-docker-status/bundle.json

@@ -12,4 +12,4 @@
       "modifies": false
     }
   }
-}
+}

e2e/testdata/simple-bundle.json.golden

@@ -42,7 +42,7 @@
 		"com.docker.app.render": {
 			"stateless": true
 		},
-		"com.docker.app.status": {}
+		"io.cnab.status": {}
 	},
 	"parameters": {
 		"api_host": {
@@ -65,7 +65,7 @@
 				"install",
 				"upgrade",
 				"uninstall",
-				"com.docker.app.status"
+				"io.cnab.status"
 			]
 		},
 		"com.docker.app.orchestrator": {
@@ -86,7 +86,7 @@
 				"install",
 				"upgrade",
 				"uninstall",
-				"com.docker.app.status"
+				"io.cnab.status"
 			]
 		},
 		"com.docker.app.render-format": {

internal/commands/status.go

@@ -22,8 +22,7 @@ import (
 var (
 	knownStatusActions = []string{
 		internal.ActionStatusName,
-		// TODO: Extract this constant to the cnab-go library
-		"io.cnab.status",
+		internal.ActionStatusNameDeprecated,
 	}
 )
 

internal/names.go

@@ -24,9 +24,14 @@ const (
 
 	// Namespace is the reverse DNS namespace used with labels and CNAB custom actions.
 	Namespace = "com.docker.app."
+	// CnabNamespace is the namespace used with the CNAB well known custom actions
+	CnabNamespace = "io.cnab."
 
-	// ActionStatusName is the name of the custom "status" action
-	ActionStatusName = Namespace + "status"
+	// ActionStatusNameDeprecated is the name of the docker custom "status" action
+	// Deprecated: use ActionStatusName instead
+	ActionStatusNameDeprecated = Namespace + "status"
+	// ActionStatusName is the name of the CNAB well known custom "status" action - TODO: Extract this constant to the cnab-go library
+	ActionStatusName = CnabNamespace + "status"
 	// ActionInspectName is the name of the custom "inspect" action
 	ActionInspectName = Namespace + "inspect"
 	// ActionRenderName is the name of the custom "render" action

internal/packager/testdata/bundle-json.golden

@@ -47,7 +47,7 @@
     "com.docker.app.render": {
       "stateless": true
     },
-    "com.docker.app.status": {}
+    "io.cnab.status": {}
   },
   "parameters": {
     "com.docker.app.kubernetes-namespace": {
@@ -63,7 +63,7 @@
         "install",
         "upgrade",
         "uninstall",
-        "com.docker.app.status"
+        "io.cnab.status"
       ]
     },
     "com.docker.app.orchestrator": {
@@ -84,7 +84,7 @@
         "install",
         "upgrade",
         "uninstall",
-        "com.docker.app.status"
+        "io.cnab.status"
       ]
     },
     "com.docker.app.render-format": {