Skip to content

Commit 0f88f91

Browse files
committed
fix errors in beta, pass config.userAgent for tests
1 parent 5cea594 commit 0f88f91

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

third_party/terraform/utils/bootstrap_utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func BootstrapSharedTestNetwork(t *testing.T, testId string) string {
238238
"autoCreateSubnetworks": false,
239239
}
240240

241-
res, err := sendRequestWithTimeout(config, "POST", project, url, "", netObj, 4*time.Minute)
241+
res, err := sendRequestWithTimeout(config, "POST", project, url, config.userAgent, netObj, 4*time.Minute)
242242
if err != nil {
243243
t.Fatalf("Error bootstrapping shared test network %q: %s", networkName, err)
244244
}

third_party/terraform/utils/stateful_mig_polling.go.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func resourceComputePerInstanceConfigPollRead(d *schema.ResourceData, meta inter
1616
config := meta.(*Config)
1717
userAgent, err := generateUserAgentString(d, config.userAgent)
1818
if err != nil {
19-
return err
19+
return nil, err
2020
}
2121

2222
url, err := replaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/zones/{{zone}}/instanceGroupManagers/{{instance_group_manager}}/listPerInstanceConfigs")
@@ -48,7 +48,7 @@ func resourceComputeRegionPerInstanceConfigPollRead(d *schema.ResourceData, meta
4848
config := meta.(*Config)
4949
userAgent, err := generateUserAgentString(d, config.userAgent)
5050
if err != nil {
51-
return err
51+
return nil, err
5252
}
5353

5454
url, err := replaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/regions/{{region}}/instanceGroupManagers/{{region_instance_group_manager}}/listPerInstanceConfigs")
@@ -84,7 +84,7 @@ func findInstanceName(d *schema.ResourceData, config *Config) (string, error) {
8484

8585
userAgent, err := generateUserAgentString(d, config.userAgent)
8686
if err != nil {
87-
return err
87+
return "", err
8888
}
8989

9090
project, err := getProject(d, config)

0 commit comments

Comments
 (0)