Skip to content

Commit 31aae94

Browse files
modular-magicianmodular-magician
authored
VPC Flow Logs Support Terraform in v1 (#15523) (#10972)
[upstream:fdd54ad1943023e171df2e24c47dc7a1c94d9156] Signed-off-by: Modular Magician <[email protected]>
1 parent 8f7adb2 commit 31aae94

8 files changed

+15
-48
lines changed

‎.changelog/15523.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
networkmanagement: promoted `google_network_management_organization_vpc_flow_logs_config` resource to GA
3+
```

‎google-beta/services/networkmanagement/resource_network_management_org_vpc_flow_logs_config_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// This code is generated by Magic Modules using the following:
1010
//
11-
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_org_vpc_flow_logs_config_test.go.tmpl
11+
// Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_org_vpc_flow_logs_config_test.go
1212
//
1313
// DO NOT EDIT this file directly. Any changes made to this file will be
1414
// overwritten during the next generation cycle.
@@ -34,7 +34,7 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_update(t *testing.T)
3434

3535
acctest.VcrTest(t, resource.TestCase{
3636
PreCheck: func() { acctest.AccTestPreCheck(t) },
37-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
37+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
3838
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
3939
Steps: []resource.TestStep{
4040
{
@@ -62,7 +62,6 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_update(t *testing.T)
6262
func testAccNetworkManagementOrganizationVpcFlowLogsConfig_basic(context map[string]interface{}) string {
6363
return acctest.Nprintf(`
6464
resource "google_network_management_organization_vpc_flow_logs_config" "org-test-update" {
65-
provider = google-beta
6665
vpc_flow_logs_config_id = "tf-test-update-org-id-%{random_suffix}"
6766
organization = "%{org_id}"
6867
location = "global"
@@ -73,7 +72,6 @@ resource "google_network_management_organization_vpc_flow_logs_config" "org-test
7372
func testAccNetworkManagementOrganizationVpcFlowLogsConfig_update(context map[string]interface{}) string {
7473
return acctest.Nprintf(`
7574
resource "google_network_management_organization_vpc_flow_logs_config" "org-test-update" {
76-
provider = google-beta
7775
vpc_flow_logs_config_id = "tf-test-update-org-id-%{random_suffix}"
7876
organization = "%{org_id}"
7977
location = "global"

‎google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ of 512 characters.`,
114114
Description: `Optional. The value of the field must be in (0, 1]. The sampling rate
115115
of VPC Flow Logs where 1.0 means all collected logs are reported. Setting the
116116
sampling rate to 0.0 is not allowed. If you want to disable VPC Flow Logs, use
117-
the state field instead. Default value is 1.0.`,
117+
the state field instead. Default value is 1.0`,
118118
},
119119
"labels": {
120120
Type: schema.TypeMap,

‎google-beta/services/networkmanagement/resource_network_management_organization_vpc_flow_logs_config_generated_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_networkManagementOrgV
4141

4242
acctest.VcrTest(t, resource.TestCase{
4343
PreCheck: func() { acctest.AccTestPreCheck(t) },
44-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
44+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
4545
CheckDestroy: testAccCheckNetworkManagementOrganizationVpcFlowLogsConfigDestroyProducer(t),
4646
Steps: []resource.TestStep{
4747
{
@@ -60,7 +60,6 @@ func TestAccNetworkManagementOrganizationVpcFlowLogsConfig_networkManagementOrgV
6060
func testAccNetworkManagementOrganizationVpcFlowLogsConfig_networkManagementOrgVpcFlowLogsConfigBasicExample(context map[string]interface{}) string {
6161
return acctest.Nprintf(`
6262
resource "google_network_management_organization_vpc_flow_logs_config" "org-test" {
63-
provider = google-beta
6463
vpc_flow_logs_config_id = "tf-test-basic-org-test-id%{random_suffix}"
6564
location = "global"
6665
organization = "%{org_id}"

‎google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_generated_test.go‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfi
193193

194194
acctest.VcrTest(t, resource.TestCase{
195195
PreCheck: func() { acctest.AccTestPreCheck(t) },
196-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
196+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
197197
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
198198
Steps: []resource.TestStep{
199199
{
@@ -212,18 +212,15 @@ func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfi
212212
func testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigNetworkBasicExample(context map[string]interface{}) string {
213213
return acctest.Nprintf(`
214214
data "google_project" "project" {
215-
provider = google-beta
216215
}
217216
218217
resource "google_network_management_vpc_flow_logs_config" "network-test" {
219-
provider = google-beta
220218
vpc_flow_logs_config_id = "tf-test-basic-network-test-id%{random_suffix}"
221219
location = "global"
222220
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network.name}"
223221
}
224222
225223
resource "google_compute_network" "network" {
226-
provider = google-beta
227224
name = "tf-test-basic-network-test-network%{random_suffix}"
228225
}
229226
`, context)
@@ -238,7 +235,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfi
238235

239236
acctest.VcrTest(t, resource.TestCase{
240237
PreCheck: func() { acctest.AccTestPreCheck(t) },
241-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
238+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
242239
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
243240
Steps: []resource.TestStep{
244241
{
@@ -257,24 +254,20 @@ func TestAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfi
257254
func testAccNetworkManagementVpcFlowLogsConfig_networkManagementVpcFlowLogsConfigSubnetBasicExample(context map[string]interface{}) string {
258255
return acctest.Nprintf(`
259256
data "google_project" "project" {
260-
provider = google-beta
261257
}
262258
263259
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
264-
provider = google-beta
265260
vpc_flow_logs_config_id = "tf-test-basic-subnet-test-id%{random_suffix}"
266261
location = "global"
267262
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/${google_compute_subnetwork.subnetwork.name}"
268263
}
269264
270265
resource "google_compute_network" "network" {
271-
provider = google-beta
272266
name = "tf-test-basic-subnet-test-network%{random_suffix}"
273267
auto_create_subnetworks = false
274268
}
275269
276270
resource "google_compute_subnetwork" "subnetwork" {
277-
provider = google-beta
278271
name = "tf-test-basic-subnet-test-subnetwork%{random_suffix}"
279272
ip_cidr_range = "10.2.0.0/16"
280273
region = "us-central1"

‎google-beta/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// This code is generated by Magic Modules using the following:
1010
//
11-
// 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
11+
// 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
1212
//
1313
// DO NOT EDIT this file directly. Any changes made to this file will be
1414
// overwritten during the next generation cycle.
@@ -207,7 +207,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_network(t *testing.T) {
207207

208208
acctest.VcrTest(t, resource.TestCase{
209209
PreCheck: func() { acctest.AccTestPreCheck(t) },
210-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
210+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
211211
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
212212
Steps: []resource.TestStep{
213213
{
@@ -235,16 +235,13 @@ func TestAccNetworkManagementVpcFlowLogsConfig_network(t *testing.T) {
235235
func testAccNetworkManagementVpcFlowLogsConfig_network(context map[string]interface{}) string {
236236
return acctest.Nprintf(`
237237
data "google_project" "project" {
238-
provider = google-beta
239238
}
240239
241240
resource "google_compute_network" "network" {
242-
provider = google-beta
243241
name = "tf-test-flow-logs-network-%{random_suffix}"
244242
}
245243
246244
resource "google_network_management_vpc_flow_logs_config" "network-test" {
247-
provider = google-beta
248245
vpc_flow_logs_config_id = "tf-test-network-id-%{random_suffix}"
249246
location = "global"
250247
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network.name}"
@@ -256,21 +253,17 @@ resource "google_network_management_vpc_flow_logs_config" "network-test" {
256253
func testAccNetworkManagementVpcFlowLogsConfig_networkUpdate(context map[string]interface{}) string {
257254
return acctest.Nprintf(`
258255
data "google_project" "project" {
259-
provider = google-beta
260256
}
261257
262258
resource "google_compute_network" "network" {
263-
provider = google-beta
264259
name = "tf-test-flow-logs-network-%{random_suffix}"
265260
}
266261
267262
resource "google_compute_network" "network_update" {
268-
provider = google-beta
269263
name = "tf-test-flow-logs-network-update-%{random_suffix}"
270264
}
271265
272266
resource "google_network_management_vpc_flow_logs_config" "network-test" {
273-
provider = google-beta
274267
vpc_flow_logs_config_id = "tf-test-network-id-%{random_suffix}"
275268
location = "global"
276269
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network_update.name}"
@@ -292,7 +285,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_subnet(t *testing.T) {
292285

293286
acctest.VcrTest(t, resource.TestCase{
294287
PreCheck: func() { acctest.AccTestPreCheck(t) },
295-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
288+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
296289
CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t),
297290
Steps: []resource.TestStep{
298291
{
@@ -320,25 +313,21 @@ func TestAccNetworkManagementVpcFlowLogsConfig_subnet(t *testing.T) {
320313
func testAccNetworkManagementVpcFlowLogsConfig_subnet(context map[string]interface{}) string {
321314
return acctest.Nprintf(`
322315
data "google_project" "project" {
323-
provider = google-beta
324316
}
325317
326318
resource "google_compute_network" "network" {
327319
name = "tf-test-subnet-network-%{random_suffix}"
328320
auto_create_subnetworks = false
329-
provider = google-beta
330321
}
331322
332323
resource "google_compute_subnetwork" "subnet" {
333-
provider = google-beta
334324
name = "tf-test-flow-logs-subnet-%{random_suffix}"
335325
ip_cidr_range = "10.2.0.0/16"
336326
region = "us-central1"
337327
network = google_compute_network.network.id
338328
}
339329
340330
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
341-
provider = google-beta
342331
vpc_flow_logs_config_id = "tf-test-subnet-id-%{random_suffix}"
343332
location = "global"
344333
subnet = "projects/${data.google_project.project.number}/regions/${google_compute_subnetwork.subnet.region}/subnetworks/${google_compute_subnetwork.subnet.name}"
@@ -349,33 +338,28 @@ resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
349338
func testAccNetworkManagementVpcFlowLogsConfig_subnetUpdate(context map[string]interface{}) string {
350339
return acctest.Nprintf(`
351340
data "google_project" "project" {
352-
provider = google-beta
353341
}
354342
355343
resource "google_compute_network" "network" {
356-
provider = google-beta
357344
name = "tf-test-subnet-network-%{random_suffix}"
358345
auto_create_subnetworks = false
359346
}
360347
361348
resource "google_compute_subnetwork" "subnet" {
362-
provider = google-beta
363349
name = "tf-test-flow-logs-subnet-%{random_suffix}"
364350
ip_cidr_range = "10.2.0.0/16"
365351
region = "us-central1"
366352
network = google_compute_network.network.id
367353
}
368354
369355
resource "google_compute_subnetwork" "subnet_update" {
370-
provider = google-beta
371356
name = "tf-test-flow-logs-subnet-update-%{random_suffix}"
372357
ip_cidr_range = "10.3.0.0/16"
373358
region = "us-central1"
374359
network = google_compute_network.network.id
375360
}
376361
377362
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
378-
provider = google-beta
379363
vpc_flow_logs_config_id = "tf-test-subnet-id-%{random_suffix}"
380364
location = "global"
381365
subnet = "projects/${data.google_project.project.number}/regions/${google_compute_subnetwork.subnet_update.region}/subnetworks/${google_compute_subnetwork.subnet_update.name}"

‎website/docs/r/network_management_organization_vpc_flow_logs_config.html.markdown‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@ description: |-
2323

2424
VPC Flow Logs Config is a resource that lets you configure Flow Logs for Organization.
2525

26-
~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
27-
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
2826

2927

3028
## Example Usage - Network Management Org Vpc Flow Logs Config Basic
3129

3230

3331
```hcl
3432
resource "google_network_management_organization_vpc_flow_logs_config" "org-test" {
35-
provider = google-beta
3633
vpc_flow_logs_config_id = "basic-org-test-id"
3734
location = "global"
3835
organization = "123456789"
@@ -80,7 +77,7 @@ The following arguments are supported:
8077
Optional. The value of the field must be in (0, 1]. The sampling rate
8178
of VPC Flow Logs where 1.0 means all collected logs are reported. Setting the
8279
sampling rate to 0.0 is not allowed. If you want to disable VPC Flow Logs, use
83-
the state field instead. Default value is 1.0.
80+
the state field instead. Default value is 1.0
8481

8582
* `metadata` -
8683
(Optional)

‎website/docs/r/network_management_vpc_flow_logs_config.html.markdown‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,15 @@ resource "google_compute_route" "route" {
149149

150150
```hcl
151151
data "google_project" "project" {
152-
provider = google-beta
153152
}
154153
155154
resource "google_network_management_vpc_flow_logs_config" "network-test" {
156-
provider = google-beta
157155
vpc_flow_logs_config_id = "basic-network-test-id"
158156
location = "global"
159157
network = "projects/${data.google_project.project.number}/global/networks/${google_compute_network.network.name}"
160158
}
161159
162160
resource "google_compute_network" "network" {
163-
provider = google-beta
164161
name = "basic-network-test-network"
165162
}
166163
```
@@ -174,24 +171,20 @@ resource "google_compute_network" "network" {
174171

175172
```hcl
176173
data "google_project" "project" {
177-
provider = google-beta
178174
}
179175
180176
resource "google_network_management_vpc_flow_logs_config" "subnet-test" {
181-
provider = google-beta
182177
vpc_flow_logs_config_id = "basic-subnet-test-id"
183178
location = "global"
184179
subnet = "projects/${data.google_project.project.number}/regions/us-central1/subnetworks/${google_compute_subnetwork.subnetwork.name}"
185180
}
186181
187182
resource "google_compute_network" "network" {
188-
provider = google-beta
189183
name = "basic-subnet-test-network"
190184
auto_create_subnetworks = false
191185
}
192186
193187
resource "google_compute_subnetwork" "subnetwork" {
194-
provider = google-beta
195188
name = "basic-subnet-test-subnetwork"
196189
ip_cidr_range = "10.2.0.0/16"
197190
region = "us-central1"
@@ -262,11 +255,11 @@ The following arguments are supported:
262255
Traffic will be logged from the VPN Tunnel. Format: projects/{project_id}/regions/{region}/vpnTunnels/{name}
263256

264257
* `subnet` -
265-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
258+
(Optional)
266259
Traffic will be logged from VMs within the subnetwork. Format: projects/{project_id}/regions/{region}/subnetworks/{name}
267260

268261
* `network` -
269-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
262+
(Optional)
270263
Traffic will be logged from VMs, VPN tunnels and Interconnect Attachments within the network. Format: projects/{project_id}/global/networks/{name}
271264

272265
* `labels` -

0 commit comments

Comments
 (0)