return diags as err

Author: dsa0x

internal/backend/local/test.go

@@ -468,12 +468,8 @@ func (runner *TestFileRunner) run(run *moduletest.Run, file *moduletest.File, st
 		return
 	}
 
-	references, referenceDiags := run.GetReferences()
-	run.Diagnostics = run.Diagnostics.Append(referenceDiags)
-	if referenceDiags.HasErrors() {
-		run.Status = moduletest.Error
-		return
-	}
+	// already validated during static analysis
+	references, _ := run.GetReferences()
 
 	variables, variableDiags := runner.GetVariables(run, references, true)
 	run.Diagnostics = run.Diagnostics.Append(variableDiags)

internal/moduletest/graph/transform_test_run.go

@@ -33,7 +33,7 @@ func (t *TestRunTransformer) Transform(g *terraform.Graph) error {
 
 	// Connect nodes based on dependencies
 	if diags := t.connectDependencies(g, nodes); diags.HasErrors() {
-		return tfdiags.NonFatalError{Diagnostics: diags}
+		return tfdiags.DiagnosticsAsError{Diagnostics: diags}
 	}
 
 	// Runs with the same state key inherently depend on each other, so we

internal/tfdiags/diagnostics.go

@@ -57,7 +57,7 @@ func (diags Diagnostics) Append(new ...interface{}) Diagnostics {
 			diags = append(diags, ti)
 		case Diagnostics:
 			diags = append(diags, ti...) // flatten
-		case diagnosticsAsError:
+		case DiagnosticsAsError:
 			diags = diags.Append(ti.Diagnostics) // unwrap
 		case NonFatalError:
 			diags = diags.Append(ti.Diagnostics) // unwrap
@@ -111,7 +111,7 @@ func diagnosticsForError(err error) []Diagnostic {
 
 	// If we've wrapped a Diagnostics in an error then we'll unwrap
 	// it and add it directly.
-	var asErr diagnosticsAsError
+	var asErr DiagnosticsAsError
 	if errors.As(err, &asErr) {
 		return asErr.Diagnostics
 	}
@@ -206,7 +206,7 @@ func (diags Diagnostics) Err() error {
 	if !diags.HasErrors() {
 		return nil
 	}
-	return diagnosticsAsError{diags}
+	return DiagnosticsAsError{diags}
 }
 
 // ErrWithWarnings is similar to Err except that it will also return a non-nil
@@ -257,11 +257,12 @@ func (diags Diagnostics) Sort() {
 	sort.Stable(sortDiagnostics(diags))
 }
 
-type diagnosticsAsError struct {
+// DiagnosticsAsError embeds diagnostics, and satisfies the error interface.
+type DiagnosticsAsError struct {
 	Diagnostics
 }
 
-func (dae diagnosticsAsError) Error() string {
+func (dae DiagnosticsAsError) Error() string {
 	diags := dae.Diagnostics
 	switch {
 	case len(diags) == 0:
@@ -291,7 +292,7 @@ func (dae diagnosticsAsError) Error() string {
 
 // WrappedErrors is an implementation of errwrap.Wrapper so that an error-wrapped
 // diagnostics object can be picked apart by errwrap-aware code.
-func (dae diagnosticsAsError) WrappedErrors() []error {
+func (dae DiagnosticsAsError) WrappedErrors() []error {
 	var errs []error
 	for _, diag := range dae.Diagnostics {
 		if wrapper, isErr := diag.(nativeError); isErr {