Cleanup some CLI error messages (#407)

* Cleanup some CLI error messages

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## v3.4.10 (unreleased)
- - Allow nil transform-function in EnsureaValidRangeConditions
+## v3.4.11 (unreleased)
+ - (nothing changed yet)
+
+## v3.4.10 (2019-10-14)
+ - Allow nil transform-function in EnsureValidRangeConditions
+ - Improve some CLI error messages
 
 ## v3.4.9 (2019-10-04)
  - clarifying message on success of scope drop, to wait before re-creating

client.go

@@ -294,7 +294,7 @@ func (c *client) Initialize(ctx context.Context) error {
 	// fetch latest version for all registered entities, assume order is preserved
 	version, err := c.connector.CheckSchema(ctx, c.registrar.Scope(), c.registrar.NamePrefix(), eds)
 	if err != nil {
-		return errors.Wrap(err, "CheckSchema failed")
+		return errors.Wrap(err, "schema on the server is incompatible with the code")
 	}
 
 	// set version for all registered entities
@@ -647,7 +647,7 @@ func (c *adminClient) CanUpsertSchema(ctx context.Context, namePrefix string) (*
 	}
 	version, err := c.connector.CanUpsertSchema(ctx, c.scope, namePrefix, defs)
 	if err != nil {
-		return nil, errors.Wrapf(err, "CheckSchema failed, directories: %s, excludes: %s, scope: %s", c.dirs, c.excludes, c.scope)
+		return nil, errors.Wrapf(err, "schema incompatible: directories: %s, excludes: %s, scope: %s", c.dirs, c.excludes, c.scope)
 	}
 	return &SchemaStatus{
 		Version: version,
@@ -658,7 +658,7 @@ func (c *adminClient) CanUpsertSchema(ctx context.Context, namePrefix string) (*
 func (c *adminClient) CheckSchemaStatus(ctx context.Context, namePrefix string, version int32) (*SchemaStatus, error) {
 	status, err := c.connector.CheckSchemaStatus(ctx, c.scope, namePrefix, version)
 	if err != nil {
-		return nil, errors.Wrapf(err, "CheckSchemaStatus status failed")
+		return nil, errors.Wrapf(err, "check schema application status")
 	}
 	return status, nil
 }

cmd/dosa/client.go

@@ -69,7 +69,7 @@ func (c *shellQueryClient) Initialize(ctx context.Context) error {
 
 	version, err := c.connector.CheckSchema(ctx, registar.Scope(), registar.NamePrefix(), []*dosa.EntityDefinition{reg.EntityDefinition()})
 	if err != nil {
-		return errors.New("CheckSchema failed")
+		return errors.New("schema on the server is incompatible with the code")
 	}
 	reg.SetVersion(version)
 	return nil

cmd/dosa/schema.go

@@ -407,7 +407,7 @@ func (c *SchemaDump) doSchemaDumpInJavaClient() {
 	fmt.Printf("%s", out.String())
 }
 
-// expandDirectory verifies that each argument is actually a directory or
+// expandDirectories verifies that each argument is actually a directory or
 // uses the special go suffix of /... to mean recursively walk from here
 // example: ./... means the current directory and all subdirectories
 func expandDirectories(dirs []string) ([]string, error) {
@@ -422,12 +422,12 @@ func expandDirectories(dirs []string) ([]string, error) {
 				return nil
 			})
 			if err != nil {
-				return nil, err
+				return nil, errors.Wrapf(err, "couldn't walk %q", dir)
 			}
 		} else {
 			info, err := os.Stat(dir)
 			if err != nil {
-				return nil, err
+				return nil, errors.Wrapf(err, "%q does not exist", dir)
 			}
 			if !info.IsDir() {
 				return nil, fmt.Errorf("%q is not a directory", dir)

cmd/dosa/scope.go

@@ -58,7 +58,7 @@ func (c *ScopeCmd) doScopeOp(name string, f func(dosa.AdminClient, context.Conte
 		}
 		fmt.Printf("%s scope %q: OK\n", name, s)
 		if name == "drop" {
-			fmt.Println("\nPlease wait 10 minutes if you are going to re-create the scope with the same name.\n")
+			fmt.Print("\nPlease wait 10 minutes if you are going to re-create the scope with the same name.\n\n")
 		}
 	}
 	return nil

version.go

@@ -21,4 +21,4 @@
 package dosa
 
 // VERSION indicates the dosa client version
-const VERSION = "3.4.9"
+const VERSION = "3.4.10"