Remove the notion of namespace from most commands

Ulysses Souza · Ulysses Souza · commit 7d4abdded895 · 2019-02-20T14:44:45.000+01:00
One exception is the push command

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
@@ -22,7 +22,6 @@ import (
 
 type bundleOptions struct {
 	invocationImageName string
-	namespace           string
 	out                 string
 }
 
@@ -38,13 +37,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().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")
 	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.namespace, opts.invocationImageName)
+	bundle, err := makeBundle(dockerCli, appName, opts.invocationImageName)
 	if err != nil {
 		return err
 	}
@@ -63,22 +61,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error
 	return ioutil.WriteFile(opts.out, bundleBytes, 0644)
 }
 
-func makeBundle(dockerCli command.Cli, appName, namespace, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundle(dockerCli command.Cli, appName, invocationImageName string) (*bundle.Bundle, error) {
 	app, err := packager.Extract(appName)
 	if err != nil {
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, namespace, invocationImageName)
+	return makeBundleFromApp(dockerCli, app, invocationImageName)
 }
 
-func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocationImageName string) (*bundle.Bundle, error) {
+func makeBundleFromApp(dockerCli command.Cli, app *types.App, invocationImageName string) (*bundle.Bundle, error) {
 	meta := app.Metadata()
-	invocationImageName, err := makeImageName(meta, namespace, invocationImageName, "-invoc")
+	invocationImageName, err := makeImageName(meta, invocationImageName, "-invoc")
 	if err != nil {
 		return nil, err
 	}
-	if _, err := makeImageName(app.Metadata(), namespace, "", ""); err != nil {
+	if _, err := makeImageName(app.Metadata(), "", ""); err != nil {
 		return nil, err
 	}
 
@@ -102,16 +100,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocat
 	return packager.ToCNAB(app, invocationImageName)
 }
 
-func makeImageName(meta metadata.AppMetadata, namespace, name, suffix string) (string, error) {
+func makeImageName(meta metadata.AppMetadata, name, suffix string) (string, error) {
 	if name == "" {
 		name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)
 	}
-	if namespace == "" {
-		namespace = meta.Namespace
-	}
-	if namespace != "" {
-		name = fmt.Sprintf("%s/%s", namespace, name)
-	}
 	if _, err := reference.ParseNormalizedNamed(name); err != nil {
 		return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)
 	}
diff --git a/cmd/docker-app/bundle_test.go b/cmd/docker-app/bundle_test.go
@@ -11,7 +11,6 @@ func TestMakeInvocationImage(t *testing.T) {
 	testcases := []struct {
 		name      string
 		imageName string
-		namespace string
 		meta      metadata.AppMetadata
 		expected  string
 		err       string
@@ -24,30 +23,27 @@ func TestMakeInvocationImage(t *testing.T) {
 		{
 			name:      "specify-image-name-and-namespace",
 			imageName: "my-invocation-image",
-			namespace: "my-namespace",
-			expected:  "my-namespace/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",
-			namespace: "my-namespace",
-			meta:      metadata.AppMetadata{Name: "name", Version: "version"},
-			expected:  "my-namespace/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", Namespace: "namespace"},
-			expected: "namespace/name:version-invoc",
+			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
+			expected: "name:version-invoc",
 		},
 		{
-			name:      "metadata-with-namespace-and-overridden-namespace",
-			namespace: "my-namespace",
-			meta:      metadata.AppMetadata{Name: "name", Version: "version", Namespace: "namespace"},
-			expected:  "my-namespace/name:version-invoc",
+			name:     "metadata-with-namespace-and-overridden-namespace",
+			meta:     metadata.AppMetadata{Name: "name", Version: "version"},
+			expected: "name:version-invoc",
 		},
 		{
 			name: "simple-metadata",
@@ -57,7 +53,7 @@ func TestMakeInvocationImage(t *testing.T) {
 	}
 	for _, c := range testcases {
 		t.Run(c.name, func(t *testing.T) {
-			actual, err := makeImageName(c.meta, c.namespace, c.imageName, "-invoc")
+			actual, err := makeImageName(c.meta, c.imageName, "-invoc")
 			if c.err != "" {
 				assert.ErrorContains(t, err, c.err)
 				assert.Equal(t, actual, "")
diff --git a/cmd/docker-app/cnab.go b/cmd/docker-app/cnab.go
@@ -117,16 +117,16 @@ func getAppNameKind(name string) (string, nameKind) {
 	return name, nameKindFile
 }
 
-func extractAndLoadAppBasedBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundle, error) {
+func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {
 	app, err := packager.Extract(name)
 	if err != nil {
 		return nil, err
 	}
 	defer app.Cleanup()
-	return makeBundleFromApp(dockerCli, app, namespace, "")
+	return makeBundleFromApp(dockerCli, app, "")
 }
 
-func resolveBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundle, error) {
+func resolveBundle(dockerCli command.Cli, name string) (*bundle.Bundle, error) {
 	// resolution logic:
 	// - if there is a docker-app package in working directory, or an http:// / https:// prefix, use packager.Extract result
 	// - the name has a .json or .cnab extension and refers to an existing file or web resource: load the bundle
@@ -136,11 +136,11 @@ func resolveBundle(dockerCli command.Cli, namespace, name string) (*bundle.Bundl
 	switch kind {
 	case nameKindFile:
 		if strings.HasSuffix(name, internal.AppExtension) {
-			return extractAndLoadAppBasedBundle(dockerCli, namespace, name)
+			return extractAndLoadAppBasedBundle(dockerCli, name)
 		}
 		return loader.NewDetectingLoader().Load(name)
 	case nameKindDir, nameKindEmpty:
-		return extractAndLoadAppBasedBundle(dockerCli, namespace, name)
+		return extractAndLoadAppBasedBundle(dockerCli, name)
 	case nameKindReference:
 		// TODO: pull the bundle
 		fmt.Fprintln(dockerCli.Err(), "WARNING: pulling a CNAB is not yet supported")
diff --git a/cmd/docker-app/install.go b/cmd/docker-app/install.go
@@ -17,7 +17,6 @@ type installOptions struct {
 	parametersOptions
 	credentialOptions
 	orchestrator     string
-	namespace        string
 	kubeNamespace    string
 	stackName        string
 	insecure         bool
@@ -58,7 +57,6 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVarP(&opts.orchestrator, "orchestrator", "o", "", "Orchestrator to install on (swarm, kubernetes)")
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
 	cmd.Flags().StringVar(&opts.kubeNamespace, "kubernetes-namespace", "default", "Kubernetes namespace to install into")
 	cmd.Flags().StringVar(&opts.stackName, "name", "", "Installation name (defaults to application name)")
 	cmd.Flags().BoolVar(&opts.insecure, "insecure", false, "Use insecure registry, without SSL")
@@ -74,7 +72,7 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
 	}
 	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
 
-	bndl, err := resolveBundle(dockerCli, opts.namespace, appname)
+	bndl, err := resolveBundle(dockerCli, appname)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/docker-app/push.go b/cmd/docker-app/push.go
@@ -33,7 +33,7 @@ func pushCmd() *cobra.Command {
 			return err
 		},
 	}
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
+	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)")
 	return cmd
diff --git a/cmd/docker-app/upgrade.go b/cmd/docker-app/upgrade.go
@@ -15,7 +15,6 @@ type upgradeOptions struct {
 	parametersOptions
 	credentialOptions
 	bundleOrDockerApp string
-	namespace         string
 	insecure          bool
 }
 
@@ -32,7 +31,6 @@ func upgradeCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVar(&opts.bundleOrDockerApp, "bundle", "", "Override with new bundle or Docker App")
-	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")
 	cmd.Flags().BoolVar(&opts.insecure, "insecure", false, "Use insecure registry, without SSL")
 
 	return cmd
@@ -49,7 +47,7 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
 	}
 
 	if opts.bundleOrDockerApp != "" {
-		b, err := resolveBundle(dockerCli, opts.namespace, opts.bundleOrDockerApp)
+		b, err := resolveBundle(dockerCli, opts.bundleOrDockerApp)
 		if err != nil {
 			return err
 		}
diff --git a/e2e/commands_test.go b/e2e/commands_test.go
@@ -86,8 +86,6 @@ version: 0.1.0
 name: app-test
 # A short description of the application
 description: my cool app
-# 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: bob
diff --git a/e2e/testdata/init-singlefile.dockerapp b/e2e/testdata/init-singlefile.dockerapp
@@ -5,8 +5,6 @@ version: 0.1.0
 name: tac
 # A short description of the application
 description: my cool app
-# 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: bob
diff --git a/internal/packager/cnab.go b/internal/packager/cnab.go
@@ -1,8 +1,6 @@
 package packager
 
 import (
-	"fmt"
-
 	"github.com/deislabs/duffle/pkg/bundle"
 	"github.com/docker/app/internal/compose"
 	"github.com/docker/app/types"
@@ -55,10 +53,6 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 			Name:  m.Name,
 		})
 	}
-	name := app.Metadata().Name
-	if app.Metadata().Namespace != "" {
-		name = fmt.Sprintf("%s/%s", app.Metadata().Namespace, name)
-	}
 
 	bundleImages, err := extractBundleImages(app.Composes())
 	if err != nil {
@@ -81,7 +75,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 			},
 		},
 		Maintainers: maintainers,
-		Name:        name,
+		Name:        app.Metadata().Name,
 		Version:     app.Metadata().Version,
 		Parameters:  parameters,
 		Actions: map[string]bundle.Action{
diff --git a/internal/packager/cnab_test.go b/internal/packager/cnab_test.go
@@ -15,7 +15,7 @@ func TestToCNAB(t *testing.T) {
 	assert.NilError(t, err)
 	expected := &bundle.Bundle{
 		Description: "hello",
-		Name:        "my-namespace/packing",
+		Name:        "packing",
 		Maintainers: []bundle.Maintainer{
 			{Name: "bearclaw", Email: "bearclaw@bearclaw.com"},
 			{Name: "bob", Email: "bob@bob.com"},
diff --git a/internal/packager/init.go b/internal/packager/init.go
@@ -190,8 +190,6 @@ version: {{ .Version }}
 name: {{ .Name }}
 # A short description of the application
 description: {{ .Description }}
-# Namespace to use when pushing to a registry. This is typically your Hub username.
-{{ if len .Namespace}}namespace: {{ .Namespace }} {{ else }}#namespace: myhubusername{{ end }}
 # List of application maintainers with name and email for each
 {{ if len .Maintainers }}maintainers:
 {{ range .Maintainers }}  - name: {{ .Name  }}
diff --git a/internal/packager/init_test.go b/internal/packager/init_test.go
@@ -106,8 +106,6 @@ version: 0.1.0
 name: writemetadata_test
 # A short description of the application
 description: 
-# 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: bearclaw
diff --git a/internal/packager/registry.go b/internal/packager/registry.go
@@ -95,14 +95,8 @@ func Push(app *types.App, namespace, tag, repo string) (string, error) {
 }
 
 func createImageName(app *types.App, namespace, tag, repo string) string {
-	if namespace == "" || tag == "" {
-		metadata := app.Metadata()
-		if namespace == "" {
-			namespace = metadata.Namespace
-		}
-		if tag == "" {
-			tag = metadata.Version
-		}
+	if tag == "" {
+		tag = app.Metadata().Version
 	}
 	if repo == "" {
 		repo = internal.AppNameFromDir(app.Name) + internal.AppExtension
diff --git a/types/metadata/load_test.go b/types/metadata/load_test.go
@@ -18,7 +18,6 @@ func TestAllFields(t *testing.T) {
 		Name:        "testapp",
 		Version:     "0.2.0",
 		Description: "something about this application",
-		Namespace:   "testnamespace",
 		Maintainers: []Maintainer{
 			{
 				Name:  "bob",
@@ -29,11 +28,10 @@ func TestAllFields(t *testing.T) {
 	parsed, err := Load([]byte(fmt.Sprintf(`name: %s
 version: %s
 description: %s
-namespace: %s
 maintainers:
   - name: %s
     email: %s
-`, m.Name, m.Version, m.Description, m.Namespace, m.Maintainers[0].Name, m.Maintainers[0].Email)))
+`, m.Name, m.Version, m.Description, m.Maintainers[0].Name, m.Maintainers[0].Email)))
 	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(parsed, m))
 }
diff --git a/types/metadata/metadata.go b/types/metadata/metadata.go
@@ -36,6 +36,5 @@ type AppMetadata struct {
 	Version     string      `json:"version"`
 	Name        string      `json:"name"`
 	Description string      `json:"description,omitempty"`
-	Namespace   string      `json:"namespace,omitempty"`
 	Maintainers Maintainers `json:"maintainers,omitempty"`
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import (`
`22`	`22`
`23`	`23`	`type bundleOptions struct {`
`24`	`24`	`invocationImageName string`
`25`		`- namespace string`
`26`	`25`	`out string`
`27`	`26`	`}`
`28`	`27`
`@@ -38,13 +37,12 @@ func bundleCmd(dockerCli command.Cli) *cobra.Command {`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`cmd.Flags().StringVarP(&opts.invocationImageName, "invocation-image", "i", "", "specify the name of invocation image to build")`
`41`		`- cmd.Flags().StringVar(&opts.namespace, "namespace", "", "namespace to use (default: namespace in metadata)")`
`42`	`40`	`cmd.Flags().StringVarP(&opts.out, "out", "o", "bundle.json", "path to the output bundle.json (- for stdout)")`
`43`	`41`	`return cmd`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error {`
`47`		`- bundle, err := makeBundle(dockerCli, appName, opts.namespace, opts.invocationImageName)`
	`45`	`+ bundle, err := makeBundle(dockerCli, appName, opts.invocationImageName)`
`48`	`46`	`if err != nil {`
`49`	`47`	`return err`
`50`	`48`	`}`
`@@ -63,22 +61,22 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error`
`63`	`61`	`return ioutil.WriteFile(opts.out, bundleBytes, 0644)`
`64`	`62`	`}`
`65`	`63`
`66`		`-func makeBundle(dockerCli command.Cli, appName, namespace, invocationImageName string) (*bundle.Bundle, error) {`
	`64`	`+func makeBundle(dockerCli command.Cli, appName, invocationImageName string) (*bundle.Bundle, error) {`
`67`	`65`	`app, err := packager.Extract(appName)`
`68`	`66`	`if err != nil {`
`69`	`67`	`return nil, err`
`70`	`68`	`}`
`71`	`69`	`defer app.Cleanup()`
`72`		`- return makeBundleFromApp(dockerCli, app, namespace, invocationImageName)`
	`70`	`+ return makeBundleFromApp(dockerCli, app, invocationImageName)`
`73`	`71`	`}`
`74`	`72`
`75`		`-func makeBundleFromApp(dockerCli command.Cli, app types.App, namespace, invocationImageName string) (bundle.Bundle, error) {`
	`73`	`+func makeBundleFromApp(dockerCli command.Cli, app types.App, invocationImageName string) (bundle.Bundle, error) {`
`76`	`74`	`meta := app.Metadata()`
`77`		`- invocationImageName, err := makeImageName(meta, namespace, invocationImageName, "-invoc")`
	`75`	`+ invocationImageName, err := makeImageName(meta, invocationImageName, "-invoc")`
`78`	`76`	`if err != nil {`
`79`	`77`	`return nil, err`
`80`	`78`	`}`
`81`		`- if _, err := makeImageName(app.Metadata(), namespace, "", ""); err != nil {`
	`79`	`+ if _, err := makeImageName(app.Metadata(), "", ""); err != nil {`
`82`	`80`	`return nil, err`
`83`	`81`	`}`
`84`	`82`
`@@ -102,16 +100,10 @@ func makeBundleFromApp(dockerCli command.Cli, app *types.App, namespace, invocat`
`102`	`100`	`return packager.ToCNAB(app, invocationImageName)`
`103`	`101`	`}`
`104`	`102`
`105`		`-func makeImageName(meta metadata.AppMetadata, namespace, name, suffix string) (string, error) {`
	`103`	`+func makeImageName(meta metadata.AppMetadata, name, suffix string) (string, error) {`
`106`	`104`	`if name == "" {`
`107`	`105`	`name = fmt.Sprintf("%s:%s%s", meta.Name, meta.Version, suffix)`
`108`	`106`	`}`
`109`		`- if namespace == "" {`
`110`		`- namespace = meta.Namespace`
`111`		`- }`
`112`		`- if namespace != "" {`
`113`		`- name = fmt.Sprintf("%s/%s", namespace, name)`
`114`		`- }`
`115`	`107`	`if _, err := reference.ParseNormalizedNamed(name); err != nil {`
`116`	`108`	`return "", errors.Wrapf(err, "image name %q is invalid, please check namespace, name and version fields", name)`
`117`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func pushCmd() *cobra.Command {`
`33`	`33`	`return err`
`34`	`34`	`},`
`35`	`35`	`}`
`36`		`- cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")`
	`36`	`+ cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use")`
`37`	`37`	`cmd.Flags().StringVarP(&opts.tag, "tag", "t", "", "Tag to use (default: version in metadata)")`
`38`	`38`	`cmd.Flags().StringVar(&opts.repo, "repo", "", "Name of the remote repository (default: <app-name>.dockerapp)")`
`39`	`39`	`return cmd`