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

Tidy up some messages and error paths

Browse source
This commit is contained in:
joeduffy 2017-02-26 11:52:44 -08:00
parent 1bdd24395c
commit 2116d87f7d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/husk.go
View file

@ -137,8 +137,8 @@ func plan(cmd *cobra.Command, args []string, husk tokens.QName, delete bool) *pl
// Read in the deployment information, bailing if an IO error occurs.
dep, old := readDeployment(ctx, husk)
if dep == nil {
sink().Errorf(errors.ErrorInvalidHuskName, husk)
return nil
contract.Assert(!ctx.Diag.Success())
return nil // failure reading the husk information.
}
// If deleting, there is no need to create a new snapshot; otherwise, we will need to compile the package.
@ -247,7 +247,7 @@ func apply(cmd *cobra.Command, args []string, opts applyOptions) {
// TODO: save partial updates if we weren't able to perform the entire planned set of operations.
if opts.Delete {
deleteDeployment(result.Husk)
fmt.Printf("Coconut husk '%v' has been destroyed\n", result.Husk)
fmt.Printf("Coconut husk '%v' has been destroyed!\n", result.Husk)
} else {
contract.Assert(result.New != nil)
saveDeployment(result.Husk, result.New, opts.Output, true /*overwrite*/)
@ -284,10 +284,14 @@ func readDeployment(ctx *resource.Context, husk tokens.QName) (*resource.Deploym
return nil, nil
}
// Now read the whole file into a byte blog.
// Now read the whole file into a byte blob.
b, err := ioutil.ReadFile(file)
if err != nil {
sink().Errorf(errors.ErrorIO, err)
if os.IsNotExist(err) {
sink().Errorf(errors.ErrorInvalidHuskName, husk)
} else {
sink().Errorf(errors.ErrorIO, err)
}
return nil, nil
}