Add more context to run error

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
       matrix:
         go:
         - 1.15.x
-    name: Go ${{ matrix.go }} build
+    name: Go ${{ matrix.go }} test
     steps:
     - uses: actions/checkout@master
     - name: Setup Go
@@ -33,7 +33,7 @@ jobs:
       matrix:
         go:
         - 1.15.x
-    name: Go ${{ matrix.go }} build
+    name: Go ${{ matrix.go }} lint
     steps:
     - uses: actions/checkout@master
     - name: Setup Go

examples/concurrency/concurrency_test.variant

@@ -33,7 +33,7 @@ test "test" {
 
   case "ng1" {
     concurrency = 0
-    err = "concurrency less than 1 can not be set. If you wanted 0 for a concurrency equals to the number of steps, is isn't a good idea. Some system has a relatively lower fd limit that can make your command fail only when there are too many steps. Always use static number of concurrency"
+    err = "job \"test\": concurrency less than 1 can not be set. If you wanted 0 for a concurrency equals to the number of steps, is isn't a good idea. Some system has a relatively lower fd limit that can make your command fail only when there are too many steps. Always use static number of concurrency"
     stdout = ""
     delayone = 0
     delaytwo = 1

examples/conditional_run/example_test.variant

@@ -37,7 +37,7 @@ test "example" {
     print_foo = false
     print_bar = false
     stdout = ""
-    err = "nothing to run"
+    err = "job \"example\": nothing to run"
     exitstatus = 1
   }
 

examples/simple/simple_test.variant

@@ -9,7 +9,7 @@ test "app deploy" {
     namespace = "foo"
     exitstatus = 1
     err = trimspace(<<EOS
-command "bash -c     kubectl -n foo apply -f examples/simple/manifests/
+job "app deploy": job "shell": command "bash -c     kubectl -n foo apply -f examples/simple/manifests/
 ": exit status 1
 EOS
     )

examples/testing-with-expectations/example_test.variant

@@ -31,11 +31,11 @@ test "example" {
     tenant = "wrongclient"
 
     err = <<EOS
-1 error occurred:
-	* unexpected exec 1: expected args [-c cd account && terraform init && (terraform workspace select client || terraform workspace new client], got [-c cd account && terraform init && (terraform workspace select wrongclient || terraform workspace new wrongclient)]
+job "example": 1 error occurred:
+	* step "init": job "init": unexpected exec 1: expected args [-c cd account && terraform init && (terraform workspace select client || terraform workspace new client], got [-c cd account && terraform init && (terraform workspace select wrongclient || terraform workspace new wrongclient)]
 
     EOS
-    exitstatus = 3
+    exitstatus = 1
 
     expected_exec_1 = "cd account && terraform init && (terraform workspace select client || terraform workspace new client"
     expected_exec_2 = "cd account && terraform destroy -var defaults_config_file=../../defaults.yaml -var tenant_config_file=../../${case.tenant}.yaml -auto-approve"

main_test.go

@@ -39,7 +39,7 @@ func TestExamples(t *testing.T) {
 			variantName: "simple",
 			args:        []string{"variant", "app", "deploy", "--namespace", "ns1"},
 			variantDir:  "./examples/simple",
-			expectErr:   "command \"bash -c     kubectl -n ns1 apply -f examples/simple/manifests/\n\": exit status 1",
+			expectErr:   "job \"shell\": command \"bash -c     kubectl -n ns1 apply -f examples/simple/manifests/\n\": exit status 1",
 		},
 		{
 			variantName: "simple",
@@ -50,7 +50,7 @@ func TestExamples(t *testing.T) {
 			subject:    "variant run app deploy on simple example w/ ns1",
 			args:       []string{"variant", "run", "app", "deploy", "--namespace", "ns1"},
 			variantDir: "./examples/simple",
-			expectErr:  "command \"bash -c     kubectl -n ns1 apply -f examples/simple/manifests/\n\": exit status 1",
+			expectErr:  "job \"shell\": command \"bash -c     kubectl -n ns1 apply -f examples/simple/manifests/\n\": exit status 1",
 		},
 		{
 			subject:    "variant run app deploy on simple example w/ default",

pkg/app/app.go

@@ -54,7 +54,12 @@ func (app *App) Run(cmd string, args map[string]interface{}, opts map[string]int
 		return nil, err
 	}
 
-	return jr()
+	res, err := jr()
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
 }
 
 func (app *App) run(l *EventLogger, cmd string, args map[string]interface{}, streamOutput bool) (*Result, error) {
@@ -66,17 +71,32 @@ func (app *App) run(l *EventLogger, cmd string, args map[string]interface{}, str
 
 	jr, err := app.Job(l, cmd, args, args, nil, streamOutput)
 	if err != nil {
+		if cmd != "" {
+			return nil, xerrors.Errorf("job %q: %w", cmd, err)
+		}
+
+		return nil, err
+	}
+
+	res, err := jr()
+	if err != nil {
+		if cmd != "" {
+			return nil, xerrors.Errorf("job %q: %w", cmd, err)
+		}
+
 		return nil, err
 	}
 
-	return jr()
+	return res, nil
 }
 
 func (app *App) Job(l *EventLogger, cmd string, args map[string]interface{}, opts map[string]interface{}, f SetOptsFunc, streamOutput bool) (func() (*Result, error), error) {
 	jobByName := app.JobByName
 
-	j, ok := jobByName[cmd]
-	if !ok {
+	j, cmdDefined := jobByName[cmd]
+	if !cmdDefined {
+		var ok bool
+
 		j, ok = jobByName[""]
 		if !ok {
 			return nil, fmt.Errorf("command %q not found", cmd)
@@ -212,8 +232,10 @@ func (app *App) Job(l *EventLogger, cmd string, args map[string]interface{}, opt
 				return lastDepRes, nil
 			}
 
-			if err == nil {
-				return nil, fmt.Errorf(NoRunMessage)
+			if err == nil && !cmdDefined {
+				return nil, xerrors.Errorf("job %q is not defined", cmd)
+			} else if err == nil {
+				return nil, errors.New(NoRunMessage)
 			}
 		} else {
 			// The job contained job or step(s).
@@ -602,7 +624,7 @@ func (app *App) execTest(t *testing.T, test Test) *Result {
 			res, err = testApp.execTestCase(test, c)
 			if err != nil {
 				app.PrintError(err)
-				t.Fatalf("%v", err)
+				t.Fatalf("%s: %v", c.SourceLocator.Range(), err)
 			}
 		})
 	}
@@ -967,7 +989,7 @@ func (app *App) execJobSteps(l *EventLogger, jobCtx *JobContext, results map[str
 		f := func() (*Result, error) {
 			res, err := app.runJobAndUpdateContext(l, &stepCtx, eitherJobRun{static: &s.Run}, m, streamOutput)
 			if err != nil {
-				return res, err
+				return res, xerrors.Errorf("step %q: %w", s.Name, err)
 			}
 
 			m.Lock()
@@ -1248,12 +1270,12 @@ func (app *App) createJobContext(cc *HCL2Config, j JobSpec, givenParams map[stri
 
 	globalParams, err := setParameterValues("global parameter", ctx, cc.Parameters, givenParams)
 	if err != nil {
-		return nil, fmt.Errorf("job %q: %w", j.Name, err)
+		return nil, err
 	}
 
 	localParams, err := setParameterValues("parameter", ctx, j.Parameters, givenParams)
 	if err != nil {
-		return nil, fmt.Errorf("job %q: %w", j.Name, err)
+		return nil, err
 	}
 
 	params := map[string]cty.Value{}
@@ -1275,12 +1297,12 @@ func (app *App) createJobContext(cc *HCL2Config, j JobSpec, givenParams map[stri
 
 	globalOpts, err := setOptionValues("global option", ctx, cc.Options, givenOpts, f)
 	if err != nil {
-		return nil, fmt.Errorf("job %q: %w", j.Name, err)
+		return nil, err
 	}
 
 	localOpts, err := setOptionValues("option", ctx, j.Options, givenOpts, f)
 	if err != nil {
-		return nil, fmt.Errorf("job %q: %w", j.Name, err)
+		return nil, err
 	}
 
 	opts := map[string]cty.Value{}
@@ -1410,7 +1432,7 @@ func (app *App) getConfigs(jobCtx *JobContext, cc *HCL2Config, j JobSpec, confTy
 				yamlData, err = ioutil.ReadFile(source.Path)
 				if err != nil {
 					if source.Default == nil {
-						return cty.NilVal, fmt.Errorf("job %q: %s %q: source %d: %w", j.Name, confType, confSpec.Name, sourceIdx, err)
+						return cty.NilVal, fmt.Errorf("%s %q: source %d: %w", confType, confSpec.Name, sourceIdx, err)
 					}
 
 					yamlData = []byte(*source.Default)
@@ -1434,7 +1456,7 @@ func (app *App) getConfigs(jobCtx *JobContext, cc *HCL2Config, j JobSpec, confTy
 
 				res, err := app.run(nil, source.Name, args, false)
 				if err != nil {
-					return cty.NilVal, err
+					return cty.NilVal, xerrors.Errorf("%s %q: source %d: %w", confType, confSpec.Name, sourceIdx, err)
 				}
 
 				yamlData = []byte(res.Stdout)

pkg/app/types.go

@@ -201,6 +201,8 @@ type expectedExec struct {
 }
 
 type Case struct {
+	SourceLocator hcl.Expression `hcl:"__source_locator,attr"`
+
 	Name string `hcl:"name,label"`
 
 	Args map[string]hcl.Expression `hcl:",remain"`