fix: VPC Flow Logs constraint issue + Adding gcloud terraform vet usage to test (#779)

mauro-cit · web-flow · commit 0019b006da53 · 2022-09-02T11:38:35.000-05:00
* Adding new strategy to deal with both flowlogs parameters

* Adding line that insert terraform vet test setup

* changing from relative to absolute path for policy libraries folder

* Adding the PL setup to testable object

* Removing back the terrafor vet usage

* removing terraform vet

* Adding gcloud beta terraform vet to tests

* Adding project parameter to policyLibrary test definition + Bumping cft version
diff --git a/policy-library/policies/templates/gcp_network_enable_flow_logs_v1.yaml b/policy-library/policies/templates/gcp_network_enable_flow_logs_v1.yaml
@@ -59,8 +59,12 @@ spec:
         	asset.asset_type == "compute.googleapis.com/Subnetwork"
 
         	network := asset.resource.data
-        	enable_flow_logs := lib.get_default(network, "enableFlowLogs", false)
-        	enable_flow_logs == false
+        	legacy_enable_flow_logs := lib.get_default(network, "enableFlowLogs", false)
+        	log_config := lib.get_default(network, "logConfig", {})
+        	log_config_enable_flow_logs := lib.get_default(log_config, "enable", false)
+
+        	log_config_enable_flow_logs != true
+        	legacy_enable_flow_logs != true
 
         	message := sprintf("Flow logs are disabled in subnetwork %v.", [asset.name])
         	metadata := {"resource": asset.name}
diff --git a/test/integration/app-infra/app_infra_test.go b/test/integration/app-infra/app_infra_test.go
@@ -43,6 +43,7 @@ func TestAppInfra(t *testing.T) {
 
 			appInfra := tft.NewTFBlueprintTest(t,
 				tft.WithTFDir(fmt.Sprintf("../../../5-app-infra/business_unit_1/%s", envName)),
+				tft.WithPolicyLibraryPath("/workspace/policy-library", projects.GetStringOutput("base_shared_vpc_project")),
 				tft.WithVars(vars),
 			)
 
diff --git a/test/integration/bootstrap/bootstrap_test.go b/test/integration/bootstrap/bootstrap_test.go
@@ -50,9 +50,14 @@ func TestBootstrap(t *testing.T) {
 		"bucket_force_destroy": true,
 	}
 
+	temp := tft.NewTFBlueprintTest(t,
+		tft.WithTFDir("../../../0-bootstrap"),
+	)
+
 	bootstrap := tft.NewTFBlueprintTest(t,
 		tft.WithTFDir("../../../0-bootstrap"),
 		tft.WithVars(vars),
+		tft.WithPolicyLibraryPath("/workspace/policy-library", temp.GetTFSetupStringOutput("project_id")),
 	)
 
 	cloudSourceRepos := []string{
diff --git a/test/integration/envs/envs_test.go b/test/integration/envs/envs_test.go
@@ -56,6 +56,7 @@ func TestEnvs(t *testing.T) {
 		t.Run(envName, func(t *testing.T) {
 			envs := tft.NewTFBlueprintTest(t,
 				tft.WithTFDir(fmt.Sprintf("../../../2-environments/envs/%s", envName)),
+				tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 				tft.WithVars(vars),
 				tft.WithBackendConfig(backendConfig),
 			)
diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-example-foundation/test/int
 go 1.17
 
 require (
-	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.1.1-0.20220802155302-a13ee7fb1c62
+	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.2.1-0.20220822233358-4e9b833071f9
 	github.com/gruntwork-io/terratest v0.40.7
 	github.com/stretchr/testify v1.7.1
 	github.com/tidwall/gjson v1.12.1
diff --git a/test/integration/go.sum b/test/integration/go.sum
@@ -65,8 +65,8 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.1.1-0.20220802155302-a13ee7fb1c62 h1:uDiVwwTc7caRf6k2+MBKf3Ia+Z9nWu9diaJQUN3oGdA=
-github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.1.1-0.20220802155302-a13ee7fb1c62/go.mod h1:E655Ka0BfIYALBmqU9ZbemLk/nutxw4vU6wkLEjshSA=
+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.2.1-0.20220822233358-4e9b833071f9 h1:sU9+r4cUupqDkfcWYjMRAf/fTFx7bQWUrO/aCMWNwko=
+github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.2.1-0.20220822233358-4e9b833071f9/go.mod h1:E655Ka0BfIYALBmqU9ZbemLk/nutxw4vU6wkLEjshSA=
 github.com/GoogleContainerTools/kpt-functions-sdk/go v0.0.0-20220301220754-6964a09d6cd2/go.mod h1:lJYiqfBOl6AOiefK9kmkhinbffIysu+nnclOBwKEPlQ=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
diff --git a/test/integration/networks/networks_test.go b/test/integration/networks/networks_test.go
@@ -145,6 +145,7 @@ func TestNetworks(t *testing.T) {
 			networks := tft.NewTFBlueprintTest(t,
 				tft.WithTFDir(fmt.Sprintf(tfdDir, envName)),
 				tft.WithVars(vars),
+				tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 				tft.WithBackendConfig(backendConfig),
 			)
 			networks.DefineVerify(
diff --git a/test/integration/org/org_test.go b/test/integration/org/org_test.go
@@ -56,6 +56,7 @@ func TestOrg(t *testing.T) {
 	org := tft.NewTFBlueprintTest(t,
 		tft.WithTFDir("../../../1-org/envs/shared"),
 		tft.WithVars(vars),
+		tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 		tft.WithBackendConfig(backendConfig),
 	)
 
diff --git a/test/integration/projects-shared/projects_shared_test.go b/test/integration/projects-shared/projects_shared_test.go
@@ -71,6 +71,7 @@ func TestProjectsShared(t *testing.T) {
 				tft.WithTFDir(tts.tfDir),
 				tft.WithVars(sharedVars),
 				tft.WithBackendConfig(backendConfig),
+				tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 			)
 
 			shared.DefineVerify(
diff --git a/test/integration/projects/projects_test.go b/test/integration/projects/projects_test.go
@@ -141,6 +141,7 @@ func TestProjects(t *testing.T) {
 				tft.WithTFDir(fmt.Sprintf(tt.baseDir, env)),
 				tft.WithVars(vars),
 				tft.WithBackendConfig(backendConfig),
+				tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 			)
 
 			projects.DefineVerify(
diff --git a/test/integration/shared/shared_test.go b/test/integration/shared/shared_test.go
@@ -72,6 +72,7 @@ func TestShared(t *testing.T) {
 	shared := tft.NewTFBlueprintTest(t,
 		tft.WithTFDir(tfdDir),
 		tft.WithVars(vars),
+		tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),
 		tft.WithBackendConfig(backendConfig),
 	)
 	shared.DefineVerify(

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ func TestAppInfra(t *testing.T) {`
`43`	`43`
`44`	`44`	`appInfra := tft.NewTFBlueprintTest(t,`
`45`	`45`	`tft.WithTFDir(fmt.Sprintf("../../../5-app-infra/business_unit_1/%s", envName)),`
	`46`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", projects.GetStringOutput("base_shared_vpc_project")),`
`46`	`47`	`tft.WithVars(vars),`
`47`	`48`	`)`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,14 @@ func TestBootstrap(t *testing.T) {`
`50`	`50`	`"bucket_force_destroy": true,`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ temp := tft.NewTFBlueprintTest(t,`
	`54`	`+ tft.WithTFDir("../../../0-bootstrap"),`
	`55`	`+ )`
	`56`	`+`
`53`	`57`	`bootstrap := tft.NewTFBlueprintTest(t,`
`54`	`58`	`tft.WithTFDir("../../../0-bootstrap"),`
`55`	`59`	`tft.WithVars(vars),`
	`60`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", temp.GetTFSetupStringOutput("project_id")),`
`56`	`61`	`)`
`57`	`62`
`58`	`63`	`cloudSourceRepos := []string{`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ func TestEnvs(t *testing.T) {`
`56`	`56`	`t.Run(envName, func(t *testing.T) {`
`57`	`57`	`envs := tft.NewTFBlueprintTest(t,`
`58`	`58`	`tft.WithTFDir(fmt.Sprintf("../../../2-environments/envs/%s", envName)),`
	`59`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`59`	`60`	`tft.WithVars(vars),`
`60`	`61`	`tft.WithBackendConfig(backendConfig),`
`61`	`62`	`)`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ func TestNetworks(t *testing.T) {`
`145`	`145`	`networks := tft.NewTFBlueprintTest(t,`
`146`	`146`	`tft.WithTFDir(fmt.Sprintf(tfdDir, envName)),`
`147`	`147`	`tft.WithVars(vars),`
	`148`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`148`	`149`	`tft.WithBackendConfig(backendConfig),`
`149`	`150`	`)`
`150`	`151`	`networks.DefineVerify(`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ func TestOrg(t *testing.T) {`
`56`	`56`	`org := tft.NewTFBlueprintTest(t,`
`57`	`57`	`tft.WithTFDir("../../../1-org/envs/shared"),`
`58`	`58`	`tft.WithVars(vars),`
	`59`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`59`	`60`	`tft.WithBackendConfig(backendConfig),`
`60`	`61`	`)`
`61`	`62`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func TestProjectsShared(t *testing.T) {`
`71`	`71`	`tft.WithTFDir(tts.tfDir),`
`72`	`72`	`tft.WithVars(sharedVars),`
`73`	`73`	`tft.WithBackendConfig(backendConfig),`
	`74`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`74`	`75`	`)`
`75`	`76`
`76`	`77`	`shared.DefineVerify(`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ func TestProjects(t *testing.T) {`
`141`	`141`	`tft.WithTFDir(fmt.Sprintf(tt.baseDir, env)),`
`142`	`142`	`tft.WithVars(vars),`
`143`	`143`	`tft.WithBackendConfig(backendConfig),`
	`144`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`144`	`145`	`)`
`145`	`146`
`146`	`147`	`projects.DefineVerify(`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ func TestShared(t *testing.T) {`
`72`	`72`	`shared := tft.NewTFBlueprintTest(t,`
`73`	`73`	`tft.WithTFDir(tfdDir),`
`74`	`74`	`tft.WithVars(vars),`
	`75`	`+ tft.WithPolicyLibraryPath("/workspace/policy-library", bootstrap.GetTFSetupStringOutput("project_id")),`
`75`	`76`	`tft.WithBackendConfig(backendConfig),`
`76`	`77`	`)`
`77`	`78`	`shared.DefineVerify(`