Skip to content

Commit 85185ce

Browse files
modular-magicianmodular-magician
authored
Stop editing the global config object with new useragent entries (#4123) (#2621)
Signed-off-by: Modular Magician <[email protected]>
1 parent afbf87a commit 85185ce

File tree

199 files changed

+11
-498
lines changed

Some content is hidden

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

199 files changed

+11
-498
lines changed

‎.changelog/4123.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
provider: fixed an issue where the request headers would grow proportionally to the number of resources in a given `terraform apply`
3+
```

‎google-beta/provider_test.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
497497
Steps: []resource.TestStep{
498498
{
499499
Config: testAccProviderMeta_setModuleName(moduleName, randString(t, 10)),
500-
Check: testAccCheckConfigAgentModified(t, moduleName),
501500
},
502501
{
503502
ResourceName: "google_compute_address.default",
@@ -508,16 +507,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
508507
})
509508
}
510509

511-
func testAccCheckConfigAgentModified(t *testing.T, moduleName string) func(s *terraform.State) error {
512-
return func(s *terraform.State) error {
513-
config := googleProviderConfig(t)
514-
if !strings.Contains(config.userAgent, moduleName) {
515-
return fmt.Errorf("expected userAgent to contain provider_meta set module_name")
516-
}
517-
return nil
518-
}
519-
}
520-
521510
func TestAccProviderUserProjectOverride(t *testing.T) {
522511
// Parallel fine-grained resource creation
523512
skipIfVcr(t)

‎google-beta/resource_access_approval_folder_settings.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ func resourceAccessApprovalFolderSettingsUpdate(d *schema.ResourceData, meta int
269269
if err != nil {
270270
return err
271271
}
272-
config.userAgent = userAgent
273272

274273
billingProject := ""
275274

@@ -331,7 +330,6 @@ func resourceAccessApprovalFolderSettingsDelete(d *schema.ResourceData, meta int
331330
if err != nil {
332331
return err
333332
}
334-
config.userAgent = userAgent
335333

336334
obj := make(map[string]interface{})
337335
obj["notificationEmails"] = []string{}

‎google-beta/resource_access_approval_organization_settings.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ func resourceAccessApprovalOrganizationSettingsUpdate(d *schema.ResourceData, me
231231
if err != nil {
232232
return err
233233
}
234-
config.userAgent = userAgent
235234

236235
billingProject := ""
237236

@@ -293,7 +292,6 @@ func resourceAccessApprovalOrganizationSettingsDelete(d *schema.ResourceData, me
293292
if err != nil {
294293
return err
295294
}
296-
config.userAgent = userAgent
297295

298296
obj := make(map[string]interface{})
299297
obj["notificationEmails"] = []string{}

‎google-beta/resource_access_approval_project_settings.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
253253
if err != nil {
254254
return err
255255
}
256-
config.userAgent = userAgent
257256

258257
billingProject := ""
259258

@@ -321,7 +320,6 @@ func resourceAccessApprovalProjectSettingsDelete(d *schema.ResourceData, meta in
321320
if err != nil {
322321
return err
323322
}
324-
config.userAgent = userAgent
325323

326324
obj := make(map[string]interface{})
327325
obj["notificationEmails"] = []string{}

‎google-beta/resource_access_context_manager_access_level.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
432432
if err != nil {
433433
return err
434434
}
435-
config.userAgent = userAgent
436435

437436
billingProject := ""
438437

@@ -527,7 +526,6 @@ func resourceAccessContextManagerAccessLevelDelete(d *schema.ResourceData, meta
527526
if err != nil {
528527
return err
529528
}
530-
config.userAgent = userAgent
531529

532530
billingProject := ""
533531

‎google-beta/resource_access_context_manager_access_level_condition.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ func resourceAccessContextManagerAccessLevelConditionDelete(d *schema.ResourceDa
396396
if err != nil {
397397
return err
398398
}
399-
config.userAgent = userAgent
400399

401400
billingProject := ""
402401

‎google-beta/resource_access_context_manager_access_levels.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ func resourceAccessContextManagerAccessLevelsUpdate(d *schema.ResourceData, meta
383383
if err != nil {
384384
return err
385385
}
386-
config.userAgent = userAgent
387386

388387
billingProject := ""
389388

@@ -432,7 +431,6 @@ func resourceAccessContextManagerAccessLevelsDelete(d *schema.ResourceData, meta
432431
if err != nil {
433432
return err
434433
}
435-
config.userAgent = userAgent
436434

437435
obj := make(map[string]interface{})
438436
obj["accessLevels"] = []string{}

‎google-beta/resource_access_context_manager_access_policy.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ func resourceAccessContextManagerAccessPolicyUpdate(d *schema.ResourceData, meta
208208
if err != nil {
209209
return err
210210
}
211-
config.userAgent = userAgent
212211

213212
billingProject := ""
214213

@@ -268,7 +267,6 @@ func resourceAccessContextManagerAccessPolicyDelete(d *schema.ResourceData, meta
268267
if err != nil {
269268
return err
270269
}
271-
config.userAgent = userAgent
272270

273271
billingProject := ""
274272

‎google-beta/resource_access_context_manager_service_perimeter.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ func resourceAccessContextManagerServicePerimeterUpdate(d *schema.ResourceData,
465465
if err != nil {
466466
return err
467467
}
468-
config.userAgent = userAgent
469468

470469
billingProject := ""
471470

@@ -577,7 +576,6 @@ func resourceAccessContextManagerServicePerimeterDelete(d *schema.ResourceData,
577576
if err != nil {
578577
return err
579578
}
580-
config.userAgent = userAgent
581579

582580
billingProject := ""
583581

0 commit comments

Comments
 (0)