Use app naming rules in error and progress messages

Signed-off-by: Caroline Briaud <caroline.briaud@docker.com>

Author: carolinebriaud

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
 }

internal/commands/remove.go

@@ -55,10 +55,10 @@ func runRemove(dockerCli command.Cli, installationName string, opts removeOption
 				return
 			}
 			if err := installationStore.Delete(installationName); err != nil {
-				fmt.Fprintf(os.Stderr, "failed to force deletion of installation %q: %s\n", installationName, err)
+				fmt.Fprintf(os.Stderr, "failed to force deletion of running App %q: %s\n", installationName, err)
 				return
 			}
-			fmt.Fprintf(os.Stderr, "deletion forced for installation %q\n", installationName)
+			fmt.Fprintf(os.Stderr, "deletion forced for running App %q\n", installationName)
 		}()
 	}
 	bind, err := cnab.RequiredClaimBindMount(installation.Claim, opts.targetContext, dockerCli)
@@ -83,8 +83,8 @@ func runRemove(dockerCli command.Cli, installationName string, opts removeOption
 		return fmt.Errorf("Remove failed: %s\n%s", err, errBuf)
 	}
 	if err := installationStore.Delete(installationName); err != nil {
-		return fmt.Errorf("Failed to delete installation %q from the installation store: %s", installationName, err)
+		return fmt.Errorf("Failed to delete running App %q from the installation store: %s", installationName, err)
 	}
-	fmt.Fprintf(os.Stdout, "Application %q uninstalled on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "App %q uninstalled on context %q\n", installationName, opts.targetContext)
 	return nil
 }

internal/commands/run.go

@@ -83,7 +83,7 @@ func runDockerApp(dockerCli command.Cli, appname string, opts runOptions) error
 
 	bndl, ref, err := cnab.GetBundle(dockerCli, bundleStore, appname)
 	if err != nil {
-		return errors.Wrapf(err, "Unable to find application %q", appname)
+		return errors.Wrapf(err, "Unable to find App %q", appname)
 	}
 	return runBundle(dockerCli, bndl, opts, ref.String())
 }
@@ -154,12 +154,12 @@ func runBundle(dockerCli command.Cli, bndl *bundle.Bundle, opts runOptions, ref
 	// so any installation needs a clean uninstallation.
 	err2 := installationStore.Store(installation)
 	if err != nil {
-		return fmt.Errorf("Installation failed: %s\n%s", err, errBuf)
+		return fmt.Errorf("Failed to run App: %s\n%s", err, errBuf)
 	}
 	if err2 != nil {
 		return err2
 	}
 
-	fmt.Fprintf(os.Stdout, "Application %q installed on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "App %q is running on context %q\n", installationName, opts.targetContext)
 	return nil
 }

internal/commands/update.go

@@ -50,7 +50,7 @@ func runUpdate(dockerCli command.Cli, installationName string, opts updateOption
 	}
 
 	if isInstallationFailed(installation) {
-		return fmt.Errorf("Installation %q has failed and cannot be updated, reinstall it using 'docker app run'", installationName)
+		return fmt.Errorf("Running App %q cannot be updated, please use 'docker app run' instead", installationName)
 	}
 
 	if opts.bundleOrDockerApp != "" {
@@ -91,6 +91,6 @@ func runUpdate(dockerCli command.Cli, installationName string, opts updateOption
 	if err2 != nil {
 		return err2
 	}
-	fmt.Fprintf(os.Stdout, "Application %q updated on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "Running App %q updated on context %q\n", installationName, opts.targetContext)
 	return nil
 }