Skip to content

Commit

Permalink
Add error checking to location load in endpoints service (#3781) (#6849)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Jul 23, 2020
1 parent f69fb76 commit c3d9964
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/3781.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
endpoints: Fixed a crash when `google_endpoints_service` is used on a machine without timezone data
```
6 changes: 5 additions & 1 deletion google/resource_endpoints_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,11 @@ func predictServiceId(d *schema.ResourceDiff, meta interface{}) error {
if !d.HasChange("openapi_config") && !d.HasChange("grpc_config") && !d.HasChange("protoc_output_base64") {
return nil
}
loc, _ := time.LoadLocation("America/Los_Angeles")
loc, err := time.LoadLocation("America/Los_Angeles")
if err != nil {
// Timezone data may not be present on some machines, in that case skip
return nil
}
baseDate := time.Now().In(loc).Format("2006-01-02")
oldConfigId := d.Get("config_id").(string)
if match, err := regexp.MatchString(`\d\d\d\d-\d\d-\d\dr\d*`, oldConfigId); !match || err != nil {
Expand Down

0 comments on commit c3d9964

Please sign in to comment.