IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

http-backend: http backend lock error return LockError instead of generic error

Browse Source
This commit is contained in:
Nicolas Vanheuverzwijn 2022-06-16 10:50:51 -04:00 committed by Nicolas Vanheuverzwijn
parent 0d3d95486a
commit bb1c134b94
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/backend/remote-state/http/client.go
View File

@ -100,14 +100,23 @@ func (c *httpClient) Lock(info *statemgr.LockInfo) (string, error) {
defer resp.Body.Close() defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body) body, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", fmt.Errorf("HTTP remote state already locked, failed to read body") return "", &statemgr.LockError{
Info: info,
Err: fmt.Errorf("HTTP remote state already locked, failed to read body"),
}
} }
existing := statemgr.LockInfo{} existing := statemgr.LockInfo{}
err = json.Unmarshal(body, &existing) err = json.Unmarshal(body, &existing)
if err != nil { if err != nil {
return "", fmt.Errorf("HTTP remote state already locked, failed to unmarshal body") return "", &statemgr.LockError{
Info: info,
Err: fmt.Errorf("HTTP remote state already locked, failed to unmarshal body"),
}
}
return "", &statemgr.LockError{
Info: info,
Err: fmt.Errorf("HTTP remote state already locked: ID=%s", existing.ID),
} }
return "", fmt.Errorf("HTTP remote state already locked: ID=%s", existing.ID)
default: default:
return "", fmt.Errorf("Unexpected HTTP response code %d", resp.StatusCode) return "", fmt.Errorf("Unexpected HTTP response code %d", resp.StatusCode)
} }