Test and provider beta fixes

GoogleCloudPlatform · Jan 16, 2025 · 636794b · 636794b
1 parent 9f37115
commit 636794b
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 24 deletions.
diff --git a/mmv1/products/compute/FirewallPolicyRule.yaml b/mmv1/products/compute/FirewallPolicyRule.yaml
@@ -59,6 +59,8 @@ examples:
       folder: 'folder'
       fw_policy: 'fw-policy'
       network: 'network'
+    test_env_vars:
+      org_id: 'ORG_ID'
 parameters:
   - name: 'firewallPolicy'
     type: ResourceRef

diff --git a/mmv1/templates/terraform/examples/compute_firewall_policy_with_rules_full.tf.tmpl b/mmv1/templates/terraform/examples/compute_firewall_policy_with_rules_full.tf.tmpl
@@ -3,10 +3,10 @@ data "google_project" "project" {
 }
 
 resource "google_compute_firewall_policy_with_rules" "{{$.PrimaryResourceId}}" {
+  provider    = google-beta
   short_name  = "{{index $.Vars "fw_policy"}}"
   description = "Terraform test"
   parent      = "organizations/{{index $.TestEnvVars "org_id"}}"
-  provider    = google-beta
 
   rule {
     description      = "tcp rule"
@@ -50,6 +50,7 @@ resource "google_compute_firewall_policy_with_rules" "{{$.PrimaryResourceId}}" {
       }
     }
   }
+
   rule {
     description             = "security profile group rule"
     rule_name               = "tcp rule"
@@ -136,6 +137,7 @@ resource "google_network_security_security_profile" "security_profile_1" {
 }
 
 resource "google_compute_network" "network" {
+  provider                = google-beta
   name                    = "{{index $.Vars "network"}}"
   auto_create_subnetworks = false
 }
diff --git a/mmv1/templates/terraform/examples/compute_network_firewall_policy_with_rules_full.tf.tmpl b/mmv1/templates/terraform/examples/compute_network_firewall_policy_with_rules_full.tf.tmpl
@@ -3,9 +3,9 @@ data "google_project" "project" {
 }
 
 resource "google_compute_network_firewall_policy_with_rules" "{{$.PrimaryResourceId}}" {
+  provider = google-beta
   name = "{{index $.Vars "fw_policy"}}"
   description = "Terraform test"
-  provider = google-beta
 
   rule {
     description    = "tcp rule"
@@ -163,6 +163,7 @@ resource "google_network_security_security_profile" "security_profile_1" {
 }
 
 resource "google_compute_network" "network" {
+  provider                = google-beta
   name                    = "{{index $.Vars "network"}}"
   auto_create_subnetworks = false
 }
diff --git a/...mplates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl b/...mplates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl
@@ -3,10 +3,10 @@ data "google_project" "project" {
 }
 
 resource "google_compute_region_network_firewall_policy_with_rules" "{{$.PrimaryResourceId}}" {
+  provider    = google-beta
   name        = "{{index $.Vars "fw_policy"}}"
   region      = "us-west2"
   description = "Terraform test"
-  provider    = google-beta 
 
   rule {
     description    = "tcp rule"
@@ -100,7 +100,7 @@ resource "google_compute_region_network_firewall_policy_with_rules" "{{$.Primary
 }
 
 resource "google_network_security_address_group" "address_group_1" {
-  provider  = google-beta 
+  provider    = google-beta 
   name        = "{{index $.Vars "address_group"}}"
   parent      = data.google_project.project.id
   description = "Regional address group"
@@ -129,6 +129,7 @@ resource "google_tags_tag_value" "secure_tag_value_1" {
 }
 
 resource "google_compute_network" "network" {
+  provider                = google-beta
   name                    = "{{index $.Vars "network"}}"
   auto_create_subnetworks = false
 }
diff --git a/mmv1/templates/terraform/examples/firewall_policy_rule_network_scope.tf.tmpl b/mmv1/templates/terraform/examples/firewall_policy_rule_network_scope.tf.tmpl
@@ -1,16 +1,23 @@
+data "google_project" "project" {
+  provider = google-beta
+}
+
 resource "google_folder" "folder" {
+  provider            = google-beta
   display_name        = "{{index $.Vars "folder"}}"
   parent              = "organizations/{{index $.TestEnvVars "org_id"}}"
   deletion_protection = false
 }
 
 resource "google_compute_firewall_policy" "default" {
+  provider    = google-beta
   parent      = google_folder.folder.id
   short_name  = "{{index $.Vars "fw_policy"}}"
   description = "Firewall policy"
 }
 
 resource "google_compute_firewall_policy_rule" "{{$.PrimaryResourceId}}" {
+  provider        = google-beta
   firewall_policy = google_compute_firewall_policy.default.name
   description     = "Firewall policy rule with network scope"
   priority        = 9000
@@ -36,6 +43,7 @@ resource "google_compute_firewall_policy_rule" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_compute_network" "network" {
+  provider                = google-beta
   name                    = "{{index $.Vars "network"}}"
   auto_create_subnetworks = false
-}
+}
diff --git a/mmv1/templates/terraform/examples/network_firewall_policy_rule_network_scope.tf.tmpl b/mmv1/templates/terraform/examples/network_firewall_policy_rule_network_scope.tf.tmpl
@@ -1,18 +1,24 @@
+data "google_project" "project" {
+  provider = google-beta
+}
+
 resource "google_compute_network_firewall_policy" "basic_network_firewall_policy" {
+  provider    = google-beta
   name        = "{{index $.Vars "fw_policy"}}"
   description = "Sample global network firewall policy"
   project     = "{{index $.TestEnvVars "project_name"}}"
 }
 
 resource "google_compute_network_firewall_policy_rule" "{{$.PrimaryResourceId}}" {
-  action                  = "allow"
-  description             = "This is a simple rule description"
-  direction               = "INGRESS"
-  disabled                = false
-  enable_logging          = true
-  firewall_policy         = google_compute_network_firewall_policy.basic_network_firewall_policy.name
-  priority                = 1000
-  rule_name               = "test-rule"
+  provider        = google-beta
+  action          = "allow"
+  description     = "This is a simple rule description"
+  direction       = "INGRESS"
+  disabled        = false
+  enable_logging  = true
+  firewall_policy = google_compute_network_firewall_policy.basic_network_firewall_policy.name
+  priority        = 1000
+  rule_name       = "test-rule"
 
   match {
     src_ip_ranges     = ["11.100.0.1/32"]
@@ -26,5 +32,6 @@ resource "google_compute_network_firewall_policy_rule" "{{$.PrimaryResourceId}}"
 }
 
 resource "google_compute_network" "network" {
-  name = "{{index $.Vars "network"}}"
+  provider = google-beta
+  name     = "{{index $.Vars "network"}}"
 }
diff --git a/mmv1/templates/terraform/examples/region_network_firewall_policy_rule_network_scope.tf.tmpl b/mmv1/templates/terraform/examples/region_network_firewall_policy_rule_network_scope.tf.tmpl
@@ -1,20 +1,26 @@
+data "google_project" "project" {
+  provider = google-beta
+}
+
 resource "google_compute_region_network_firewall_policy" "basic_regional_network_firewall_policy" {
+  provider    = google-beta
   name        = "{{index $.Vars "fw_policy"}}"
   description = "Sample regional network firewall policy"
   project     = "{{index $.TestEnvVars "project_name"}}"
   region      = "{{index $.TestEnvVars "region"}}"
 }
 
 resource "google_compute_region_network_firewall_policy_rule" "{{$.PrimaryResourceId}}" {
-  action                  = "allow"
-  description             = "This is a simple rule description"
-  direction               = "INGRESS"
-  disabled                = false
-  enable_logging          = true
-  firewall_policy         = google_compute_region_network_firewall_policy.basic_regional_network_firewall_policy.name
-  priority                = 1000
-  region                  = "{{index $.TestEnvVars "region"}}"
-  rule_name               = "test-rule"
+  provider        = google-beta
+  action          = "allow"
+  description     = "This is a simple rule description"
+  direction       = "INGRESS"
+  disabled        = false
+  enable_logging  = true
+  firewall_policy = google_compute_region_network_firewall_policy.basic_regional_network_firewall_policy.name
+  priority        = 1000
+  region          = "{{index $.TestEnvVars "region"}}"
+  rule_name       = "test-rule"
 
   match {
     src_ip_ranges = ["10.100.0.1/32"]
@@ -27,5 +33,6 @@ resource "google_compute_region_network_firewall_policy_rule" "{{$.PrimaryResour
 }
 
 resource "google_compute_network" "network" {
-  name = "{{index $.Vars "network"}}"
+  provider = google-beta
+  name     = "{{index $.Vars "network"}}"
 }