Add test changes too

GoogleCloudPlatform · Dec 22, 2022 · 4d35b65 · 4d35b65
1 parent 7fc6927
commit 4d35b65
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/mmv1/third_party/terraform/tests/resource_os_config_os_policy_assignment_test.go.erb b/mmv1/third_party/terraform/tests/resource_os_config_os_policy_assignment_test.go.erb
@@ -13,15 +13,15 @@ import (
 	"testing"
 )
 
-func TestAccOsConfigOsPolicyAssignment_PercentOsPolicyAssignment(t *testing.T) {
-	// Tests fail due to long rollout times
-	skipIfVcr(t)
+func TestAccOsConfigOsPolicyAssignment_basicOsPolicyAssignment(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
 		"project_name":  getTestProjectFromEnv(),
 		"zone":          getTestZoneFromEnv(),
 		"random_suffix": randString(t, 10),
+		"org_id":        getTestOrgFromEnv(t),
+		"billing_act":   getTestBillingAccountFromEnv(t),
 	}
 
 	vcrTest(t, resource.TestCase{
@@ -44,6 +44,24 @@ func TestAccOsConfigOsPolicyAssignment_PercentOsPolicyAssignment(t *testing.T) {
 
 func testAccOsConfigOsPolicyAssignment_PercentOsPolicyAssignment(context map[string]interface{}) string {
 	return Nprintf(`
+resource "google_project" "project" {
+  project_id      = "tf-test%{random_suffix}"
+  name            = "tf-test%{random_suffix}"
+  org_id          = "%{org_id}"
+  billing_account = "%{billing_act}"
+}
+
+resource "google_project_service" "compute" {
+  project = google_project.project.project_id
+  service = "compute.googleapis.com"
+}
+
+resource "google_project_service" "osconfig" {
+  project = google_project.project.project_id
+  service = "osconfig.googleapis.com"
+  depends_on = [google_project_service.compute]
+}
+
 resource "google_os_config_os_policy_assignment" "primary" {
   instance_filter {
     all = false
@@ -63,7 +81,7 @@ resource "google_os_config_os_policy_assignment" "primary" {
     }
   }
 
-  location = "europe-west1-a"
+  location = "%{zone}"
   name     = "tf-test-assignment%{random_suffix}"
 
   os_policies {
@@ -96,7 +114,8 @@ resource "google_os_config_os_policy_assignment" "primary" {
   }
 
   description = "A test os policy assignment"
-  project     = "%{project_name}"
+  project     = google_project.project.project_id
+  depends_on = [google_project_service.compute, google_project_service.osconfig]
 }