Merge pull request #4745 from hashicorp/b-lifecycle-keys

config: validate lifecycle keys [GH-4413]
This commit is contained in:
Paul Hinze 2016-01-19 18:24:54 -06:00
commit 47b521ebaf
3 changed files with 50 additions and 0 deletions

View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/hcl" "github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/hcl/hcl/ast"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
@ -533,6 +534,13 @@ func loadResourcesHcl(list *ast.ObjectList) ([]*Resource, error) {
// destroying the existing instance // destroying the existing instance
var lifecycle ResourceLifecycle var lifecycle ResourceLifecycle
if o := listVal.Filter("lifecycle"); len(o.Items) > 0 { if o := listVal.Filter("lifecycle"); len(o.Items) > 0 {
// Check for invalid keys
valid := []string{"create_before_destroy", "ignore_changes", "prevent_destroy"}
if err := checkHCLKeys(o.Items[0].Val, valid); err != nil {
return nil, multierror.Prefix(err, fmt.Sprintf(
"%s[%s]:", t, k))
}
var raw map[string]interface{} var raw map[string]interface{}
if err = hcl.DecodeObject(&raw, o.Items[0].Val); err != nil { if err = hcl.DecodeObject(&raw, o.Items[0].Val); err != nil {
return nil, fmt.Errorf( return nil, fmt.Errorf(
@ -654,3 +662,31 @@ func hclObjectMap(os *hclobj.Object) map[string]ast.ListNode {
return objects return objects
} }
*/ */
func checkHCLKeys(node ast.Node, valid []string) error {
var list *ast.ObjectList
switch n := node.(type) {
case *ast.ObjectList:
list = n
case *ast.ObjectType:
list = n.List
default:
return fmt.Errorf("cannot check HCL keys of type %T", n)
}
validMap := make(map[string]struct{}, len(valid))
for _, v := range valid {
validMap[v] = struct{}{}
}
var result error
for _, item := range list.Items {
key := item.Keys[0].Token.Value().(string)
if _, ok := validMap[key]; !ok {
result = multierror.Append(result, fmt.Errorf(
"invalid key: %s", key))
}
}
return result
}

View File

@ -45,6 +45,15 @@ func TestLoadFile_badType(t *testing.T) {
} }
} }
func TestLoadFile_lifecycleKeyCheck(t *testing.T) {
_, err := LoadFile(filepath.Join(fixtureDir, "lifecycle_cbd_typo.tf"))
if err == nil {
t.Fatal("should have error")
}
t.Logf("err: %s", err)
}
func TestLoadFile_resourceArityMistake(t *testing.T) { func TestLoadFile_resourceArityMistake(t *testing.T) {
_, err := LoadFile(filepath.Join(fixtureDir, "resource-arity-mistake.tf")) _, err := LoadFile(filepath.Join(fixtureDir, "resource-arity-mistake.tf"))
if err == nil { if err == nil {

View File

@ -0,0 +1,5 @@
resource "foo" "bar" {
lifecycle {
create_before_destroyy = false
}
}