Skip to content

Commit 3a1254e

Browse files
authored
Add nil check and fix type assertion to flattenCloudSchedulerJobHttpTargetHeaders in google_cloud_scheduler_job (#15128)
1 parent 6506c38 commit 3a1254e

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

mmv1/templates/terraform/custom_flatten/http_headers.tmpl

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,33 @@
1111
limitations under the License.
1212
*/ -}}
1313
func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) (interface{}) {
14-
var headers = v.(map[string]interface{})
14+
if v == nil {
15+
return nil
16+
}
17+
headers, ok := v.(map[string]interface{})
18+
if !ok {
19+
return nil
20+
}
1521
if v, ok := headers["User-Agent"]; ok {
16-
if v.(string) == "AppEngine-Google; (+http://code.google.com/appengine)" {
17-
delete(headers, "User-Agent")
18-
} else if v.(string) == "Google-Cloud-Scheduler" {
19-
delete(headers, "User-Agent")
20-
} else {
21-
headers["User-Agent"] = strings.TrimSpace(strings.Replace(v.(string), "AppEngine-Google; (+http://code.google.com/appengine)","", -1))
22+
if userAgent, ok := v.(string); ok {
23+
if userAgent == "AppEngine-Google; (+http://code.google.com/appengine)" {
24+
delete(headers, "User-Agent")
25+
} else if userAgent == "Google-Cloud-Scheduler" {
26+
delete(headers, "User-Agent")
27+
} else {
28+
headers["User-Agent"] = strings.TrimSpace(strings.Replace(userAgent, "AppEngine-Google; (+http://code.google.com/appengine)","", -1))
29+
}
2230
}
2331
}
2432
if v, ok := headers["Content-Type"]; ok {
25-
if v.(string) == "application/octet-stream" {
26-
delete(headers, "Content-Type")
33+
if contentType, ok := v.(string); ok {
34+
if contentType == "application/octet-stream" {
35+
delete(headers, "Content-Type")
36+
}
2737
}
2838
}
2939
r := regexp.MustCompile(`(X-Google-|X-AppEngine-|Content-Length).*`)
30-
for key := range headers {
40+
for key := range headers {
3141
if r.MatchString(key) {
3242
delete(headers, key)
3343
}

0 commit comments

Comments
 (0)