Update VpcFlowLogs to support subnet and vpc on Project Level (#14381) (#23945)

[upstream:1b379c0c631db642d60debb13232c38d959e59c3]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14381.txt

@@ -0,0 +1 @@
+unknown: Update VpcFlowLogs to support subnet and vpc on Project Level

google/services/networkmanagement/resource_network_management_vpc_flow_logs_config.go

@@ -76,7 +76,7 @@ for resource type 'networkmanagement.googleapis.com/VpcFlowLogsConfig'.`,
 				Computed: true,
 				Optional: true,
 				Description: `Optional. The aggregation interval for the logs. Default value is
-INTERVAL_5_SEC.   Possible values:  AGGREGATION_INTERVAL_UNSPECIFIED INTERVAL_5_SEC INTERVAL_30_SEC INTERVAL_1_MIN INTERVAL_5_MIN INTERVAL_10_MIN INTERVAL_15_MIN"`,
+INTERVAL_5_SEC.   Possible values:  AGGREGATION_INTERVAL_UNSPECIFIED INTERVAL_5_SEC INTERVAL_30_SEC INTERVAL_1_MIN INTERVAL_5_MIN INTERVAL_10_MIN INTERVAL_15_MIN`,
 			},
 			"description": {
 				Type:     schema.TypeString,
@@ -135,7 +135,8 @@ logs. Can only be specified if \"metadata\" was set to CUSTOM_METADATA.`,
 				Computed: true,
 				Optional: true,
 				Description: `Optional. The state of the VPC Flow Log configuration. Default value
-is ENABLED. When creating a new configuration, it must be enabled.   Possible`,
+is ENABLED. When creating a new configuration, it must be enabled.
+Possible values: STATE_UNSPECIFIED ENABLED DISABLED`,
 			},
 			"vpn_tunnel": {
 				Type:        schema.TypeString,
@@ -158,6 +159,16 @@ is ENABLED. When creating a new configuration, it must be enabled.   Possible`,
 				Computed:    true,
 				Description: `Identifier. Unique name of the configuration using the form:     'projects/{project_id}/locations/global/vpcFlowLogsConfigs/{vpc_flow_logs_config_id}'`,
 			},
+			"target_resource_state": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `Describes the state of the configured target resource for diagnostic
+purposes.
+Possible values:
+TARGET_RESOURCE_STATE_UNSPECIFIED
+TARGET_RESOURCE_EXISTS
+TARGET_RESOURCE_DOES_NOT_EXIST`,
+			},
 			"terraform_labels": {
 				Type:     schema.TypeMap,
 				Computed: true,
@@ -387,6 +398,9 @@ func resourceNetworkManagementVpcFlowLogsConfigRead(d *schema.ResourceData, meta
 	if err := d.Set("update_time", flattenNetworkManagementVpcFlowLogsConfigUpdateTime(res["updateTime"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VpcFlowLogsConfig: %s", err)
 	}
+	if err := d.Set("target_resource_state", flattenNetworkManagementVpcFlowLogsConfigTargetResourceState(res["targetResourceState"], d, config)); err != nil {
+		return fmt.Errorf("Error reading VpcFlowLogsConfig: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetworkManagementVpcFlowLogsConfigTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading VpcFlowLogsConfig: %s", err)
 	}
@@ -704,6 +718,10 @@ func flattenNetworkManagementVpcFlowLogsConfigUpdateTime(v interface{}, d *schem
 	return v
 }
 
+func flattenNetworkManagementVpcFlowLogsConfigTargetResourceState(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetworkManagementVpcFlowLogsConfigTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v

google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_meta.yaml

@@ -20,6 +20,7 @@ fields:
   - field: 'metadata_fields'
   - field: 'name'
   - field: 'state'
+  - field: 'target_resource_state'
   - field: 'terraform_labels'
     provider_only: true
   - field: 'update_time'

google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go

@@ -30,70 +30,6 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
 )
 
-func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigInterconnectFullExample(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigInterconnectFullExample(context),
-			},
-			{
-				ResourceName:            "google_network_management_vpc_flow_logs_config.interconnect-test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"},
-			},
-		},
-	})
-}
-
-func testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigInterconnectFullExample(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-data "google_project" "project" {
-}
-
-resource "google_network_management_vpc_flow_logs_config" "interconnect-test" {
-  vpc_flow_logs_config_id = "tf-test-full-interconnect-test-id%{random_suffix}"
-  location                = "global"
-  interconnect_attachment = "projects/${data.google_project.project.number}/regions/us-east4/interconnectAttachments/${google_compute_interconnect_attachment.attachment.name}"
-  state                   = "ENABLED"
-  aggregation_interval    = "INTERVAL_5_SEC"
-  description             = "VPC Flow Logs over a VPN Gateway."
-  flow_sampling           = 0.5
-  metadata                = "INCLUDE_ALL_METADATA"
-}
-
-resource "google_compute_network" "network" {
-  name     = "tf-test-full-interconnect-test-network%{random_suffix}"
-}
-
-resource "google_compute_router" "router" {
-  name    = "tf-test-full-interconnect-test-router%{random_suffix}"
-  network = google_compute_network.network.name
-  bgp {
-    asn = 16550
-  }
-}
-
-resource "google_compute_interconnect_attachment" "attachment" {
-  name                     = "tf-test-full-interconnect-test-id%{random_suffix}"
-  edge_availability_domain = "AVAILABILITY_DOMAIN_1"
-  type                     = "PARTNER"
-  router                   = google_compute_router.router.id
-  mtu                      = 1500
-}
-
-`, context)
-}
-
 func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigInterconnectBasicExample(t *testing.T) {
 	t.Parallel()
 
@@ -248,106 +184,6 @@ resource "google_compute_route" "route" {
 `, context)
 }
 
-func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigVpnFullExample(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigVpnFullExample(context),
-			},
-			{
-				ResourceName:            "google_network_management_vpc_flow_logs_config.vpn-test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"},
-			},
-		},
-	})
-}
-
-func testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigVpnFullExample(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-data "google_project" "project" {
-}
-
-resource "google_network_management_vpc_flow_logs_config" "vpn-test" {
-  vpc_flow_logs_config_id = "tf-test-full-test-id%{random_suffix}"
-  location                = "global"
-  vpn_tunnel              = "projects/${data.google_project.project.number}/regions/us-central1/vpnTunnels/${google_compute_vpn_tunnel.tunnel.name}"
-  state                   = "ENABLED"
-  aggregation_interval    = "INTERVAL_5_SEC"
-  description             = "VPC Flow Logs over a VPN Gateway."
-  flow_sampling           = 0.5
-  metadata                = "INCLUDE_ALL_METADATA"
-}
-
-resource "google_compute_vpn_tunnel" "tunnel" {
-  name               = "tf-test-full-test-tunnel%{random_suffix}"
-  peer_ip            = "15.0.0.120"
-  shared_secret      = "a secret message"
-  target_vpn_gateway = google_compute_vpn_gateway.target_gateway.id
-
-  depends_on = [
-    google_compute_forwarding_rule.fr_esp,
-    google_compute_forwarding_rule.fr_udp500,
-    google_compute_forwarding_rule.fr_udp4500,
-  ]
-}
-
-resource "google_compute_vpn_gateway" "target_gateway" {
-  name     = "tf-test-full-test-gateway%{random_suffix}"
-  network  = google_compute_network.network.id
-}
-
-resource "google_compute_network" "network" {
-  name     = "tf-test-full-test-network%{random_suffix}"
-}
-
-resource "google_compute_address" "vpn_static_ip" {
-  name     = "tf-test-full-test-address%{random_suffix}"
-}
-
-resource "google_compute_forwarding_rule" "fr_esp" {
-  name        = "tf-test-full-test-fresp%{random_suffix}"
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.vpn_static_ip.address
-  target      = google_compute_vpn_gateway.target_gateway.id
-}
-
-resource "google_compute_forwarding_rule" "fr_udp500" {
-  name        = "tf-test-full-test-fr500%{random_suffix}"
-  ip_protocol = "UDP"
-  port_range  = "500"
-  ip_address  = google_compute_address.vpn_static_ip.address
-  target      = google_compute_vpn_gateway.target_gateway.id
-}
-
-resource "google_compute_forwarding_rule" "fr_udp4500" {
-  name        = "tf-test-full-test-fr4500%{random_suffix}"
-  ip_protocol = "UDP"
-  port_range  = "4500"
-  ip_address  = google_compute_address.vpn_static_ip.address
-  target      = google_compute_vpn_gateway.target_gateway.id
-}
-
-resource "google_compute_route" "route" {
-  name                = "tf-test-full-test-route%{random_suffix}"
-  network             = google_compute_network.network.name
-  dest_range          = "15.0.0.0/24"
-  priority            = 1000
-  next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel.id
-}
-`, context)
-}
-
 func testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

google/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go

@@ -8,7 +8,7 @@
 //
 //	This code is generated by Magic Modules using the following:
 //
-//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl
 //
 //	DO NOT EDIT this file directly. Any changes made to this file will be
 //	overwritten during the next generation cycle.