From 4ed2e5a5cf48c55d97a5f5246eef81ad9b48c92d Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 29 Aug 2024 09:32:12 -0700 Subject: [PATCH] Promote Server Tls Policy to V1 (#11538) (#780) [upstream:1ac1d70d002941296d3d2138cc9b62c7ccaf016d] Signed-off-by: Modular Magician --- network_security_server_tls_policy_advanced/main.tf | 1 - network_security_server_tls_policy_basic/main.tf | 11 ----------- network_security_server_tls_policy_mtls/main.tf | 3 --- .../main.tf | 1 - 4 files changed, 16 deletions(-) diff --git a/network_security_server_tls_policy_advanced/main.tf b/network_security_server_tls_policy_advanced/main.tf index 822a7887..c110f14f 100644 --- a/network_security_server_tls_policy_advanced/main.tf +++ b/network_security_server_tls_policy_advanced/main.tf @@ -1,5 +1,4 @@ resource "google_network_security_server_tls_policy" "default" { - provider = google-beta name = "my-server-tls-policy-${local.name_suffix}" labels = { foo = "bar" diff --git a/network_security_server_tls_policy_basic/main.tf b/network_security_server_tls_policy_basic/main.tf index eb45eb64..27dd7a5a 100644 --- a/network_security_server_tls_policy_basic/main.tf +++ b/network_security_server_tls_policy_basic/main.tf @@ -1,5 +1,4 @@ resource "google_network_security_server_tls_policy" "default" { - provider = google-beta name = "my-server-tls-policy-${local.name_suffix}" labels = { foo = "bar" @@ -17,15 +16,5 @@ resource "google_network_security_server_tls_policy" "default" { target_uri = "unix:mypath" } } - client_validation_ca { - grpc_endpoint { - target_uri = "unix:abc/mypath" - } - } - client_validation_ca { - certificate_provider_instance { - plugin_instance = "google_cloud_private_spiffe" - } - } } } diff --git a/network_security_server_tls_policy_mtls/main.tf b/network_security_server_tls_policy_mtls/main.tf index 4fd87cc5..d00fb3a4 100644 --- a/network_security_server_tls_policy_mtls/main.tf +++ b/network_security_server_tls_policy_mtls/main.tf @@ -1,9 +1,7 @@ data "google_project" "project" { - provider = google-beta } resource "google_network_security_server_tls_policy" "default" { - provider = google-beta name = "my-server-tls-policy-${local.name_suffix}" description = "my description" @@ -21,7 +19,6 @@ resource "google_network_security_server_tls_policy" "default" { } resource "google_certificate_manager_trust_config" "default" { - provider = google-beta name = "my-trust-config-${local.name_suffix}" description = "sample trust config description" location = "global" diff --git a/network_security_server_tls_policy_server_cert/main.tf b/network_security_server_tls_policy_server_cert/main.tf index f194aeba..872881f2 100644 --- a/network_security_server_tls_policy_server_cert/main.tf +++ b/network_security_server_tls_policy_server_cert/main.tf @@ -1,5 +1,4 @@ resource "google_network_security_server_tls_policy" "default" { - provider = google-beta name = "my-server-tls-policy-${local.name_suffix}" labels = { foo = "bar"