From 24d73a2b6acb1db4cd652abd1691493f35c350a9 Mon Sep 17 00:00:00 2001 From: Tanmay Jain Date: Fri, 20 Jun 2025 14:59:08 +0530 Subject: [PATCH] Fixed Test Cases --- .../types.build.hcp_packer_registry_test.go | 12 +++ hcl2template/types.build_test.go | 82 +++++++++++-------- hcl2template/types.datasource_test.go | 2 + hcl2template/types.packer_config_test.go | 14 ++-- hcl2template/types.source_test.go | 1 + hcl2template/types.variables_test.go | 7 ++ packer/build_test.go | 6 +- 7 files changed, 81 insertions(+), 43 deletions(-) diff --git a/hcl2template/types.build.hcp_packer_registry_test.go b/hcl2template/types.build.hcp_packer_registry_test.go index 5238c08c2..ada7b89b1 100644 --- a/hcl2template/types.build.hcp_packer_registry_test.go +++ b/hcl2template/types.build.hcp_packer_registry_test.go @@ -56,6 +56,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -110,6 +111,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, &packer.CoreBuild{ BuildName: "build2", @@ -119,6 +121,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -173,6 +176,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, &packer.CoreBuild{ BuildName: "build2", @@ -182,6 +186,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -237,6 +242,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, &packer.CoreBuild{ BuildName: "build2", @@ -246,6 +252,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -292,6 +299,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -339,6 +347,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, BuilderType: "virtualbox-iso", + SensitiveVars: []string{}, }, }, false, @@ -399,6 +408,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, BuilderType: "virtualbox-iso", + SensitiveVars: []string{}, }, }, false, @@ -605,6 +615,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, @@ -652,6 +663,7 @@ func Test_ParseHCPPackerRegistryBlock(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, BuilderType: "null", + SensitiveVars: []string{}, }, }, false, diff --git a/hcl2template/types.build_test.go b/hcl2template/types.build_test.go index 5244712e2..497f78cbb 100644 --- a/hcl2template/types.build_test.go +++ b/hcl2template/types.build_test.go @@ -106,7 +106,8 @@ func TestParse_build(t *testing.T) { }, true, true, []*packer.CoreBuild{&packer.CoreBuild{ - Provisioners: []packer.CoreBuildProvisioner{}, + Provisioners: []packer.CoreBuildProvisioner{}, + SensitiveVars: []string{}, }}, false, nil, @@ -148,7 +149,9 @@ func TestParse_build(t *testing.T) { Builds: nil, }, true, true, - []*packer.CoreBuild{&packer.CoreBuild{}}, + []*packer.CoreBuild{&packer.CoreBuild{ + SensitiveVars: []string{}, + }}, false, nil, }, @@ -190,6 +193,7 @@ func TestParse_build(t *testing.T) { true, true, []*packer.CoreBuild{&packer.CoreBuild{ PostProcessors: [][]packer.CoreBuildPostProcessor{}, + SensitiveVars: []string{}, }}, true, nil, @@ -289,11 +293,12 @@ func TestParse_build(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, - Builder: emptyMockBuilder, - Provisioners: []packer.CoreBuildProvisioner{}, + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + Builder: emptyMockBuilder, + Provisioners: []packer.CoreBuildProvisioner{}, + SensitiveVars: []string{}, PostProcessors: [][]packer.CoreBuildPostProcessor{ { { @@ -324,11 +329,12 @@ func TestParse_build(t *testing.T) { }, }, &packer.CoreBuild{ - Type: "amazon-ebs.aws-ubuntu-16.04", - BuilderType: "amazon-ebs", - Prepared: true, - Builder: emptyMockBuilder, - Provisioners: []packer.CoreBuildProvisioner{}, + Type: "amazon-ebs.aws-ubuntu-16.04", + BuilderType: "amazon-ebs", + Prepared: true, + Builder: emptyMockBuilder, + Provisioners: []packer.CoreBuildProvisioner{}, + SensitiveVars: []string{}, PostProcessors: [][]packer.CoreBuildPostProcessor{ { { @@ -407,10 +413,11 @@ func TestParse_build(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, - Builder: emptyMockBuilder, + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + Builder: emptyMockBuilder, + SensitiveVars: []string{}, Provisioners: []packer.CoreBuildProvisioner{ { PType: "shell", @@ -438,10 +445,11 @@ func TestParse_build(t *testing.T) { PostProcessors: [][]packer.CoreBuildPostProcessor{}, }, &packer.CoreBuild{ - Type: "amazon-ebs.aws-ubuntu-16.04", - BuilderType: "amazon-ebs", - Prepared: true, - Builder: emptyMockBuilder, + Type: "amazon-ebs.aws-ubuntu-16.04", + BuilderType: "amazon-ebs", + Prepared: true, + Builder: emptyMockBuilder, + SensitiveVars: []string{}, Provisioners: []packer.CoreBuildProvisioner{ { PType: "file", @@ -499,10 +507,11 @@ func TestParse_build(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, - Builder: emptyMockBuilder, + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + Builder: emptyMockBuilder, + SensitiveVars: []string{}, Provisioners: []packer.CoreBuildProvisioner{ { PType: "shell", @@ -570,6 +579,7 @@ func TestParse_build(t *testing.T) { Builder: emptyMockBuilder, Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, + SensitiveVars: []string{}, }, }, false, @@ -620,12 +630,13 @@ func TestParse_build(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - BuildName: "test-build", - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, - Builder: emptyMockBuilder, - Provisioners: []packer.CoreBuildProvisioner{}, + BuildName: "test-build", + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + Builder: emptyMockBuilder, + Provisioners: []packer.CoreBuildProvisioner{}, + SensitiveVars: []string{}, PostProcessors: [][]packer.CoreBuildPostProcessor{ { { @@ -679,11 +690,12 @@ func TestParse_build(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - BuildName: "build-name-test", - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, - Builder: emptyMockBuilder, + BuildName: "build-name-test", + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + Builder: emptyMockBuilder, + SensitiveVars: []string{}, Provisioners: []packer.CoreBuildProvisioner{ { PName: "build-name-test", diff --git a/hcl2template/types.datasource_test.go b/hcl2template/types.datasource_test.go index d0125974d..e066a8f32 100644 --- a/hcl2template/types.datasource_test.go +++ b/hcl2template/types.datasource_test.go @@ -61,6 +61,7 @@ func TestParse_datasource(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, @@ -150,6 +151,7 @@ func TestParse_datasource(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index 566581201..6d62ab0da 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -206,9 +206,10 @@ func TestParser_complete(t *testing.T) { false, false, []*packer.CoreBuild{ &packer.CoreBuild{ - Type: "virtualbox-iso.ubuntu-1204", - BuilderType: "virtualbox-iso", - Prepared: true, + Type: "virtualbox-iso.ubuntu-1204", + BuilderType: "virtualbox-iso", + Prepared: true, + SensitiveVars: []string{}, Builder: &MockBuilder{ Config: MockConfig{ NestedMockConfig: NestedMockConfig{ @@ -318,9 +319,10 @@ func TestParser_complete(t *testing.T) { }, }, &packer.CoreBuild{ - Type: "amazon-ebs.ubuntu-1604", - BuilderType: "amazon-ebs", - Prepared: true, + Type: "amazon-ebs.ubuntu-1604", + BuilderType: "amazon-ebs", + Prepared: true, + SensitiveVars: []string{}, Builder: &MockBuilder{ Config: MockConfig{ NestedMockConfig: NestedMockConfig{ diff --git a/hcl2template/types.source_test.go b/hcl2template/types.source_test.go index 5acf15638..15e1d2b3a 100644 --- a/hcl2template/types.source_test.go +++ b/hcl2template/types.source_test.go @@ -59,6 +59,7 @@ func TestParse_source(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index 07fb8c2a5..30fb457ae 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -133,6 +133,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{"super_secret_password"}, }, }, false, @@ -305,6 +306,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, @@ -393,6 +395,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, @@ -459,6 +462,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, @@ -502,6 +506,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, @@ -594,6 +599,7 @@ func TestParse_variables(t *testing.T) { }, }, PostProcessors: [][]packer.CoreBuildPostProcessor{}, + SensitiveVars: []string{}, }, }, false, @@ -651,6 +657,7 @@ func TestParse_variables(t *testing.T) { Provisioners: []packer.CoreBuildProvisioner{}, PostProcessors: [][]packer.CoreBuildPostProcessor{}, Prepared: true, + SensitiveVars: []string{}, }, }, false, diff --git a/packer/build_test.go b/packer/build_test.go index c15eec5b5..9f572101d 100644 --- a/packer/build_test.go +++ b/packer/build_test.go @@ -39,8 +39,9 @@ func testBuild() *CoreBuild { {&MockPostProcessor{ArtifactId: "pp"}, "testPP", "testPPName", cty.Value{}, make(map[string]interface{}), boolPointer(true)}, }, }, - Variables: make(map[string]string), - onError: "cleanup", + Variables: make(map[string]string), + onError: "cleanup", + SensitiveVars: []string{"sensitive_var"}, } } @@ -54,6 +55,7 @@ func testDefaultPackerConfig() map[string]interface{} { common.OnErrorConfigKey: "cleanup", common.TemplatePathKey: "", common.UserVariablesConfigKey: make(map[string]string), + common.SensitiveVarsConfigKey: []string{"sensitive_var"}, } } func TestBuild_Name(t *testing.T) {