Add e2e test for service container labels on run

Signed-off-by: Djordje Lukic <[email protected]>

Author: rumpl

cmd/cnab-run/install.go

@@ -96,9 +96,8 @@ func addLabels(rendered *composetypes.Config) error {
 	if err != nil {
 		return err
 	}
-	a := packager.DockerAppArgs{}
-	err = json.Unmarshal(args, &a)
-	if err != nil {
+	var a packager.DockerAppArgs
+	if err := json.Unmarshal(args, &a); err != nil {
 		return err
 	}
 	for k, v := range a.Labels {

e2e/commands_test.go

@@ -193,6 +193,31 @@ func TestRunOnlyOne(t *testing.T) {
 	})
 }
 
+func TestRunWithLabels(t *testing.T) {
+	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
+		cmd := info.configuredCmd
+
+		contextPath := filepath.Join("testdata", "simple")
+		cmd.Command = dockerCli.Command("app", "build", "--tag", "myapp", contextPath)
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		cmd.Command = dockerCli.Command("app", "run", "myapp", "--name", "myapp", "--label", "label.key=labelValue")
+		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		services := []string{
+			"myapp_db", "myapp_web", "myapp_api",
+		}
+		for _, service := range services {
+			fmt.Printf("%q", service)
+			cmd.Command = dockerCli.Command("inspect", service)
+			icmd.RunCmd(cmd).Assert(t, icmd.Expected{
+				ExitCode: 0,
+				Out:      `"label.key": "labelValue"`,
+			})
+		}
+	})
+}
+
 func TestDockerAppLifecycle(t *testing.T) {
 	t.Run("withBindMounts", func(t *testing.T) {
 		testDockerAppLifecycle(t, true)

internal/commands/parameters.go

@@ -49,6 +49,11 @@ func withCommandLineParameters(overrides []string) mergeBundleOpt {
 
 func withLabels(labels []string) mergeBundleOpt {
 	return func(c *mergeBundleConfig) error {
+		for _, l := range labels {
+			if strings.HasPrefix(l, internal.Namespace) {
+				return errors.Errorf("labels cannot start with %q", internal.Namespace)
+			}
+		}
 		l := packager.DockerAppArgs{
 			Labels: cliopts.ConvertKVStringsToMap(labels),
 		}

internal/packager/cnab.go

@@ -38,8 +38,8 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 		internal.ParameterArgs: {
 			Type:        "string",
 			Default:     "",
-			Title:       "Labels",
-			Description: "Labels to apply to service containers",
+			Title:       "Arguments",
+			Description: "Arguments that are passed by file to the invocation image",
 		},
 		internal.ParameterOrchestratorName: {
 			Type: "string",

internal/packager/testdata/bundle-json.golden

@@ -51,6 +51,16 @@
     "io.cnab.status": {}
   },
   "parameters": {
+    "com.docker.app.args": {
+      "definition": "com.docker.app.args",
+      "applyTo": [
+        "install",
+        "upgrade"
+      ],
+      "destination": {
+        "path": "/cnab/app/args.json"
+      }
+    },
     "com.docker.app.inspect-format": {
       "definition": "com.docker.app.inspect-format",
       "applyTo": [
@@ -115,6 +125,12 @@
     }
   },
   "definitions": {
+    "com.docker.app.args": {
+      "default": "",
+      "description": "Arguments that are passed by file to the invocation image",
+      "title": "Arguments",
+      "type": "string"
+    },
     "com.docker.app.inspect-format": {
       "default": "json",
       "description": "Output format for the inspect command",