Merge pull request #713 from carolinebriaud/fix-usages-examples

Use app naming rules in error and progress messages

Author: silvin-lubecki

e2e/commands_test.go

@@ -238,7 +238,7 @@ func testDockerAppLifecycle(t *testing.T, useBindMount bool) {
 	cmd.Command = dockerCli.Command("app", "update", appName)
 	icmd.RunCmd(cmd).Assert(t, icmd.Expected{
 		ExitCode: 1,
-		Err:      fmt.Sprintf("Installation %q has failed and cannot be updated, reinstall it using 'docker app run'", appName),
+		Err:      fmt.Sprintf("Running App %q cannot be updated, please use 'docker app run' instead", appName),
 	})
 
 	// Install a Docker Application Package with an existing failed installation is fine

e2e/images_test.go

@@ -155,14 +155,14 @@ a-simple-app:latest simple
 		dockerAppImageTag("b-simple-app", "target")
 		icmd.RunCmd(cmd).Assert(t, icmd.Expected{
 			ExitCode: 1,
-			Err:      `could not tag 'b-simple-app': no such application image`,
+			Err:      `could not tag 'b-simple-app': no such App image`,
 		})
 
 		// with unexisting source tag
 		dockerAppImageTag("a-simple-app:not-a-tag", "target")
 		icmd.RunCmd(cmd).Assert(t, icmd.Expected{
 			ExitCode: 1,
-			Err:      `could not tag 'a-simple-app:not-a-tag': no such application image`,
+			Err:      `could not tag 'a-simple-app:not-a-tag': no such App image`,
 		})
 
 		// tag image with only names

e2e/pushpull_test.go

@@ -180,8 +180,8 @@ func TestPushPullInstall(t *testing.T) {
 		// install should fail (registry is stopped)
 		cmd.Command = dockerCli.Command("app", "run", "unknown")
 		//nolint: lll
-		expected := `Unable to find application image "unknown:latest" locally
-Unable to find application "unknown": failed to resolve bundle manifest "docker.io/library/unknown:latest": pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed`
+		expected := `Unable to find App image "unknown:latest" locally
+Unable to find App "unknown": failed to resolve bundle manifest "docker.io/library/unknown:latest": pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed`
 		icmd.RunCmd(cmd).Assert(t, icmd.Expected{
 			ExitCode: 1,
 			Err:      expected,

e2e/testdata/credential-install-full.golden

@@ -4,4 +4,4 @@ bar
 SECRET_THREE: baz
 /var/secret_three/data.txt
 baz
-Application "full" installed on context "default"
+App "full" running on context "default"

e2e/testdata/credential-install-mixed-credstore.golden

@@ -4,4 +4,4 @@ secret2value
 SECRET_THREE: xyzzy
 /var/secret_three/data.txt
 xyzzy
-Application "mixed-credstore" installed on context "default"
+App "mixed-credstore" running on context "default"

e2e/testdata/credential-install-mixed-local-cred.golden

@@ -4,4 +4,4 @@ secret2value
 SECRET_THREE: xyzzy
 /var/secret_three/data.txt
 xyzzy
-Application "mixed-local-cred" installed on context "default"
+App "mixed-local-cred" running on context "default"

internal/cnab/cnab.go

@@ -96,7 +96,7 @@ func GetBundle(dockerCli command.Cli, bundleStore appstore.BundleStore, name str
 	}
 	bndl, err := bundleStore.Read(ref)
 	if err != nil {
-		fmt.Fprintf(dockerCli.Err(), "Unable to find application image %q locally\n", reference.FamiliarString(ref))
+		fmt.Fprintf(dockerCli.Err(), "Unable to find App image %q locally\n", reference.FamiliarString(ref))
 
 		fmt.Fprintf(dockerCli.Out(), "Pulling from registry...\n")
 		if named, ok := ref.(reference.Named); ok {

internal/commands/build/build.go

@@ -114,7 +114,7 @@ func runBuild(dockerCli command.Cli, contextPath string, opt buildOptions) error
 
 	if opt.imageIDFile != "" {
 		if err = ioutil.WriteFile(opt.imageIDFile, []byte(id.Digest().String()), 0644); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "Failed to write application image id in %s: %s", opt.imageIDFile, err)
+			fmt.Fprintf(dockerCli.Err(), "Failed to write App image ID in %s: %s", opt.imageIDFile, err)
 		}
 	}
 
@@ -191,7 +191,7 @@ func getAppFolder(opt buildOptions, contextPath string) (string, error) {
 		for _, f := range files {
 			if strings.HasSuffix(f.Name(), ".dockerapp") {
 				if application != "" {
-					return "", fmt.Errorf("%s contains multiple .dockerapp directories, use -f option to select the one to build", contextPath)
+					return "", fmt.Errorf("%s contains multiple .dockerapp directories, use -f option to select the App definition to build", contextPath)
 				}
 				application = filepath.Join(contextPath, f.Name())
 				if !f.IsDir() {

internal/commands/build/types.go

@@ -28,11 +28,11 @@ type ImageBuildConfig struct {
 func load(dict map[string]interface{}, buildArgs []string) ([]ServiceConfig, error) {
 	section, ok := dict["services"]
 	if !ok {
-		return nil, fmt.Errorf("compose file doesn't declare any service")
+		return nil, fmt.Errorf("Compose file doesn't declare any service")
 	}
 	services, ok := section.(map[string]interface{})
 	if !ok {
-		return nil, fmt.Errorf("Invalid compose file: 'services' should be a map")
+		return nil, fmt.Errorf("Invalid Compose file: 'services' should be a map")
 	}
 	return loadServices(services, buildArgs)
 }

internal/commands/image/tag.go

@@ -53,7 +53,7 @@ func readBundle(name string, bundleStore store.BundleStore) (*bundle.Bundle, err
 
 	bundle, err := bundleStore.Read(cnabRef)
 	if err != nil {
-		return nil, fmt.Errorf("could not tag '%s': no such application image", name)
+		return nil, fmt.Errorf("could not tag '%s': no such App image", name)
 	}
 	return bundle, nil
 }