diff --git a/network_security/intercept/basic/consumer/main.tf b/network_security/intercept/basic/consumer/main.tf index cc16d63c0..2b0518c53 100644 --- a/network_security/intercept/basic/consumer/main.tf +++ b/network_security/intercept/basic/consumer/main.tf @@ -14,27 +14,22 @@ * limitations under the License. */ -data "google_project" "default" { - provider = google-beta -} +data "google_project" "default" {} # In case the project is in a folder, extract the organization ID from it. data "google_folder" "default" { - provider = google-beta count = data.google_project.default.folder_id != "" ? 1 : 0 folder = data.google_project.default.folder_id lookup_organization = true } data "google_organization" "default" { - provider = google-beta organization = data.google_project.default.org_id != "" ? data.google_project.default.org_id : data.google_folder.default[0].organization } # [START networksecurity_intercept_basic_consumer] # [START networksecurity_intercept_create_producer_network_tf] resource "google_compute_network" "producer_network" { - provider = google-beta name = "producer-network" auto_create_subnetworks = false } @@ -42,7 +37,6 @@ resource "google_compute_network" "producer_network" { # [START networksecurity_intercept_create_consumer_network_tf] resource "google_compute_network" "consumer_network" { - provider = google-beta name = "consumer-network" auto_create_subnetworks = false } @@ -50,7 +44,6 @@ resource "google_compute_network" "consumer_network" { # [START networksecurity_intercept_create_consumer_subnetwork_tf] resource "google_compute_subnetwork" "consumer_subnet" { - provider = google-beta name = "consumer-subnet" region = "us-central1" ip_cidr_range = "10.10.0.0/16" @@ -60,7 +53,6 @@ resource "google_compute_subnetwork" "consumer_subnet" { # [START networksecurity_intercept_create_producer_deployment_group_tf] resource "google_network_security_intercept_deployment_group" "default" { - provider = google-beta intercept_deployment_group_id = "intercept-deployment-group" location = "global" network = google_compute_network.producer_network.id @@ -69,7 +61,6 @@ resource "google_network_security_intercept_deployment_group" "default" { # [START networksecurity_intercept_create_endpoint_group_tf] resource "google_network_security_intercept_endpoint_group" "default" { - provider = google-beta intercept_endpoint_group_id = "intercept-endpoint-group" location = "global" intercept_deployment_group = google_network_security_intercept_deployment_group.default.id @@ -78,7 +69,6 @@ resource "google_network_security_intercept_endpoint_group" "default" { # [START networksecurity_intercept_create_endpoint_group_association_tf] resource "google_network_security_intercept_endpoint_group_association" "default" { - provider = google-beta intercept_endpoint_group_association_id = "intercept-endpoint-group-association" location = "global" network = google_compute_network.consumer_network.id @@ -88,7 +78,6 @@ resource "google_network_security_intercept_endpoint_group_association" "default # [START networksecurity_intercept_create_security_profile_tf] resource "google_network_security_security_profile" "default" { - provider = google-beta name = "security-profile" type = "CUSTOM_INTERCEPT" parent = "organizations/${data.google_organization.default.org_id}" @@ -102,7 +91,6 @@ resource "google_network_security_security_profile" "default" { # [START networksecurity_intercept_create_security_profile_group_tf] resource "google_network_security_security_profile_group" "default" { - provider = google-beta name = "security-profile-group" parent = "organizations/${data.google_organization.default.org_id}" location = "global" @@ -112,14 +100,12 @@ resource "google_network_security_security_profile_group" "default" { # [START networksecurity_intercept_create_firewall_policy_tf] resource "google_compute_network_firewall_policy" "default" { - provider = google-beta - name = "firewall-policy" + name = "firewall-policy" } # [END networksecurity_intercept_create_firewall_policy_tf] # [START networksecurity_intercept_create_firewall_policy_rule_tf] resource "google_compute_network_firewall_policy_rule" "default" { - provider = google-beta firewall_policy = google_compute_network_firewall_policy.default.name priority = 1000 action = "apply_security_profile_group" @@ -138,7 +124,6 @@ resource "google_compute_network_firewall_policy_rule" "default" { # [START networksecurity_intercept_create_firewall_policy_association_tf] resource "google_compute_network_firewall_policy_association" "default" { - provider = google-beta name = "firewall-policy-assoc" attachment_target = google_compute_network.consumer_network.id firewall_policy = google_compute_network_firewall_policy.default.name diff --git a/network_security/intercept/basic/producer/main.tf b/network_security/intercept/basic/producer/main.tf index a88fe7987..af7edd238 100644 --- a/network_security/intercept/basic/producer/main.tf +++ b/network_security/intercept/basic/producer/main.tf @@ -17,7 +17,6 @@ # [START networksecurity_intercept_basic_producer] # [START networksecurity_intercept_create_network_tf] resource "google_compute_network" "default" { - provider = google-beta name = "producer-network" auto_create_subnetworks = false } @@ -25,7 +24,6 @@ resource "google_compute_network" "default" { # [START networksecurity_intercept_create_subnetwork_tf] resource "google_compute_subnetwork" "default" { - provider = google-beta name = "producer-subnet" region = "us-central1" ip_cidr_range = "10.1.0.0/16" @@ -35,9 +33,8 @@ resource "google_compute_subnetwork" "default" { # [START networksecurity_intercept_create_health_check_tf] resource "google_compute_region_health_check" "default" { - provider = google-beta - name = "deploymnet-hc" - region = "us-central1" + name = "deploymnet-hc" + region = "us-central1" http_health_check { port = 80 } @@ -46,7 +43,6 @@ resource "google_compute_region_health_check" "default" { # [START networksecurity_intercept_create_backend_service_tf] resource "google_compute_region_backend_service" "default" { - provider = google-beta name = "deployment-svc" region = "us-central1" health_checks = [google_compute_region_health_check.default.id] @@ -57,7 +53,6 @@ resource "google_compute_region_backend_service" "default" { # [START networksecurity_intercept_create_forwarding_rule_tf] resource "google_compute_forwarding_rule" "default" { - provider = google-beta name = "deployment-fr" region = "us-central1" network = google_compute_network.default.name @@ -71,7 +66,6 @@ resource "google_compute_forwarding_rule" "default" { # [START networksecurity_intercept_create_deployment_group_tf] resource "google_network_security_intercept_deployment_group" "default" { - provider = google-beta intercept_deployment_group_id = "intercept-deployment-group" location = "global" network = google_compute_network.default.id @@ -80,7 +74,6 @@ resource "google_network_security_intercept_deployment_group" "default" { # [START networksecurity_intercept_create_deployment_tf] resource "google_network_security_intercept_deployment" "default" { - provider = google-beta intercept_deployment_id = "intercept-deployment" location = "us-central1-a" forwarding_rule = google_compute_forwarding_rule.default.id