Skip to content

Commit 815e532

Browse files
modular-magicianmodular-magician
authored
Revert "Generate DCL tests to service packages (#8257)" (#8340) (#15169)
This reverts commit c6ecf9c. Signed-off-by: Modular Magician <[email protected]>
1 parent c7a835f commit 815e532

File tree

31 files changed

+228
-225
lines changed

31 files changed

+228
-225
lines changed

‎.changelog/8340.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/services/apikeys/resource_apikeys_key_generated_test.go renamed to ‎google/resource_apikeys_key_generated_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//
1717
// ----------------------------------------------------------------------------
1818

19-
package apikeys_test
19+
package google
2020

2121
import (
2222
"context"
@@ -39,12 +39,12 @@ func TestAccApikeysKey_AndroidKey(t *testing.T) {
3939
context := map[string]interface{}{
4040
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
4141
"org_id": envvar.GetTestOrgFromEnv(t),
42-
"random_suffix": acctest.RandString(t, 10),
42+
"random_suffix": RandString(t, 10),
4343
}
4444

45-
acctest.VcrTest(t, resource.TestCase{
45+
VcrTest(t, resource.TestCase{
4646
PreCheck: func() { acctest.AccTestPreCheck(t) },
47-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
4848
CheckDestroy: testAccCheckApikeysKeyDestroyProducer(t),
4949
Steps: []resource.TestStep{
5050
{
@@ -72,12 +72,12 @@ func TestAccApikeysKey_BasicKey(t *testing.T) {
7272
context := map[string]interface{}{
7373
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
7474
"org_id": envvar.GetTestOrgFromEnv(t),
75-
"random_suffix": acctest.RandString(t, 10),
75+
"random_suffix": RandString(t, 10),
7676
}
7777

78-
acctest.VcrTest(t, resource.TestCase{
78+
VcrTest(t, resource.TestCase{
7979
PreCheck: func() { acctest.AccTestPreCheck(t) },
80-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
80+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
8181
CheckDestroy: testAccCheckApikeysKeyDestroyProducer(t),
8282
Steps: []resource.TestStep{
8383
{
@@ -105,12 +105,12 @@ func TestAccApikeysKey_IosKey(t *testing.T) {
105105
context := map[string]interface{}{
106106
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
107107
"org_id": envvar.GetTestOrgFromEnv(t),
108-
"random_suffix": acctest.RandString(t, 10),
108+
"random_suffix": RandString(t, 10),
109109
}
110110

111-
acctest.VcrTest(t, resource.TestCase{
111+
VcrTest(t, resource.TestCase{
112112
PreCheck: func() { acctest.AccTestPreCheck(t) },
113-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
113+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
114114
CheckDestroy: testAccCheckApikeysKeyDestroyProducer(t),
115115
Steps: []resource.TestStep{
116116
{
@@ -138,12 +138,12 @@ func TestAccApikeysKey_MinimalKey(t *testing.T) {
138138
context := map[string]interface{}{
139139
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
140140
"org_id": envvar.GetTestOrgFromEnv(t),
141-
"random_suffix": acctest.RandString(t, 10),
141+
"random_suffix": RandString(t, 10),
142142
}
143143

144-
acctest.VcrTest(t, resource.TestCase{
144+
VcrTest(t, resource.TestCase{
145145
PreCheck: func() { acctest.AccTestPreCheck(t) },
146-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
146+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
147147
CheckDestroy: testAccCheckApikeysKeyDestroyProducer(t),
148148
Steps: []resource.TestStep{
149149
{
@@ -163,12 +163,12 @@ func TestAccApikeysKey_ServerKey(t *testing.T) {
163163
context := map[string]interface{}{
164164
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
165165
"org_id": envvar.GetTestOrgFromEnv(t),
166-
"random_suffix": acctest.RandString(t, 10),
166+
"random_suffix": RandString(t, 10),
167167
}
168168

169-
acctest.VcrTest(t, resource.TestCase{
169+
VcrTest(t, resource.TestCase{
170170
PreCheck: func() { acctest.AccTestPreCheck(t) },
171-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
171+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
172172
CheckDestroy: testAccCheckApikeysKeyDestroyProducer(t),
173173
Steps: []resource.TestStep{
174174
{
@@ -457,7 +457,7 @@ func testAccCheckApikeysKeyDestroyProducer(t *testing.T) func(s *terraform.State
457457
continue
458458
}
459459

460-
config := acctest.GoogleProviderConfig(t)
460+
config := GoogleProviderConfig(t)
461461

462462
billingProject := ""
463463
if config.BillingProject != "" {

‎google/services/assuredworkloads/resource_assured_workloads_workload_generated_test.go renamed to ‎google/resource_assured_workloads_workload_generated_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//
1717
// ----------------------------------------------------------------------------
1818

19-
package assuredworkloads_test
19+
package google
2020

2121
import (
2222
"context"
@@ -40,12 +40,12 @@ func TestAccAssuredWorkloadsWorkload_BasicHandWritten(t *testing.T) {
4040
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
4141
"org_id": envvar.GetTestOrgFromEnv(t),
4242
"region": envvar.GetTestRegionFromEnv(),
43-
"random_suffix": acctest.RandString(t, 10),
43+
"random_suffix": RandString(t, 10),
4444
}
4545

46-
acctest.VcrTest(t, resource.TestCase{
46+
VcrTest(t, resource.TestCase{
4747
PreCheck: func() { acctest.AccTestPreCheck(t) },
48-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
48+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
4949
CheckDestroy: testAccCheckAssuredWorkloadsWorkloadDestroyProducer(t),
5050
Steps: []resource.TestStep{
5151
{
@@ -76,12 +76,12 @@ func TestAccAssuredWorkloadsWorkload_FullHandWritten(t *testing.T) {
7676
"billing_acct": envvar.GetTestBillingAccountFromEnv(t),
7777
"org_id": envvar.GetTestOrgFromEnv(t),
7878
"region": envvar.GetTestRegionFromEnv(),
79-
"random_suffix": acctest.RandString(t, 10),
79+
"random_suffix": RandString(t, 10),
8080
}
8181

82-
acctest.VcrTest(t, resource.TestCase{
82+
VcrTest(t, resource.TestCase{
8383
PreCheck: func() { acctest.AccTestPreCheck(t) },
84-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
84+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
8585
CheckDestroy: testAccCheckAssuredWorkloadsWorkloadDestroyProducer(t),
8686
Steps: []resource.TestStep{
8787
{
@@ -172,7 +172,7 @@ func testAccCheckAssuredWorkloadsWorkloadDestroyProducer(t *testing.T) func(s *t
172172
continue
173173
}
174174

175-
config := acctest.GoogleProviderConfig(t)
175+
config := GoogleProviderConfig(t)
176176

177177
billingProject := ""
178178
if config.BillingProject != "" {

‎google/services/bigqueryreservation/resource_bigquery_reservation_assignment_generated_test.go renamed to ‎google/resource_bigquery_reservation_assignment_generated_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//
1717
// ----------------------------------------------------------------------------
1818

19-
package bigqueryreservation_test
19+
package google
2020

2121
import (
2222
"context"
@@ -38,12 +38,12 @@ func TestAccBigqueryReservationAssignment_BasicHandWritten(t *testing.T) {
3838

3939
context := map[string]interface{}{
4040
"project_name": envvar.GetTestProjectFromEnv(),
41-
"random_suffix": acctest.RandString(t, 10),
41+
"random_suffix": RandString(t, 10),
4242
}
4343

44-
acctest.VcrTest(t, resource.TestCase{
44+
VcrTest(t, resource.TestCase{
4545
PreCheck: func() { acctest.AccTestPreCheck(t) },
46-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
46+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
4747
CheckDestroy: testAccCheckBigqueryReservationAssignmentDestroyProducer(t),
4848
Steps: []resource.TestStep{
4949
{
@@ -87,7 +87,7 @@ func testAccCheckBigqueryReservationAssignmentDestroyProducer(t *testing.T) func
8787
continue
8888
}
8989

90-
config := acctest.GoogleProviderConfig(t)
90+
config := GoogleProviderConfig(t)
9191

9292
billingProject := ""
9393
if config.BillingProject != "" {

‎google/services/cloudbuildv2/resource_cloudbuildv2_connection_generated_test.go renamed to ‎google/resource_cloudbuildv2_connection_generated_test.go

+32-32
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//
1717
// ----------------------------------------------------------------------------
1818

19-
package cloudbuildv2_test
19+
package google
2020

2121
import (
2222
"context"
@@ -39,12 +39,12 @@ func TestAccCloudbuildv2Connection_GheCompleteConnection(t *testing.T) {
3939
context := map[string]interface{}{
4040
"project_name": envvar.GetTestProjectFromEnv(),
4141
"region": envvar.GetTestRegionFromEnv(),
42-
"random_suffix": acctest.RandString(t, 10),
42+
"random_suffix": RandString(t, 10),
4343
}
4444

45-
acctest.VcrTest(t, resource.TestCase{
45+
VcrTest(t, resource.TestCase{
4646
PreCheck: func() { acctest.AccTestPreCheck(t) },
47-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
4848
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
4949
Steps: []resource.TestStep{
5050
{
@@ -64,12 +64,12 @@ func TestAccCloudbuildv2Connection_GheConnection(t *testing.T) {
6464
context := map[string]interface{}{
6565
"project_name": envvar.GetTestProjectFromEnv(),
6666
"region": envvar.GetTestRegionFromEnv(),
67-
"random_suffix": acctest.RandString(t, 10),
67+
"random_suffix": RandString(t, 10),
6868
}
6969

70-
acctest.VcrTest(t, resource.TestCase{
70+
VcrTest(t, resource.TestCase{
7171
PreCheck: func() { acctest.AccTestPreCheck(t) },
72-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
72+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
7373
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
7474
Steps: []resource.TestStep{
7575
{
@@ -97,12 +97,12 @@ func TestAccCloudbuildv2Connection_GhePrivConnection(t *testing.T) {
9797
context := map[string]interface{}{
9898
"project_name": envvar.GetTestProjectFromEnv(),
9999
"region": envvar.GetTestRegionFromEnv(),
100-
"random_suffix": acctest.RandString(t, 10),
100+
"random_suffix": RandString(t, 10),
101101
}
102102

103-
acctest.VcrTest(t, resource.TestCase{
103+
VcrTest(t, resource.TestCase{
104104
PreCheck: func() { acctest.AccTestPreCheck(t) },
105-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
105+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
106106
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
107107
Steps: []resource.TestStep{
108108
{
@@ -122,12 +122,12 @@ func TestAccCloudbuildv2Connection_GhePrivUpdateConnection(t *testing.T) {
122122
context := map[string]interface{}{
123123
"project_name": envvar.GetTestProjectFromEnv(),
124124
"region": envvar.GetTestRegionFromEnv(),
125-
"random_suffix": acctest.RandString(t, 10),
125+
"random_suffix": RandString(t, 10),
126126
}
127127

128-
acctest.VcrTest(t, resource.TestCase{
128+
VcrTest(t, resource.TestCase{
129129
PreCheck: func() { acctest.AccTestPreCheck(t) },
130-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
130+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
131131
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
132132
Steps: []resource.TestStep{
133133
{
@@ -155,12 +155,12 @@ func TestAccCloudbuildv2Connection_GithubConnection(t *testing.T) {
155155
context := map[string]interface{}{
156156
"project_name": envvar.GetTestProjectFromEnv(),
157157
"region": envvar.GetTestRegionFromEnv(),
158-
"random_suffix": acctest.RandString(t, 10),
158+
"random_suffix": RandString(t, 10),
159159
}
160160

161-
acctest.VcrTest(t, resource.TestCase{
161+
VcrTest(t, resource.TestCase{
162162
PreCheck: func() { acctest.AccTestPreCheck(t) },
163-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
163+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
164164
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
165165
Steps: []resource.TestStep{
166166
{
@@ -187,12 +187,12 @@ func TestAccCloudbuildv2Connection_GitlabConnection(t *testing.T) {
187187

188188
context := map[string]interface{}{
189189
"project_name": envvar.GetTestProjectFromEnv(),
190-
"random_suffix": acctest.RandString(t, 10),
190+
"random_suffix": RandString(t, 10),
191191
}
192192

193-
acctest.VcrTest(t, resource.TestCase{
193+
VcrTest(t, resource.TestCase{
194194
PreCheck: func() { acctest.AccTestPreCheck(t) },
195-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
195+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
196196
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
197197
Steps: []resource.TestStep{
198198
{
@@ -211,12 +211,12 @@ func TestAccCloudbuildv2Connection_GleConnection(t *testing.T) {
211211

212212
context := map[string]interface{}{
213213
"project_name": envvar.GetTestProjectFromEnv(),
214-
"random_suffix": acctest.RandString(t, 10),
214+
"random_suffix": RandString(t, 10),
215215
}
216216

217-
acctest.VcrTest(t, resource.TestCase{
217+
VcrTest(t, resource.TestCase{
218218
PreCheck: func() { acctest.AccTestPreCheck(t) },
219-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
219+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
220220
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
221221
Steps: []resource.TestStep{
222222
{
@@ -243,12 +243,12 @@ func TestAccCloudbuildv2Connection_GleOldConnection(t *testing.T) {
243243

244244
context := map[string]interface{}{
245245
"project_name": envvar.GetTestProjectFromEnv(),
246-
"random_suffix": acctest.RandString(t, 10),
246+
"random_suffix": RandString(t, 10),
247247
}
248248

249-
acctest.VcrTest(t, resource.TestCase{
249+
VcrTest(t, resource.TestCase{
250250
PreCheck: func() { acctest.AccTestPreCheck(t) },
251-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
251+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
252252
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
253253
Steps: []resource.TestStep{
254254
{
@@ -275,12 +275,12 @@ func TestAccCloudbuildv2Connection_GlePrivConnection(t *testing.T) {
275275

276276
context := map[string]interface{}{
277277
"project_name": envvar.GetTestProjectFromEnv(),
278-
"random_suffix": acctest.RandString(t, 10),
278+
"random_suffix": RandString(t, 10),
279279
}
280280

281-
acctest.VcrTest(t, resource.TestCase{
281+
VcrTest(t, resource.TestCase{
282282
PreCheck: func() { acctest.AccTestPreCheck(t) },
283-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
283+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
284284
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
285285
Steps: []resource.TestStep{
286286
{
@@ -299,12 +299,12 @@ func TestAccCloudbuildv2Connection_GlePrivUpdateConnection(t *testing.T) {
299299

300300
context := map[string]interface{}{
301301
"project_name": envvar.GetTestProjectFromEnv(),
302-
"random_suffix": acctest.RandString(t, 10),
302+
"random_suffix": RandString(t, 10),
303303
}
304304

305-
acctest.VcrTest(t, resource.TestCase{
305+
VcrTest(t, resource.TestCase{
306306
PreCheck: func() { acctest.AccTestPreCheck(t) },
307-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
307+
ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
308308
CheckDestroy: testAccCheckCloudbuildv2ConnectionDestroyProducer(t),
309309
Steps: []resource.TestStep{
310310
{
@@ -750,7 +750,7 @@ func testAccCheckCloudbuildv2ConnectionDestroyProducer(t *testing.T) func(s *ter
750750
continue
751751
}
752752

753-
config := acctest.GoogleProviderConfig(t)
753+
config := GoogleProviderConfig(t)
754754

755755
billingProject := ""
756756
if config.BillingProject != "" {

0 commit comments

Comments
 (0)