Skip to content

Commit 01be346

Browse files
modular-magicianmodular-magician
authored
Ensure that resource name is present in errors about project config. (#4187) (#2680)
Fixes hashicorp/terraform-provider-google#7646. Signed-off-by: Modular Magician <[email protected]>
1 parent 92401df commit 01be346

File tree

160 files changed

+595
-593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+595
-593
lines changed

‎.changelog/4187.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

‎google-beta/resource_access_approval_project_settings.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func resourceAccessApprovalProjectSettingsCreate(d *schema.ResourceData, meta in
153153

154154
project, err := getProject(d, config)
155155
if err != nil {
156-
return err
156+
return fmt.Errorf("Error fetching project for ProjectSettings: %s", err)
157157
}
158158
billingProject = project
159159

@@ -213,7 +213,7 @@ func resourceAccessApprovalProjectSettingsRead(d *schema.ResourceData, meta inte
213213

214214
project, err := getProject(d, config)
215215
if err != nil {
216-
return err
216+
return fmt.Errorf("Error fetching project for ProjectSettings: %s", err)
217217
}
218218
billingProject = project
219219

@@ -258,7 +258,7 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
258258

259259
project, err := getProject(d, config)
260260
if err != nil {
261-
return err
261+
return fmt.Errorf("Error fetching project for ProjectSettings: %s", err)
262262
}
263263
billingProject = project
264264

‎google-beta/resource_active_directory_domain.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func resourceActiveDirectoryDomainCreate(d *schema.ResourceData, meta interface{
160160

161161
project, err := getProject(d, config)
162162
if err != nil {
163-
return err
163+
return fmt.Errorf("Error fetching project for Domain: %s", err)
164164
}
165165
billingProject = project
166166

@@ -225,7 +225,7 @@ func resourceActiveDirectoryDomainRead(d *schema.ResourceData, meta interface{})
225225

226226
project, err := getProject(d, config)
227227
if err != nil {
228-
return err
228+
return fmt.Errorf("Error fetching project for Domain: %s", err)
229229
}
230230
billingProject = project
231231

@@ -279,7 +279,7 @@ func resourceActiveDirectoryDomainUpdate(d *schema.ResourceData, meta interface{
279279

280280
project, err := getProject(d, config)
281281
if err != nil {
282-
return err
282+
return fmt.Errorf("Error fetching project for Domain: %s", err)
283283
}
284284
billingProject = project
285285

@@ -364,7 +364,7 @@ func resourceActiveDirectoryDomainDelete(d *schema.ResourceData, meta interface{
364364

365365
project, err := getProject(d, config)
366366
if err != nil {
367-
return err
367+
return fmt.Errorf("Error fetching project for Domain: %s", err)
368368
}
369369
billingProject = project
370370

‎google-beta/resource_active_directory_domain_trust.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func resourceActiveDirectoryDomainTrustCreate(d *schema.ResourceData, meta inter
160160

161161
project, err := getProject(d, config)
162162
if err != nil {
163-
return err
163+
return fmt.Errorf("Error fetching project for DomainTrust: %s", err)
164164
}
165165
billingProject = project
166166

@@ -243,7 +243,7 @@ func resourceActiveDirectoryDomainTrustRead(d *schema.ResourceData, meta interfa
243243

244244
project, err := getProject(d, config)
245245
if err != nil {
246-
return err
246+
return fmt.Errorf("Error fetching project for DomainTrust: %s", err)
247247
}
248248
billingProject = project
249249

@@ -315,7 +315,7 @@ func resourceActiveDirectoryDomainTrustUpdate(d *schema.ResourceData, meta inter
315315

316316
project, err := getProject(d, config)
317317
if err != nil {
318-
return err
318+
return fmt.Errorf("Error fetching project for DomainTrust: %s", err)
319319
}
320320
billingProject = project
321321

‎google-beta/resource_api_gateway_api.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func resourceApiGatewayApiCreate(d *schema.ResourceData, meta interface{}) error
125125

126126
project, err := getProject(d, config)
127127
if err != nil {
128-
return err
128+
return fmt.Errorf("Error fetching project for Api: %s", err)
129129
}
130130
billingProject = project
131131

@@ -190,7 +190,7 @@ func resourceApiGatewayApiRead(d *schema.ResourceData, meta interface{}) error {
190190

191191
project, err := getProject(d, config)
192192
if err != nil {
193-
return err
193+
return fmt.Errorf("Error fetching project for Api: %s", err)
194194
}
195195
billingProject = project
196196

@@ -238,7 +238,7 @@ func resourceApiGatewayApiUpdate(d *schema.ResourceData, meta interface{}) error
238238

239239
project, err := getProject(d, config)
240240
if err != nil {
241-
return err
241+
return fmt.Errorf("Error fetching project for Api: %s", err)
242242
}
243243
billingProject = project
244244

@@ -313,7 +313,7 @@ func resourceApiGatewayApiDelete(d *schema.ResourceData, meta interface{}) error
313313

314314
project, err := getProject(d, config)
315315
if err != nil {
316-
return err
316+
return fmt.Errorf("Error fetching project for Api: %s", err)
317317
}
318318
billingProject = project
319319

‎google-beta/resource_api_gateway_api_config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func resourceApiGatewayApiConfigCreate(d *schema.ResourceData, meta interface{})
189189

190190
project, err := getProject(d, config)
191191
if err != nil {
192-
return err
192+
return fmt.Errorf("Error fetching project for ApiConfig: %s", err)
193193
}
194194
billingProject = project
195195

@@ -254,7 +254,7 @@ func resourceApiGatewayApiConfigRead(d *schema.ResourceData, meta interface{}) e
254254

255255
project, err := getProject(d, config)
256256
if err != nil {
257-
return err
257+
return fmt.Errorf("Error fetching project for ApiConfig: %s", err)
258258
}
259259
billingProject = project
260260

@@ -302,7 +302,7 @@ func resourceApiGatewayApiConfigUpdate(d *schema.ResourceData, meta interface{})
302302

303303
project, err := getProject(d, config)
304304
if err != nil {
305-
return err
305+
return fmt.Errorf("Error fetching project for ApiConfig: %s", err)
306306
}
307307
billingProject = project
308308

@@ -387,7 +387,7 @@ func resourceApiGatewayApiConfigDelete(d *schema.ResourceData, meta interface{})
387387

388388
project, err := getProject(d, config)
389389
if err != nil {
390-
return err
390+
return fmt.Errorf("Error fetching project for ApiConfig: %s", err)
391391
}
392392
billingProject = project
393393

‎google-beta/resource_api_gateway_gateway.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func resourceApiGatewayGatewayCreate(d *schema.ResourceData, meta interface{}) e
130130

131131
project, err := getProject(d, config)
132132
if err != nil {
133-
return err
133+
return fmt.Errorf("Error fetching project for Gateway: %s", err)
134134
}
135135
billingProject = project
136136

@@ -195,7 +195,7 @@ func resourceApiGatewayGatewayRead(d *schema.ResourceData, meta interface{}) err
195195

196196
project, err := getProject(d, config)
197197
if err != nil {
198-
return err
198+
return fmt.Errorf("Error fetching project for Gateway: %s", err)
199199
}
200200
billingProject = project
201201

@@ -243,7 +243,7 @@ func resourceApiGatewayGatewayUpdate(d *schema.ResourceData, meta interface{}) e
243243

244244
project, err := getProject(d, config)
245245
if err != nil {
246-
return err
246+
return fmt.Errorf("Error fetching project for Gateway: %s", err)
247247
}
248248
billingProject = project
249249

@@ -318,7 +318,7 @@ func resourceApiGatewayGatewayDelete(d *schema.ResourceData, meta interface{}) e
318318

319319
project, err := getProject(d, config)
320320
if err != nil {
321-
return err
321+
return fmt.Errorf("Error fetching project for Gateway: %s", err)
322322
}
323323
billingProject = project
324324

‎google-beta/resource_app_engine_application_url_dispatch_rules.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func resourceAppEngineApplicationUrlDispatchRulesCreate(d *schema.ResourceData,
111111

112112
project, err := getProject(d, config)
113113
if err != nil {
114-
return err
114+
return fmt.Errorf("Error fetching project for ApplicationUrlDispatchRules: %s", err)
115115
}
116116
billingProject = project
117117

@@ -163,7 +163,7 @@ func resourceAppEngineApplicationUrlDispatchRulesRead(d *schema.ResourceData, me
163163

164164
project, err := getProject(d, config)
165165
if err != nil {
166-
return err
166+
return fmt.Errorf("Error fetching project for ApplicationUrlDispatchRules: %s", err)
167167
}
168168
billingProject = project
169169

@@ -199,7 +199,7 @@ func resourceAppEngineApplicationUrlDispatchRulesUpdate(d *schema.ResourceData,
199199

200200
project, err := getProject(d, config)
201201
if err != nil {
202-
return err
202+
return fmt.Errorf("Error fetching project for ApplicationUrlDispatchRules: %s", err)
203203
}
204204
billingProject = project
205205

@@ -260,7 +260,7 @@ func resourceAppEngineApplicationUrlDispatchRulesDelete(d *schema.ResourceData,
260260

261261
project, err := getProject(d, config)
262262
if err != nil {
263-
return err
263+
return fmt.Errorf("Error fetching project for ApplicationUrlDispatchRules: %s", err)
264264
}
265265
billingProject = project
266266

‎google-beta/resource_app_engine_domain_mapping.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func resourceAppEngineDomainMappingCreate(d *schema.ResourceData, meta interface
188188

189189
project, err := getProject(d, config)
190190
if err != nil {
191-
return err
191+
return fmt.Errorf("Error fetching project for DomainMapping: %s", err)
192192
}
193193
billingProject = project
194194

@@ -253,7 +253,7 @@ func resourceAppEngineDomainMappingRead(d *schema.ResourceData, meta interface{}
253253

254254
project, err := getProject(d, config)
255255
if err != nil {
256-
return err
256+
return fmt.Errorf("Error fetching project for DomainMapping: %s", err)
257257
}
258258
billingProject = project
259259

@@ -298,7 +298,7 @@ func resourceAppEngineDomainMappingUpdate(d *schema.ResourceData, meta interface
298298

299299
project, err := getProject(d, config)
300300
if err != nil {
301-
return err
301+
return fmt.Errorf("Error fetching project for DomainMapping: %s", err)
302302
}
303303
billingProject = project
304304

@@ -371,7 +371,7 @@ func resourceAppEngineDomainMappingDelete(d *schema.ResourceData, meta interface
371371

372372
project, err := getProject(d, config)
373373
if err != nil {
374-
return err
374+
return fmt.Errorf("Error fetching project for DomainMapping: %s", err)
375375
}
376376
billingProject = project
377377

‎google-beta/resource_app_engine_firewall_rule.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func resourceAppEngineFirewallRuleCreate(d *schema.ResourceData, meta interface{
130130

131131
project, err := getProject(d, config)
132132
if err != nil {
133-
return err
133+
return fmt.Errorf("Error fetching project for FirewallRule: %s", err)
134134
}
135135
billingProject = project
136136

@@ -174,7 +174,7 @@ func resourceAppEngineFirewallRulePollRead(d *schema.ResourceData, meta interfac
174174

175175
project, err := getProject(d, config)
176176
if err != nil {
177-
return nil, err
177+
return nil, fmt.Errorf("Error fetching project for FirewallRule: %s", err)
178178
}
179179
billingProject = project
180180

@@ -212,7 +212,7 @@ func resourceAppEngineFirewallRuleRead(d *schema.ResourceData, meta interface{})
212212

213213
project, err := getProject(d, config)
214214
if err != nil {
215-
return err
215+
return fmt.Errorf("Error fetching project for FirewallRule: %s", err)
216216
}
217217
billingProject = project
218218

@@ -257,7 +257,7 @@ func resourceAppEngineFirewallRuleUpdate(d *schema.ResourceData, meta interface{
257257

258258
project, err := getProject(d, config)
259259
if err != nil {
260-
return err
260+
return fmt.Errorf("Error fetching project for FirewallRule: %s", err)
261261
}
262262
billingProject = project
263263

@@ -351,7 +351,7 @@ func resourceAppEngineFirewallRuleDelete(d *schema.ResourceData, meta interface{
351351

352352
project, err := getProject(d, config)
353353
if err != nil {
354-
return err
354+
return fmt.Errorf("Error fetching project for FirewallRule: %s", err)
355355
}
356356
billingProject = project
357357

0 commit comments

Comments
 (0)