clean up err message; unexport

Author: denik

acceptance/bundle/state/bad_env/output.txt

@@ -1,17 +1,17 @@
 
 >>> musterr [CLI] bundle plan
-Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct' or absent/empty which means 'terraform')
+Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct')
 
 >>> musterr [CLI] bundle deploy
-Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct' or absent/empty which means 'terraform')
+Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct')
 
 >>> musterr [CLI] bundle summary
-Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct' or absent/empty which means 'terraform')
+Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct')
 
 >>> musterr [CLI] bundle destroy --auto-approve
-Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct' or absent/empty which means 'terraform')
+Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct')
 
 >>> musterr [CLI] bundle validate
-Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct' or absent/empty which means 'terraform')
+Error: unexpected setting for DATABRICKS_BUNDLE_ENGINE="abc" (expected 'terraform' or 'direct')
 
 Found 1 error

bundle/config/engine/engine.go

@@ -39,7 +39,7 @@ func FromEnv(ctx context.Context) (EngineType, error) {
 	value := env.Get(ctx, EnvVar)
 	engine, ok := Parse(value)
 	if !ok {
-		return EngineNotSet, fmt.Errorf("unexpected setting for %s=%#v (expected 'terraform' or 'direct' or absent/empty which means 'terraform')", EnvVar, value)
+		return EngineNotSet, fmt.Errorf("unexpected setting for %s=%#v (expected 'terraform' or 'direct')", EnvVar, value)
 	}
 	return engine, nil
 }

bundle/direct/bundle_plan.go

@@ -47,7 +47,7 @@ func (b *DeploymentBundle) CalculatePlan(ctx context.Context, client *databricks
 		return nil, err
 	}
 
-	plan, err := b.MakePlan(ctx, configRoot, &b.StateDB.Data)
+	plan, err := b.makePlan(ctx, configRoot, &b.StateDB.Data)
 	if err != nil {
 		return nil, fmt.Errorf("reading config: %w", err)
 	}
@@ -415,7 +415,7 @@ func (b *DeploymentBundle) resolveReferences(ctx context.Context, entry *deployp
 	return true
 }
 
-func (b *DeploymentBundle) MakePlan(ctx context.Context, configRoot *config.Root, db *dstate.Database) (*deployplan.Plan, error) {
+func (b *DeploymentBundle) makePlan(ctx context.Context, configRoot *config.Root, db *dstate.Database) (*deployplan.Plan, error) {
 	p := deployplan.NewPlan()
 
 	// Collect and sort nodes first, because MapByPattern gives them in randomized order