1
1
// Copyright (c) HashiCorp, Inc.
2
2
// SPDX-License-Identifier: MPL-2.0
3
-
4
- // ----------------------------------------------------------------------------
5
- //
6
- // *** AUTO GENERATED CODE *** Type: MMv1 ***
7
- //
8
- // ----------------------------------------------------------------------------
9
- //
10
- // This file is automatically generated by Magic Modules and manual
11
- // changes will be clobbered when the file is regenerated.
12
- //
13
- // Please read more about how to change this file in
14
- // .github/CONTRIBUTING.md.
15
- //
16
- // ----------------------------------------------------------------------------
17
-
18
3
package datalossprevention
19
4
20
5
import (
21
6
"context"
22
7
"log"
23
8
"strings"
24
- "testing"
25
9
26
- "github.com/hashicorp/terraform-provider-google/google/envvar"
27
10
"github.com/hashicorp/terraform-provider-google/google/sweeper"
28
11
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
29
12
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
@@ -50,21 +33,17 @@ func testSweepDataLossPreventionDiscoveryConfig(region string) error {
50
33
return err
51
34
}
52
35
53
- t := & testing.T {}
54
- billingId := envvar .GetTestBillingAccountFromEnv (t )
55
-
56
36
// Setup variables to replace in list template
57
37
d := & tpgresource.ResourceDataMock {
58
38
FieldsInSchema : map [string ]interface {}{
59
- "project" : config .Project ,
60
- "region" : region ,
61
- "location" : region ,
62
- "zone" : "-" ,
63
- "billing_account" : billingId ,
39
+ "project" : config .Project ,
40
+ "region" : region ,
41
+ "location" : region ,
42
+ "zone" : "-" ,
64
43
},
65
44
}
66
45
67
- listTemplate := strings .Split ("https://dlp.googleapis.com/v2/{{parent }}/discoveryConfigs" , "?" )[0 ]
46
+ listTemplate := strings .Split ("https://dlp.googleapis.com/v2/projects/{{project}}/locations/{{location }}/discoveryConfigs" , "?" )[0 ]
68
47
listUrl , err := tpgresource .ReplaceVars (d , config , listTemplate )
69
48
if err != nil {
70
49
log .Printf ("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s" , err )
@@ -92,23 +71,18 @@ func testSweepDataLossPreventionDiscoveryConfig(region string) error {
92
71
rl := resourceList .([]interface {})
93
72
94
73
log .Printf ("[INFO][SWEEPER_LOG] Found %d items in %s list response." , len (rl ), resourceName )
95
- // Keep count of items that aren't sweepable for logging.
96
- nonPrefixCount := 0
97
74
for _ , ri := range rl {
98
75
obj := ri .(map [string ]interface {})
99
76
if obj ["name" ] == nil {
100
77
log .Printf ("[INFO][SWEEPER_LOG] %s resource name was nil" , resourceName )
101
78
return nil
102
79
}
103
80
81
+ // Note that we do not check for a sweepable prefix here.
82
+ // We can have at most 1 DiscoveryConfig for a storage type in the same project/location, so ensure we delete everything.
104
83
name := tpgresource .GetResourceNameFromSelfLink (obj ["name" ].(string ))
105
- // Skip resources that shouldn't be sweeped
106
- if ! sweeper .IsSweepableTestResource (name ) {
107
- nonPrefixCount ++
108
- continue
109
- }
110
84
111
- deleteTemplate := "https://dlp.googleapis.com/v2/{{parent }}/discoveryConfigs/{{name}}"
85
+ deleteTemplate := "https://dlp.googleapis.com/v2/projects/{{project}}/locations/{{location }}/discoveryConfigs/{{name}}"
112
86
deleteUrl , err := tpgresource .ReplaceVars (d , config , deleteTemplate )
113
87
if err != nil {
114
88
log .Printf ("[INFO][SWEEPER_LOG] error preparing delete url: %s" , err )
@@ -130,10 +104,5 @@ func testSweepDataLossPreventionDiscoveryConfig(region string) error {
130
104
log .Printf ("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s" , resourceName , name )
131
105
}
132
106
}
133
-
134
- if nonPrefixCount > 0 {
135
- log .Printf ("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped." , nonPrefixCount )
136
- }
137
-
138
107
return nil
139
108
}
0 commit comments