maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4476 from jaxxstorm/io-log-messaging

Browse source 
Change the wording of some IO errors
This commit is contained in:
Lee Briggs 2020-04-24 08:45:26 -07:00 committed by GitHub
parent 090f390d7b e74f797dbd
commit 043f5d87d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/backend/filestate/backend.go
View file

@ -180,7 +180,7 @@ func massageBlobPath(path string) (string, error) {
// For file:// backend, ensure a relative path is resolved. fileblob only supports absolute paths.
path, err := filepath.Abs(path)
if err != nil {
return "", errors.Wrap(err, "An IO error occurred during the current operation")
return "", errors.Wrap(err, "An IO error occurred while building the absolute path")
}
// Using example from https://godoc.org/gocloud.dev/blob/fileblob#example-package--OpenBucket

6
pkg/backend/filestate/state.go
View file

@ -177,7 +177,7 @@ func (b *localBackend) saveStack(name tokens.QName, snap *deploy.Snapshot, sm se
}
byts, err := m.Marshal(chk)
if err != nil {
return "", errors.Wrap(err, "An IO error occurred during the current operation")
return "", errors.Wrap(err, "An IO error occurred while marshalling the checkpoint")
}
// Back up the existing file if it already exists.
@ -185,7 +185,7 @@ func (b *localBackend) saveStack(name tokens.QName, snap *deploy.Snapshot, sm se
// And now write out the new snapshot file, overwriting that location.
if err = b.bucket.WriteAll(context.TODO(), file, byts, nil); err != nil {
return "", errors.Wrap(err, "An IO error occurred during the current operation")
return "", errors.Wrap(err, "An IO error occurred while writing the new snapshot file")
}
logging.V(7).Infof("Saved stack %s checkpoint to: %s (backup=%s)", name, file, bck)
@ -193,7 +193,7 @@ func (b *localBackend) saveStack(name tokens.QName, snap *deploy.Snapshot, sm se
// And if we are retaining historical checkpoint information, write it out again
if cmdutil.IsTruthy(os.Getenv("PULUMI_RETAIN_CHECKPOINTS")) {
if err = b.bucket.WriteAll(context.TODO(), fmt.Sprintf("%v.%v", file, time.Now().UnixNano()), byts, nil); err != nil {
return "", errors.Wrap(err, "An IO error occurred during the current operation")
return "", errors.Wrap(err, "An IO error occurred while writing the new snapshot file")
}
}