refactor(misconf): remove module outputs from parser.EvaluateAll (#8587)

Signed-off-by: nikpivkin <[email protected]>

Author: nikpivkin

pkg/iac/adapters/terraform/tftestutil/testutil.go

@@ -3,6 +3,8 @@ package tftestutil
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/scanners/terraform/parser"
 	"github.com/aquasecurity/trivy/pkg/iac/terraform"
@@ -13,12 +15,8 @@ func CreateModulesFromSource(t *testing.T, source, ext string) terraform.Modules
 		"source" + ext: source,
 	})
 	p := parser.New(fs, "", parser.OptionStopOnHCLError(true))
-	if err := p.ParseFS(t.Context(), "."); err != nil {
-		t.Fatal(err)
-	}
-	modules, _, err := p.EvaluateAll(t.Context())
-	if err != nil {
-		t.Fatalf("parse error: %s", err)
-	}
+	require.NoError(t, p.ParseFS(t.Context(), "."))
+	modules, err := p.EvaluateAll(t.Context())
+	require.NoError(t, err)
 	return modules
 }

pkg/iac/scanners/terraform/parser/parser.go

@@ -357,19 +357,18 @@ func inputVariableType(b *terraform.Block) cty.Type {
 	return ty
 }
 
-func (p *Parser) EvaluateAll(ctx context.Context) (terraform.Modules, cty.Value, error) {
-
+func (p *Parser) EvaluateAll(ctx context.Context) (terraform.Modules, error) {
 	e, err := p.Load(ctx)
 	if errors.Is(err, ErrNoFiles) {
-		return nil, cty.NilVal, nil
+		return nil, nil
 	} else if err != nil {
-		return nil, cty.NilVal, err
+		return nil, err
 	}
 
 	modules, fsMap := e.EvaluateAll(ctx)
 	p.logger.Debug("Finished parsing module")
 	p.fsMap = fsMap
-	return modules, e.exportOutputs(), nil
+	return modules, nil
 }
 
 func (p *Parser) GetFilesystemMap() map[string]fs.FS {

pkg/iac/scanners/terraform/parser/parser_integration_test.go

@@ -24,7 +24,7 @@ module "registry" {
 	parser := New(fsys, "", OptionStopOnHCLError(true), OptionWithSkipCachedModules(true))
 	require.NoError(t, parser.ParseFS(t.Context(), "code"))
 
-	modules, _, err := parser.EvaluateAll(t.Context())
+	modules, err := parser.EvaluateAll(t.Context())
 	require.NoError(t, err)
 	require.Len(t, modules, 2)
 }
@@ -45,7 +45,7 @@ module "registry" {
 	parser := New(fsys, "", OptionStopOnHCLError(true), OptionWithSkipCachedModules(true))
 	require.NoError(t, parser.ParseFS(t.Context(), "code"))
 
-	modules, _, err := parser.EvaluateAll(t.Context())
+	modules, err := parser.EvaluateAll(t.Context())
 	require.NoError(t, err)
 	require.Len(t, modules, 2)
 }
@@ -68,7 +68,7 @@ module "registry" {
 	parser := New(fsys, "", OptionStopOnHCLError(true), OptionWithSkipCachedModules(true))
 	require.NoError(t, parser.ParseFS(t.Context(), "code"))
 
-	modules, _, err := parser.EvaluateAll(t.Context())
+	modules, err := parser.EvaluateAll(t.Context())
 	require.NoError(t, err)
 	require.Len(t, modules, 2)
 }
@@ -89,7 +89,7 @@ module "object" {
 	parser := New(fsys, "", OptionStopOnHCLError(true), OptionWithSkipCachedModules(true))
 	require.NoError(t, parser.ParseFS(t.Context(), "code"))
 
-	modules, _, err := parser.EvaluateAll(t.Context())
+	modules, err := parser.EvaluateAll(t.Context())
 	require.NoError(t, err)
 	require.Len(t, modules, 2)
 }