fix: change the wording of the logs and add tests

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

pkg/iac/scanners/cloudformation/parser/file_context.go

@@ -62,7 +62,7 @@ func (t *FileContext) overrideParameters(params map[string]any) {
 	}
 }
 
-func (t *FileContext) missingParameters() []string {
+func (t *FileContext) missingParameterValues() []string {
 	var missing []string
 	for key := range t.Parameters {
 		if t.Parameters[key].inner.Default == nil {

pkg/iac/scanners/cloudformation/parser/file_context_test.go

@@ -61,7 +61,7 @@ func TestFileContext_OverrideParameters(t *testing.T) {
 	}
 }
 
-func TestFileContext_MissingParameters(t *testing.T) {
+func TestFileContext_MissingParameterValues(t *testing.T) {
 
 	tests := []struct {
 		name     string
@@ -97,7 +97,7 @@ func TestFileContext_MissingParameters(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := tt.ctx.missingParameters()
+			got := tt.ctx.missingParameterValues()
 			slices.Sort(got)
 			assert.Equal(t, tt.expected, got)
 		})

pkg/iac/scanners/cloudformation/parser/parser.go

@@ -142,8 +142,8 @@ func (p *Parser) ParseFile(ctx context.Context, fsys fs.FS, path string) (fctx *
 
 	fctx.overrideParameters(p.overridedParameters)
 
-	if params := fctx.missingParameters(); len(params) > 0 {
-		p.logger.Warn("Missing parameters", log.FilePath(path), log.String("parameters", strings.Join(params, ", ")))
+	if params := fctx.missingParameterValues(); len(params) > 0 {
+		p.logger.Warn("Missing parameter values", log.FilePath(path), log.String("parameters", strings.Join(params, ", ")))
 	}
 
 	fctx.lines = lines

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

@@ -198,15 +198,11 @@ func (p *Parser) Load(ctx context.Context) (*evaluator, error) {
 		}
 		p.logger.Debug("Added input variables from tfvars", log.Int("count", len(inputVars)))
 
-		for _, varBlock := range blocks.OfType("variable") {
-			if varBlock.GetAttribute("default") == nil {
-				if _, ok := inputVars[varBlock.TypeLabel()]; !ok {
-					p.logger.Warn(
-						"Variable was not found in the environment or variable files. Evaluating may not work correctly.",
-						log.String("variable", varBlock.TypeLabel()),
-					)
-				}
-			}
+		if missingVars := missingVariableValues(blocks, inputVars); len(missingVars) > 0 {
+			p.logger.Warn(
+				"Variable values was not found in the environment or variable files. Evaluating may not work correctly.",
+				log.String("variables", strings.Join(missingVars, ", ")),
+			)
 		}
 	}
 
@@ -245,6 +241,19 @@ func (p *Parser) Load(ctx context.Context) (*evaluator, error) {
 	), nil
 }
 
+func missingVariableValues(blocks terraform.Blocks, inputVars map[string]cty.Value) []string {
+	var missing []string
+	for _, varBlock := range blocks.OfType("variable") {
+		if varBlock.GetAttribute("default") == nil {
+			if _, ok := inputVars[varBlock.TypeLabel()]; !ok {
+				missing = append(missing, varBlock.TypeLabel())
+			}
+		}
+	}
+
+	return missing
+}
+
 func (p *Parser) EvaluateAll(ctx context.Context) (terraform.Modules, cty.Value, error) {
 
 	e, err := p.Load(ctx)

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

@@ -1,7 +1,9 @@
 package parser
 
 import (
+	"bytes"
 	"context"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"sort"
@@ -14,6 +16,7 @@ import (
 
 	"github.com/aquasecurity/trivy/internal/testutil"
 	"github.com/aquasecurity/trivy/pkg/iac/terraform"
+	"github.com/aquasecurity/trivy/pkg/log"
 )
 
 func Test_BasicParsing(t *testing.T) {
@@ -1819,3 +1822,38 @@ resource "something" "blah" {
 	assert.True(t, r2.IsResolvable())
 	assert.Equal(t, "us-east-2", r2.Value().AsString())
 }
+
+func TestLogAboutMissingVariableValues(t *testing.T) {
+	var buf bytes.Buffer
+	slog.SetDefault(slog.New(log.NewHandler(&buf, nil)))
+
+	fsys := fstest.MapFS{
+		"main.tf": &fstest.MapFile{
+			Data: []byte(`
+variable "foo" {}
+
+variable "bar" {
+  default = "bar"
+}
+
+variable "baz" {}
+`),
+		},
+		"main.tfvars": &fstest.MapFile{
+			Data: []byte(`baz = "baz"`),
+		},
+	}
+
+	parser := New(
+		fsys, "",
+		OptionStopOnHCLError(true),
+		OptionWithTFVarsPaths("main.tfvars"),
+	)
+	require.NoError(t, parser.ParseFS(context.TODO(), "."))
+
+	_, err := parser.Load(context.TODO())
+	require.NoError(t, err)
+
+	assert.Contains(t, buf.String(), "Variable values was not found in the environment or variable files.")
+	assert.Contains(t, buf.String(), "variables=\"foo\"")
+}