Skip to content

Commit fdd54ad

Browse files
maayanbeltzermaayanbeltzer
authored
VPC Flow Logs Support Terraform in v1 (#15523)
1 parent 4debc82 commit fdd54ad

7 files changed

+5
-41
lines changed

‎mmv1/products/networkmanagement/OrganizationVpcFlowLogsConfig.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ name: 'OrganizationVpcFlowLogsConfig'
1616
description:
1717
VPC Flow Logs Config is a resource that lets you configure
1818
Flow Logs for Organization.
19-
min_version: beta
2019
id_format: 'organizations/{{organization}}/locations/{{location}}/vpcFlowLogsConfigs/{{vpc_flow_logs_config_id}}'
2120
base_url: 'organizations/{{organization}}/locations/{{location}}/vpcFlowLogsConfigs'
2221
self_link: 'organizations/{{organization}}/locations/{{location}}/vpcFlowLogsConfigs/{{vpc_flow_logs_config_id}}'
@@ -46,7 +45,6 @@ sweeper:
4645
examples:
4746
- name: 'network_management_org_vpc_flow_logs_config_basic'
4847
primary_resource_id: 'org-test'
49-
min_version: 'beta'
5048
vars:
5149
vpc_flow_logs_config_id: 'basic-org-test-id'
5250
test_env_vars:
@@ -105,7 +103,7 @@ properties:
105103
Optional. The value of the field must be in (0, 1]. The sampling rate
106104
of VPC Flow Logs where 1.0 means all collected logs are reported. Setting the
107105
sampling rate to 0.0 is not allowed. If you want to disable VPC Flow Logs, use
108-
the state field instead. Default value is 1.0.
106+
the state field instead. Default value is 1.0
109107
- name: 'metadata'
110108
type: String
111109
default_from_api: true

‎mmv1/products/networkmanagement/VpcFlowLogsConfig.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,11 @@ examples:
6262
vpc_flow_logs_config_id: 'basic-test-id'
6363
- name: 'network_management_vpc_flow_logs_config_network_basic'
6464
primary_resource_id: 'network-test'
65-
min_version: 'beta'
6665
vars:
6766
network_name: 'basic-network-test-network'
6867
vpc_flow_logs_config_id: 'basic-network-test-id'
6968
- name: 'network_management_vpc_flow_logs_config_subnet_basic'
7069
primary_resource_id: 'subnet-test'
71-
min_version: 'beta'
7270
vars:
7371
network_name: 'basic-subnet-test-network'
7472
subnetwork_name: 'basic-subnet-test-subnetwork'
@@ -149,12 +147,10 @@ properties:
149147
description: |
150148
Traffic will be logged from the VPN Tunnel. Format: projects/{project_id}/regions/{region}/vpnTunnels/{name}
151149
- name: 'subnet'
152-
min_version: 'beta'
153150
type: String
154151
description: |
155152
Traffic will be logged from VMs within the subnetwork. Format: projects/{project_id}/regions/{region}/subnetworks/{name}
156153
- name: 'network'
157-
min_version: 'beta'
158154
type: String
159155
description: |
160156
Traffic will be logged from VMs, VPN tunnels and Interconnect Attachments within the network. Format: projects/{project_id}/global/networks/{name}

‎mmv1/templates/terraform/examples/network_management_org_vpc_flow_logs_config_basic.tf.tmpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
resource "google_network_management_organization_vpc_flow_logs_config" "{{$.PrimaryResourceId}}" {
2-
provider = google-beta
32
vpc_flow_logs_config_id = "{{index $.Vars "vpc_flow_logs_config_id"}}"
43
location = "global"
54
organization = "{{index $.TestEnvVars "org_id"}}"

‎mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_network_basic.tf.tmpl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
data "google_project" "project" {
2-
provider = google-beta
32
}
43

54
resource "google_network_management_vpc_flow_logs_config" "{{$.PrimaryResourceId}}" {
6-
provider = google-beta
75
vpc_flow_logs_config_id = "{{index $.Vars "vpc_flow_logs_config_id"}}"
86
location = "global"
97
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network.name}"
108
}
119

1210
resource "google_compute_network" "network" {
13-
provider = google-beta
1411
name = "{{index $.Vars "network_name"}}"
1512
}

‎mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_subnet_basic.tf.tmpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
data "google_project" "project" {
2-
provider = google-beta
32
}
43

54
resource "google_network_management_vpc_flow_logs_config" "{{$.PrimaryResourceId}}" {
6-
provider = google-beta
75
vpc_flow_logs_config_id = "{{index $.Vars "vpc_flow_logs_config_id"}}"
86
location = "global"
97
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/${google_compute_subnetwork.subnetwork.name}"
108
}
119

1210
resource "google_compute_network" "network" {
13-
provider = google-beta
1411
name = "{{index $.Vars "network_name"}}"
1512
auto_create_subnetworks = false
1613
}
1714

1815
resource "google_compute_subnetwork" "subnetwork" {
19-
provider = google-beta
2016
name = "{{index $.Vars "subnetwork_name"}}"
2117
ip_cidr_range = "10.2.0.0/16"
2218
region = "us-central1"

mmv1/third_party/terraform/services/networkmanagement/resource_network_management_org_vpc_flow_logs_config_test.go.tmpl renamed to mmv1/third_party/terraform/services/networkmanagement/resource_network_management_org_vpc_flow_logs_config_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package networkmanagement_test
22

3-
{{ if ne $.TargetVersionName "ga" -}}
43
import (
54
"testing"
65

76
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
87
"github.com/hashicorp/terraform-provider-google/google/acctest"
9-
"github.com/hashicorp/terraform-provider-google/google/envvar"
8+
"github.com/hashicorp/terraform-provider-google/google/envvar"
109
)
1110

1211
func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_update(t *testing.T) {
@@ -19,7 +18,7 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_update(t *testing.T)
1918

2019
acctest.VcrTest(t, resource.TestCase{
2120
PreCheck: func() { acctest.AccTestPreCheck(t) },
22-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
21+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2322
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
2423
Steps: []resource.TestStep{
2524
{
@@ -47,7 +46,6 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_update(t *testing.T)
4746
func testAccNetworkManagementOrganizationVpcFlowLogsConfig_basic(context map[string]interface{}) string {
4847
return acctest.Nprintf(`
4948
resource "google_network_management_organization_vpc_flow_logs_config" "org-test-update" {
50-
provider = google-beta
5149
vpc_flow_logs_config_id = "tf-test-update-org-id-%{random_suffix}"
5250
organization = "%{org_id}"
5351
location = "global"
@@ -58,7 +56,6 @@ resource "google_network_management_organization_vpc_flow_logs_config" "org-test
5856
func testAccNetworkManagementOrganizationVpcFlowLogsConfig_update(context map[string]interface{}) string {
5957
return acctest.Nprintf(`
6058
resource "google_network_management_organization_vpc_flow_logs_config" "org-test-update" {
61-
provider = google-beta
6259
vpc_flow_logs_config_id = "tf-test-update-org-id-%{random_suffix}"
6360
organization = "%{org_id}"
6461
location = "global"
@@ -72,4 +69,3 @@ resource "google_network_management_organization_vpc_flow_logs_config" "org-test
7269
}
7370
`, context)
7471
}
75-
{{ end }}

mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl renamed to mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ resource "google_network_management_vpc_flow_logs_config" "example" {
182182
return fmt.Sprintf("%s\n\n%s\n\n", vpcFlowLogsCfg, testAccNetworkManagementVpcFlowLogsConfig_baseResources(context))
183183
}
184184

185-
{{ if ne $.TargetVersionName "ga" -}}
186185
func TestAccNetworkManagementVpcFlowLogsConfig_network(t *testing.T) {
187186
t.Parallel()
188187

@@ -192,7 +191,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_network(t *testing.T) {
192191

193192
acctest.VcrTest(t, resource.TestCase{
194193
PreCheck: func() { acctest.AccTestPreCheck(t) },
195-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
194+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
196195
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
197196
Steps: []resource.TestStep{
198197
{
@@ -220,16 +219,13 @@ func TestAccNetworkManagementVpcFlowLogsConfig_network(t *testing.T) {
220219
func testAccNetworkManagementVpcFlowLogsConfig_network(context map[string]interface{}) string {
221220
return acctest.Nprintf(`
222221
data "google_project" "project" {
223-
provider = google-beta
224222
}
225223
226224
resource "google_compute_network" "network" {
227-
provider = google-beta
228225
name = "tf-test-flow-logs-network-%{random_suffix}"
229226
}
230227
231228
resource "google_network_management_vpc_flow_logs_config" "network-test" {
232-
provider = google-beta
233229
vpc_flow_logs_config_id = "tf-test-network-id-%{random_suffix}"
234230
location = "global"
235231
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network.name}"
@@ -241,21 +237,17 @@ resource "google_network_management_vpc_flow_logs_config" "network-test" {
241237
func testAccNetworkManagementVpcFlowLogsConfig_networkUpdate(context map[string]interface{}) string {
242238
return acctest.Nprintf(`
243239
data "google_project" "project" {
244-
provider = google-beta
245240
}
246241
247242
resource "google_compute_network" "network" {
248-
provider = google-beta
249243
name = "tf-test-flow-logs-network-%{random_suffix}"
250244
}
251245
252246
resource "google_compute_network" "network_update" {
253-
provider = google-beta
254247
name = "tf-test-flow-logs-network-update-%{random_suffix}"
255248
}
256249
257250
resource "google_network_management_vpc_flow_logs_config" "network-test" {
258-
provider = google-beta
259251
vpc_flow_logs_config_id = "tf-test-network-id-%{random_suffix}"
260252
location = "global"
261253
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network_update.name}"
@@ -277,7 +269,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_subnet(t *testing.T) {
277269

278270
acctest.VcrTest(t, resource.TestCase{
279271
PreCheck: func() { acctest.AccTestPreCheck(t) },
280-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
272+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
281273
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
282274
Steps: []resource.TestStep{
283275
{
@@ -305,25 +297,21 @@ func TestAccNetworkManagementVpcFlowLogsConfig_subnet(t *testing.T) {
305297
func testAccNetworkManagementVpcFlowLogsConfig_subnet(context map[string]interface{}) string {
306298
return acctest.Nprintf(`
307299
data "google_project" "project" {
308-
provider = google-beta
309300
}
310301
311302
resource "google_compute_network" "network" {
312303
name = "tf-test-subnet-network-%{random_suffix}"
313304
auto_create_subnetworks = false
314-
provider = google-beta
315305
}
316306
317307
resource "google_compute_subnetwork" "subnet" {
318-
provider = google-beta
319308
name = "tf-test-flow-logs-subnet-%{random_suffix}"
320309
ip_cidr_range = "10.2.0.0/16"
321310
region = "us-central1"
322311
network = google_compute_network.network.id
323312
}
324313
325314
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
326-
provider = google-beta
327315
vpc_flow_logs_config_id = "tf-test-subnet-id-%{random_suffix}"
328316
location = "global"
329317
subnet = "projects/${data.google_project.project.number}/regions/${google_compute_subnetwork.subnet.region}/subnetworks/${google_compute_subnetwork.subnet.name}"
@@ -334,41 +322,35 @@ resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
334322
func testAccNetworkManagementVpcFlowLogsConfig_subnetUpdate(context map[string]interface{}) string {
335323
return acctest.Nprintf(`
336324
data "google_project" "project" {
337-
provider = google-beta
338325
}
339326
340327
resource "google_compute_network" "network" {
341-
provider = google-beta
342328
name = "tf-test-subnet-network-%{random_suffix}"
343329
auto_create_subnetworks = false
344330
}
345331
346332
resource "google_compute_subnetwork" "subnet" {
347-
provider = google-beta
348333
name = "tf-test-flow-logs-subnet-%{random_suffix}"
349334
ip_cidr_range = "10.2.0.0/16"
350335
region = "us-central1"
351336
network = google_compute_network.network.id
352337
}
353338
354339
resource "google_compute_subnetwork" "subnet_update" {
355-
provider = google-beta
356340
name = "tf-test-flow-logs-subnet-update-%{random_suffix}"
357341
ip_cidr_range = "10.3.0.0/16"
358342
region = "us-central1"
359343
network = google_compute_network.network.id
360344
}
361345
362346
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
363-
provider = google-beta
364347
vpc_flow_logs_config_id = "tf-test-subnet-id-%{random_suffix}"
365348
location = "global"
366349
subnet = "projects/${data.google_project.project.number}/regions/${google_compute_subnetwork.subnet_update.region}/subnetworks/${google_compute_subnetwork.subnet_update.name}"
367350
state = "ENABLED"
368351
}
369352
`, context)
370353
}
371-
{{ end }}
372354

373355
func testAccNetworkManagementVpcFlowLogsConfig_baseResources(context map[string]interface{}) string {
374356
return acctest.Nprintf(`

0 commit comments

Comments
 (0)