Remove namespace & repo opts form push and bump v2

Ulysses Souza · Ulysses Souza · commit 6688c3b28603 · 2019-02-20T15:05:47.000+01:00
- As a result of removing namespace from push command, the repo
was also suppressed.
- Bump of the metadata schema do v0.2 accepting any formatting
on `name` and removing `namespace`

Signed-off-by: Ulysses Souza &lt;ulysses.souza@docker.com&gt;
diff --git a/cmd/docker-app/bundle.go b/cmd/docker-app/bundle.go
@@ -21,8 +21,7 @@ import (
 )
 
 type bundleOptions struct {
-	invocationImageName string
-	out                 string
+	out string
 }
 
 func bundleCmd(dockerCli command.Cli) *cobra.Command {
@@ -36,13 +35,12 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&opts.invocationImageName, "invocation-image", "i", "", "specify the name of invocation image to build")
 	cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")
 	return cmd
 }
 
 func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error {
-	bundle, err := makeBundle(dockerCli, appName, opts.invocationImageName)
+	bundle, err := makeBundle(dockerCli, appName)
 	if err != nil {
 		return err
 	}
@@ -61,22 +59,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error
 	return ioutil.WriteFile(opts.out, bundleBytes, 0644)
 }
 
-func makeBundle(dockerCli command.Cli, appName, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundle(dockerCli command.Cli, appName string) (*bundle.Bundle, error) {
 	app, err := packager.Extract(appName)
 	if err != nil {
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, invocationImageName)
+	return makeBundleFromApp(dockerCli, app)
 }
 
-func makeBundleFromApp(dockerCli command.Cli, app *types.App, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundleFromApp(dockerCli command.Cli, app *types.App) (*bundle.Bundle, error) {
 	meta := app.Metadata()
-	invocationImageName, err := makeImageName(meta, invocationImageName, "-invoc")
+	invocationImageName, err := makeImageName(meta)
 	if err != nil {
 		return nil, err
 	}
-	if _, err := makeImageName(app.Metadata(), "", ""); err != nil {
+	if _, err := makeImageName(meta); err != nil {
 		return nil, err
 	}
 
@@ -100,12 +98,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, invocationImageNam
 	return packager.ToCNAB(app, invocationImageName)
 }
 
-func makeImageName(meta metadata.AppMetadata, name, suffix string) (string, error) {
-	if name == "" {
-		name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)
-	}
+func makeImageName(meta metadata.AppMetadata) (string, error) {
+	name := fmt.Sprintf("%s:%s-invoc", meta.Name, meta.Version)
 	if _, err := reference.ParseNormalizedNamed(name); err != nil {
-		return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)
+		return "", errors.Wrapf(err, "image name %q is invalid, please check name and version fields", name)
 	}
 	return name, nil
 }
diff --git a/cmd/docker-app/bundle_test.go b/cmd/docker-app/bundle_test.go
@@ -9,42 +9,16 @@ import (
 
 func TestMakeInvocationImage(t *testing.T) {
 	testcases := []struct {
-		name      string
-		imageName string
-		meta      metadata.AppMetadata
-		expected  string
-		err       string
+		name     string
+		meta     metadata.AppMetadata
+		expected string
+		err      string
 	}{
-		{
-			name:      "specify-image-name",
-			imageName: "my-invocation-image",
-			expected:  "my-invocation-image",
-		},
-		{
-			name:      "specify-image-name-and-namespace",
-			imageName: "my-invocation-image",
-			expected:  "my-invocation-image",
-		},
 		{
 			name:     "simple-metadata",
 			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
 			expected: "name:version-invoc",
 		},
-		{
-			name:     "simple-metadata-with-overridden-namespace",
-			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
-			expected: "name:version-invoc",
-		},
-		{
-			name:     "metadata-with-namespace",
-			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
-			expected: "name:version-invoc",
-		},
-		{
-			name:     "metadata-with-namespace-and-overridden-namespace",
-			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
-			expected: "name:version-invoc",
-		},
 		{
 			name: "simple-metadata",
 			meta: metadata.AppMetadata{Name: "WrongName&%*", Version: "version"},
@@ -53,10 +27,10 @@ func TestMakeInvocationImage(t *testing.T) {
 	}
 	for _, c := range testcases {
 		t.Run(c.name, func(t *testing.T) {
-			actual, err := makeImageName(c.meta, c.imageName, "-invoc")
+			actual, err := makeImageName(c.meta)
 			if c.err != "" {
 				assert.ErrorContains(t, err, c.err)
-				assert.Equal(t, actual, "")
+				assert.Equal(t, actual, "", "On "+c.meta.Name)
 			} else {
 				assert.NilError(t, err)
 				assert.Equal(t, actual, c.expected)
diff --git a/cmd/docker-app/cnab.go b/cmd/docker-app/cnab.go
@@ -123,7 +123,7 @@ func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.B
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, "")
+	return makeBundleFromApp(dockerCli, app)
 }
 
 func resolveBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {
diff --git a/cmd/docker-app/inspect.go b/cmd/docker-app/inspect.go
@@ -27,7 +27,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			bundle, err := resolveBundle(dockerCli, "", appname)
+			bundle, err := resolveBundle(dockerCli, appname)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/docker-app/push.go b/cmd/docker-app/push.go
@@ -9,9 +9,7 @@ import (
 )
 
 type pushOptions struct {
-	namespace string
-	tag       string
-	repo      string
+	tag string
 }
 
 func pushCmd() *cobra.Command {
@@ -26,15 +24,13 @@ func pushCmd() *cobra.Command {
 				return err
 			}
 			defer app.Cleanup()
-			dgst, err := packager.Push(app, opts.namespace, opts.tag, opts.repo)
+			dgst, err := packager.Push(app, opts.tag)
 			if err == nil {
 				fmt.Println(dgst)
 			}
 			return err
 		},
 	}
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use")
-	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")
-	cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")
+	cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default is : from metadata)")
 	return cmd
 }
diff --git a/e2e/commands_test.go b/e2e/commands_test.go
@@ -241,10 +241,10 @@ func TestBundle(t *testing.T) {
 
 	// List the images on the build context daemon and checks the invocation image is there
 	cmd.Command = []string{dockerCli, "image", "ls", "--format", "{{.Repository}}:{{.Tag}}"}
-	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "acmecorp/simple:1.1.0-beta1-invoc"})
+	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "simple:1.1.0-beta1-invoc"})
 
 	// Copy all the files from the invocation image and check them
-	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "acmecorp/simple:1.1.0-beta1-invoc"}
+	cmd.Command = []string{dockerCli, "create", "--name", "invocation", "simple:1.1.0-beta1-invoc"}
 	id := strings.TrimSpace(icmd.RunCmd(cmd).Assert(t, icmd.Success).Stdout())
 	cmd.Command = []string{dockerCli, "cp", "invocation:/cnab/app/simple.dockerapp", tmpDir.Join("simple.dockerapp")}
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
diff --git a/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml b/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml
@@ -1,7 +1,6 @@
 version: 0.1.0
 name: myapp
 description: ""
-namespace: "alice"
 maintainers:
   - name: bearclaw
     email: bearclaw@bearclaw.bearclaw
diff --git a/e2e/testdata/simple-bundle.json.golden b/e2e/testdata/simple-bundle.json.golden
@@ -1,5 +1,5 @@
 {
-	"name": "acmecorp/simple",
+	"name": "simple",
 	"version": "1.1.0-beta1",
 	"description": "new fancy webapp with microservices",
 	"maintainers": [
@@ -17,7 +17,7 @@
 	"invocationImages": [
 		{
 			"imageType": "docker",
-			"image": "acmecorp/simple:1.1.0-beta1-invoc"
+			"image": "simple:1.1.0-beta1-invoc"
 		}
 	],
 	"images": {
diff --git a/e2e/testdata/simple/simple.dockerapp/metadata.yml b/e2e/testdata/simple/simple.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 1.1.0-beta1
 name: simple
-namespace: acmecorp
 description: "new fancy webapp with microservices"
 maintainers:
   - name: John Developer
diff --git a/examples/voting-app/voting-app.dockerapp/metadata.yml b/examples/voting-app/voting-app.dockerapp/metadata.yml
@@ -4,8 +4,6 @@ version: 0.1.0
 name: voting-app
 # A short description of the application
 description: "Dogs or cats?"
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-namespace: myhubusername
 # List of application maintainers with name and email for each
 maintainers:
   - name: user
diff --git a/internal/config.go b/internal/config.go
@@ -4,5 +4,5 @@ var (
 	// Experimental enables experimental features if set to "on"
 	Experimental = "on"
 	// MetadataVersion defines the current schema version
-	MetadataVersion = "v0.1"
+	MetadataVersion = "v0.2"
 )
diff --git a/internal/packager/registry.go b/internal/packager/registry.go
@@ -85,26 +85,20 @@ func ExtractImagePayloadToDiskFiles(appDir string, payload map[string]string) er
 }
 
 // Push pushes an app to a registry. Returns the image digest.
-func Push(app *types.App, namespace, tag, repo string) (string, error) {
+func Push(app *types.App, tag string) (string, error) {
 	payload, err := createPayload(app)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to read external file while creating payload for push")
 	}
-	imageName := createImageName(app, namespace, tag, repo)
+	imageName := createImageName(app, tag)
 	return resto.PushConfigMulti(context.Background(), payload, imageName, resto.RegistryOptions{}, nil)
 }
 
-func createImageName(app *types.App, namespace, tag, repo string) string {
-	if tag == "" {
-		tag = app.Metadata().Version
+func createImageName(app *types.App, registryReference string) string {
+	if registryReference != "" {
+		return registryReference
 	}
-	if repo == "" {
-		repo = internal.AppNameFromDir(app.Name) + internal.AppExtension
-	}
-	if namespace != "" && namespace[len(namespace)-1] != '/' {
-		namespace += "/"
-	}
-	return namespace + repo + ":" + tag
+	return app.Metadata().Name + ":" + app.Metadata().Version
 }
 
 func createPayload(app *types.App) (map[string]string, error) {
diff --git a/internal/packager/testdata/packages/packing.dockerapp/metadata.yml b/internal/packager/testdata/packages/packing.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 0.1.0
 name: packing
-namespace: my-namespace
 description: "hello"
 maintainers:
   - name: bearclaw
diff --git a/specification/bindata.go b/specification/bindata.go
diff --git a/specification/schema_test.go b/specification/schema_test.go
diff --git a/specification/schemas/metadata_schema_v0.2.json b/specification/schemas/metadata_schema_v0.2.json
diff --git a/types/types_test.go b/types/types_test.go

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type bundleOptions struct {`
`24`		`- invocationImageName string`
`25`		`- out string`
	`24`	`+ out string`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`func bundleCmd(dockerCli command.Cli) *cobra.Command {`
`@@ -36,13 +35,12 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {`
`36`	`35`	`},`
`37`	`36`	`}`
`38`	`37`
`39`		`- cmd.Flags().StringVarP(&opts.invocationImageName, "invocation-image", "i", "", "specify the name of invocation image to build")`
`40`	`38`	`cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")`
`41`	`39`	`return cmd`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error {`
`45`		`- bundle, err := makeBundle(dockerCli, appName, opts.invocationImageName)`
	`43`	`+ bundle, err := makeBundle(dockerCli, appName)`
`46`	`44`	`if err != nil {`
`47`	`45`	`return err`
`48`	`46`	`}`
`@@ -61,22 +59,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error`
`61`	`59`	`return ioutil.WriteFile(opts.out, bundleBytes, 0644)`
`62`	`60`	`}`
`63`	`61`
`64`		`-func makeBundle(dockerCli command.Cli, appName, invocationImageName string) (*bundle.Bundle, error) {`
	`62`	`+func makeBundle(dockerCli command.Cli, appName string) (*bundle.Bundle, error) {`
`65`	`63`	`app, err := packager.Extract(appName)`
`66`	`64`	`if err != nil {`
`67`	`65`	`return nil, err`
`68`	`66`	`}`
`69`	`67`	`defer app.Cleanup()`
`70`		`- return makeBundleFromApp(dockerCli, app, invocationImageName)`
	`68`	`+ return makeBundleFromApp(dockerCli, app)`
`71`	`69`	`}`
`72`	`70`
`73`		`-func makeBundleFromApp(dockerCli command.Cli, app types.App, invocationImageName string) (bundle.Bundle, error) {`
	`71`	`+func makeBundleFromApp(dockerCli command.Cli, app types.App) (bundle.Bundle, error) {`
`74`	`72`	`meta := app.Metadata()`
`75`		`- invocationImageName, err := makeImageName(meta, invocationImageName, "-invoc")`
	`73`	`+ invocationImageName, err := makeImageName(meta)`
`76`	`74`	`if err != nil {`
`77`	`75`	`return nil, err`
`78`	`76`	`}`
`79`		`- if _, err := makeImageName(app.Metadata(), "", ""); err != nil {`
	`77`	`+ if _, err := makeImageName(meta); err != nil {`
`80`	`78`	`return nil, err`
`81`	`79`	`}`
`82`	`80`
`@@ -100,12 +98,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, invocationImageNam`
`100`	`98`	`return packager.ToCNAB(app, invocationImageName)`
`101`	`99`	`}`
`102`	`100`
`103`		`-func makeImageName(meta metadata.AppMetadata, name, suffix string) (string, error) {`
`104`		`- if name == "" {`
`105`		`- name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)`
`106`		`- }`
	`101`	`+func makeImageName(meta metadata.AppMetadata) (string, error) {`
	`102`	`+ name := fmt.Sprintf("%s:%s-invoc", meta.Name, meta.Version)`
`107`	`103`	`if _, err := reference.ParseNormalizedNamed(name); err != nil {`
`108`		`- return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)`
	`104`	`+ return "", errors.Wrapf(err, "image name %q is invalid, please check name and version fields", name)`
`109`	`105`	`}`
`110`	`106`	`return name, nil`
`111`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.B`
`123`	`123`	`return nil, err`
`124`	`124`	`}`
`125`	`125`	`defer app.Cleanup()`
`126`		`- return makeBundleFromApp(dockerCli, app, "")`
	`126`	`+ return makeBundleFromApp(dockerCli, app)`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func resolveBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {`
`27`	`27`	`if err != nil {`
`28`	`28`	`return err`
`29`	`29`	`}`
`30`		`- bundle, err := resolveBundle(dockerCli, "", appname)`
	`30`	`+ bundle, err := resolveBundle(dockerCli, appname)`
`31`	`31`	`if err != nil {`
`32`	`32`	`return err`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type pushOptions struct {`
`12`		`- namespace string`
`13`		`- tag string`
`14`		`- repo string`
	`12`	`+ tag string`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`func pushCmd() *cobra.Command {`
`@@ -26,15 +24,13 @@ func pushCmd() *cobra.Command {`
`26`	`24`	`return err`
`27`	`25`	`}`
`28`	`26`	`defer app.Cleanup()`
`29`		`- dgst, err := packager.Push(app, opts.namespace, opts.tag, opts.repo)`
	`27`	`+ dgst, err := packager.Push(app, opts.tag)`
`30`	`28`	`if err == nil {`
`31`	`29`	`fmt.Println(dgst)`
`32`	`30`	`}`
`33`	`31`	`return err`
`34`	`32`	`},`
`35`	`33`	`}`
`36`		`- cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use")`
`37`		`- cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")`
`38`		`- cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")`
	`34`	`+ cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Target registry reference (default is : from metadata)")`
`39`	`35`	`return cmd`
`40`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "acmecorp/simple",`
	`2`	`+ "name": "simple",`
`3`	`3`	`"version": "1.1.0-beta1",`
`4`	`4`	`"description": "new fancy webapp with microservices",`
`5`	`5`	`"maintainers": [`
`@@ -17,7 +17,7 @@`
`17`	`17`	`"invocationImages": [`
`18`	`18`	`{`
`19`	`19`	`"imageType": "docker",`
`20`		`- "image": "acmecorp/simple:1.1.0-beta1-invoc"`
	`20`	`+ "image": "simple:1.1.0-beta1-invoc"`
`21`	`21`	`}`
`22`	`22`	`],`
`23`	`23`	`"images": {`