Merge pull request #200 from hashicorp/f-hcl

Replace C dep with HCL

builtin/providers/aws/resource_aws_db_instance_test.go

@@ -159,6 +159,6 @@ resource "aws_db_instance" "bar" {
 
 	skip_final_snapshot = true
 
-	security_group_names = [${aws_db_security_group.bar.name}]
+	security_group_names = ["${aws_db_security_group.bar.name}"]
 }
 `

config/config.go

@@ -127,6 +127,7 @@ func (c *Config) Validate() error {
 		}
 
 		w := &interpolationWalker{F: fn}
+		if v.Default != nil {
 			if err := reflectwalk.Walk(v.Default, w); err == nil {
 				if interp {
 					errs = append(errs, fmt.Errorf(
@@ -135,6 +136,7 @@ func (c *Config) Validate() error {
 				}
 			}
 		}
+	}
 
 	// Check for references to user variables that do not actually
 	// exist and record those errors.

config/config_test.go

@@ -161,7 +161,7 @@ func TestVariableDefaultsMap(t *testing.T) {
 func testConfig(t *testing.T, name string) *Config {
 	c, err := Load(filepath.Join(fixtureDir, name, "main.tf"))
 	if err != nil {
-		t.Fatalf("err: %s", err)
+		t.Fatalf("file: %s\n\nerr: %s", name, err)
 	}
 
 	return c

config/import_tree.go

@@ -36,7 +36,7 @@ func loadTree(root string) (*importTree, error) {
 	case ".tf":
 		fallthrough
 	case ".tf.json":
-		f = loadFileLibucl
+		f = loadFileHcl
 	default:
 	}
 

config/loader_hcl.go

@@ -0,0 +1,498 @@
+package config
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"github.com/hashicorp/hcl"
+	hclobj "github.com/hashicorp/hcl/hcl"
+)
+
+// hclConfigurable is an implementation of configurable that knows
+// how to turn HCL configuration into a *Config object.
+type hclConfigurable struct {
+	File   string
+	Object *hclobj.Object
+}
+
+func (t *hclConfigurable) Config() (*Config, error) {
+	validKeys := map[string]struct{}{
+		"output":   struct{}{},
+		"provider": struct{}{},
+		"resource": struct{}{},
+		"variable": struct{}{},
+	}
+
+	type hclVariable struct {
+		Default     interface{}
+		Description string
+		Fields      []string `hcl:",decodedFields"`
+	}
+
+	var rawConfig struct {
+		Variable map[string]*hclVariable
+	}
+
+	if err := hcl.DecodeObject(&rawConfig, t.Object); err != nil {
+		return nil, err
+	}
+
+	// Start building up the actual configuration. We start with
+	// variables.
+	// TODO(mitchellh): Make function like loadVariablesHcl so that
+	// duplicates aren't overriden
+	config := new(Config)
+	if len(rawConfig.Variable) > 0 {
+		config.Variables = make([]*Variable, 0, len(rawConfig.Variable))
+		for k, v := range rawConfig.Variable {
+			// Defaults turn into a slice of map[string]interface{} and
+			// we need to make sure to convert that down into the
+			// proper type for Config.
+			if ms, ok := v.Default.([]map[string]interface{}); ok {
+				def := make(map[string]interface{})
+				for _, m := range ms {
+					for k, v := range m {
+						def[k] = v
+					}
+				}
+
+				v.Default = def
+			}
+
+			newVar := &Variable{
+				Name:        k,
+				Default:     v.Default,
+				Description: v.Description,
+			}
+
+			config.Variables = append(config.Variables, newVar)
+		}
+	}
+
+	// Build the provider configs
+	if providers := t.Object.Get("provider", false); providers != nil {
+		var err error
+		config.ProviderConfigs, err = loadProvidersHcl(providers)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Build the resources
+	if resources := t.Object.Get("resource", false); resources != nil {
+		var err error
+		config.Resources, err = loadResourcesHcl(resources)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Build the outputs
+	if outputs := t.Object.Get("output", false); outputs != nil {
+		var err error
+		config.Outputs, err = loadOutputsHcl(outputs)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Check for invalid keys
+	for _, elem := range t.Object.Elem(true) {
+		k := elem.Key
+		if _, ok := validKeys[k]; ok {
+			continue
+		}
+
+		config.unknownKeys = append(config.unknownKeys, k)
+	}
+
+	return config, nil
+}
+
+// loadFileHcl is a fileLoaderFunc that knows how to read HCL
+// files and turn them into hclConfigurables.
+func loadFileHcl(root string) (configurable, []string, error) {
+	var obj *hclobj.Object = nil
+
+	// Read the HCL file and prepare for parsing
+	d, err := ioutil.ReadFile(root)
+	if err != nil {
+		return nil, nil, fmt.Errorf(
+			"Error reading %s: %s", root, err)
+	}
+
+	// Parse it
+	obj, err = hcl.Parse(string(d))
+	if err != nil {
+		return nil, nil, fmt.Errorf(
+			"Error parsing %s: %s", root, err)
+	}
+
+	// Start building the result
+	result := &hclConfigurable{
+		File:   root,
+		Object: obj,
+	}
+
+	// Dive in, find the imports. This is disabled for now since
+	// imports were removed prior to Terraform 0.1. The code is
+	// remaining here commented for historical purposes.
+	/*
+		imports := obj.Get("import")
+		if imports == nil {
+			result.Object.Ref()
+			return result, nil, nil
+		}
+
+		if imports.Type() != libucl.ObjectTypeString {
+			imports.Close()
+
+			return nil, nil, fmt.Errorf(
+				"Error in %s: all 'import' declarations should be in the format\n"+
+					"`import \"foo\"` (Got type %s)",
+				root,
+				imports.Type())
+		}
+
+		// Gather all the import paths
+		importPaths := make([]string, 0, imports.Len())
+		iter := imports.Iterate(false)
+		for imp := iter.Next(); imp != nil; imp = iter.Next() {
+			path := imp.ToString()
+			if !filepath.IsAbs(path) {
+				// Relative paths are relative to the Terraform file itself
+				dir := filepath.Dir(root)
+				path = filepath.Join(dir, path)
+			}
+
+			importPaths = append(importPaths, path)
+			imp.Close()
+		}
+		iter.Close()
+		imports.Close()
+
+		result.Object.Ref()
+	*/
+
+	return result, nil, nil
+}
+
+// LoadOutputsHcl recurses into the given HCL object and turns
+// it into a mapping of outputs.
+func loadOutputsHcl(os *hclobj.Object) ([]*Output, error) {
+	objects := make(map[string]*hclobj.Object)
+
+	// Iterate over all the "output" blocks and get the keys along with
+	// their raw configuration objects. We'll parse those later.
+	for _, o1 := range os.Elem(false) {
+		for _, o2 := range o1.Elem(true) {
+			objects[o2.Key] = o2
+		}
+	}
+
+	if len(objects) == 0 {
+		return nil, nil
+	}
+
+	// Go through each object and turn it into an actual result.
+	result := make([]*Output, 0, len(objects))
+	for n, o := range objects {
+		var config map[string]interface{}
+
+		if err := hcl.DecodeObject(&config, o); err != nil {
+			return nil, err
+		}
+
+		rawConfig, err := NewRawConfig(config)
+		if err != nil {
+			return nil, fmt.Errorf(
+				"Error reading config for output %s: %s",
+				n,
+				err)
+		}
+
+		result = append(result, &Output{
+			Name:      n,
+			RawConfig: rawConfig,
+		})
+	}
+
+	return result, nil
+}
+
+// LoadProvidersHcl recurses into the given HCL object and turns
+// it into a mapping of provider configs.
+func loadProvidersHcl(os *hclobj.Object) ([]*ProviderConfig, error) {
+	objects := make(map[string]*hclobj.Object)
+
+	// Iterate over all the "provider" blocks and get the keys along with
+	// their raw configuration objects. We'll parse those later.
+	for _, o1 := range os.Elem(false) {
+		for _, o2 := range o1.Elem(true) {
+			objects[o2.Key] = o2
+		}
+	}
+
+	if len(objects) == 0 {
+		return nil, nil
+	}
+
+	// Go through each object and turn it into an actual result.
+	result := make([]*ProviderConfig, 0, len(objects))
+	for n, o := range objects {
+		var config map[string]interface{}
+
+		if err := hcl.DecodeObject(&config, o); err != nil {
+			return nil, err
+		}
+
+		rawConfig, err := NewRawConfig(config)
+		if err != nil {
+			return nil, fmt.Errorf(
+				"Error reading config for provider config %s: %s",
+				n,
+				err)
+		}
+
+		result = append(result, &ProviderConfig{
+			Name:      n,
+			RawConfig: rawConfig,
+		})
+	}
+
+	return result, nil
+}
+
+// Given a handle to a HCL object, this recurses into the structure
+// and pulls out a list of resources.
+//
+// The resulting resources may not be unique, but each resource
+// represents exactly one resource definition in the HCL configuration.
+// We leave it up to another pass to merge them together.
+func loadResourcesHcl(os *hclobj.Object) ([]*Resource, error) {
+	var allTypes []*hclobj.Object
+
+	// HCL object iteration is really nasty. Below is likely to make
+	// no sense to anyone approaching this code. Luckily, it is very heavily
+	// tested. If working on a bug fix or feature, we recommend writing a
+	// test first then doing whatever you want to the code below. If you
+	// break it, the tests will catch it. Likewise, if you change this,
+	// MAKE SURE you write a test for your change, because its fairly impossible
+	// to reason about this mess.
+	//
+	// Functionally, what the code does below is get the libucl.Objects
+	// for all the TYPES, such as "aws_security_group".
+	for _, o1 := range os.Elem(false) {
+		// Iterate the inner to get the list of types
+		for _, o2 := range o1.Elem(true) {
+			// Iterate all of this type to get _all_ the types
+			for _, o3 := range o2.Elem(false) {
+				allTypes = append(allTypes, o3)
+			}
+		}
+	}
+
+	// Where all the results will go
+	var result []*Resource
+
+	// Now go over all the types and their children in order to get
+	// all of the actual resources.
+	for _, t := range allTypes {
+		for _, obj := range t.Elem(true) {
+			k := obj.Key
+
+			var config map[string]interface{}
+			if err := hcl.DecodeObject(&config, obj); err != nil {
+				return nil, fmt.Errorf(
+					"Error reading config for %s[%s]: %s",
+					t,
+					k,
+					err)
+			}
+
+			// Remove the fields we handle specially
+			delete(config, "connection")
+			delete(config, "count")
+			delete(config, "depends_on")
+			delete(config, "provisioner")
+
+			rawConfig, err := NewRawConfig(config)
+			if err != nil {
+				return nil, fmt.Errorf(
+					"Error reading config for %s[%s]: %s",
+					t,
+					k,
+					err)
+			}
+
+			// If we have a count, then figure it out
+			var count int = 1
+			if o := obj.Get("count", false); o != nil {
+				err = hcl.DecodeObject(&count, o)
+				if err != nil {
+					return nil, fmt.Errorf(
+						"Error parsing count for %s[%s]: %s",
+						t,
+						k,
+						err)
+				}
+			}
+
+			// If we have depends fields, then add those in
+			var dependsOn []string
+			if o := obj.Get("depends_on", false); o != nil {
+				err := hcl.DecodeObject(&dependsOn, o)
+				if err != nil {
+					return nil, fmt.Errorf(
+						"Error reading depends_on for %s[%s]: %s",
+						t,
+						k,
+						err)
+				}
+			}
+
+			// If we have connection info, then parse those out
+			var connInfo map[string]interface{}
+			if o := obj.Get("connection", false); o != nil {
+				err := hcl.DecodeObject(&connInfo, o)
+				if err != nil {
+					return nil, fmt.Errorf(
+						"Error reading connection info for %s[%s]: %s",
+						t,
+						k,
+						err)
+				}
+			}
+
+			// If we have provisioners, then parse those out
+			var provisioners []*Provisioner
+			if os := obj.Get("provisioner", false); os != nil {
+				var err error
+				provisioners, err = loadProvisionersHcl(os, connInfo)
+				if err != nil {
+					return nil, fmt.Errorf(
+						"Error reading provisioners for %s[%s]: %s",
+						t,
+						k,
+						err)
+				}
+			}
+
+			result = append(result, &Resource{
+				Name:         k,
+				Type:         t.Key,
+				Count:        count,
+				RawConfig:    rawConfig,
+				Provisioners: provisioners,
+				DependsOn:    dependsOn,
+			})
+		}
+	}
+
+	return result, nil
+}
+
+func loadProvisionersHcl(os *hclobj.Object, connInfo map[string]interface{}) ([]*Provisioner, error) {
+	pos := make([]*hclobj.Object, 0, int(os.Len()))
+
+	// Accumulate all the actual provisioner configuration objects. We
+	// have to iterate twice here:
+	//
+	//  1. The first iteration is of the list of `provisioner` blocks.
+	//  2. The second iteration is of the dictionary within the
+	//      provisioner which will have only one element which is the
+	//      type of provisioner to use along with tis config.
+	//
+	// In JSON it looks kind of like this:
+	//
+	//   [
+	//     {
+	//       "shell": {
+	//         ...
+	//       }
+	//     }
+	//   ]
+	//
+	for _, o1 := range os.Elem(false) {
+		for _, o2 := range o1.Elem(true) {
+			pos = append(pos, o2)
+		}
+	}
+
+	// Short-circuit if there are no items
+	if len(pos) == 0 {
+		return nil, nil
+	}
+
+	result := make([]*Provisioner, 0, len(pos))
+	for _, po := range pos {
+		var config map[string]interface{}
+		if err := hcl.DecodeObject(&config, po); err != nil {
+			return nil, err
+		}
+
+		// Delete the "connection" section, handle seperately
+		delete(config, "connection")
+
+		rawConfig, err := NewRawConfig(config)
+		if err != nil {
+			return nil, err
+		}
+
+		// Check if we have a provisioner-level connection
+		// block that overrides the resource-level
+		var subConnInfo map[string]interface{}
+		if o := po.Get("connection", false); o != nil {
+			err := hcl.DecodeObject(&subConnInfo, o)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		// Inherit from the resource connInfo any keys
+		// that are not explicitly overriden.
+		if connInfo != nil && subConnInfo != nil {
+			for k, v := range connInfo {
+				if _, ok := subConnInfo[k]; !ok {
+					subConnInfo[k] = v
+				}
+			}
+		} else if subConnInfo == nil {
+			subConnInfo = connInfo
+		}
+
+		// Parse the connInfo
+		connRaw, err := NewRawConfig(subConnInfo)
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, &Provisioner{
+			Type:      po.Key,
+			RawConfig: rawConfig,
+			ConnInfo:  connRaw,
+		})
+	}
+
+	return result, nil
+}
+
+/*
+func hclObjectMap(os *hclobj.Object) map[string]ast.ListNode {
+	objects := make(map[string][]*hclobj.Object)
+
+	for _, o := range os.Elem(false) {
+		for _, elem := range o.Elem(true) {
+			val, ok := objects[elem.Key]
+			if !ok {
+				val = make([]*hclobj.Object, 0, 1)
+			}
+
+			val = append(val, elem)
+			objects[elem.Key] = val
+		}
+	}
+
+	return objects
+}
+*/

config/loader_hcl_test.go

@@ -0,0 +1,9 @@
+package config
+
+import (
+	"testing"
+)
+
+func TestHCLConfigurableConfigurable(t *testing.T) {
+	var _ configurable = new(hclConfigurable)
+}

config/loader_test.go

@@ -47,6 +47,9 @@ func TestLoadBasic(t *testing.T) {
 }
 
 func TestLoadBasic_import(t *testing.T) {
+	// Skip because we disabled importing
+	t.Skip()
+
 	c, err := Load(filepath.Join(fixtureDir, "import.tf"))
 	if err != nil {
 		t.Fatalf("err: %s", err)

config/test-fixtures/basic.tf

@@ -1,15 +1,15 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {
-  access_key = "foo";
+  access_key = "foo"
-  secret_key = "bar";
+  secret_key = "bar"
 }
 
 provider "do" {
-  api_key = "${var.foo}";
+  api_key = "${var.foo}"
 }
 
 resource "aws_security_group" "firewall" {

config/test-fixtures/dir-basic/one.tf

@@ -1,11 +1,11 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {
-  access_key = "foo";
+  access_key = "foo"
-  secret_key = "bar";
+  secret_key = "bar"
 }
 
 resource "aws_instance" "db" {

config/test-fixtures/dir-basic/two.tf

@@ -1,5 +1,5 @@
 provider "do" {
-  api_key = "${var.foo}";
+  api_key = "${var.foo}"
 }
 
 resource "aws_security_group" "firewall" {

config/test-fixtures/dir-merge/one.tf

@@ -1,6 +1,6 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 resource "aws_instance" "db" {

config/test-fixtures/dir-override/foo_override.tf.json

@@ -2,7 +2,7 @@
     "resource": {
         "aws_instance": {
             "web": {
-                "foo": "bar",
+                "foo": "bar"
             }
         }
     }

config/test-fixtures/dir-override/one.tf

@@ -1,11 +1,11 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {
-  access_key = "foo";
+  access_key = "foo"
-  secret_key = "bar";
+  secret_key = "bar"
 }
 
 resource "aws_instance" "db" {

config/test-fixtures/dir-override/two.tf

@@ -1,5 +1,5 @@
 provider "do" {
-  api_key = "${var.foo}";
+  api_key = "${var.foo}"
 }
 
 resource "aws_security_group" "firewall" {

config/test-fixtures/import.tf

@@ -1,12 +1,10 @@
-import "import/one.tf";
-
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {
-    foo = "bar";
+    foo = "bar"
 }
 
 resource "aws_security_group" "web" {}

config/test-fixtures/validate-good/main.tf

@@ -1,21 +1,21 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 variable "amis" {
     default = {
-        "east": "foo",
+        east = "foo"
     }
 }
 
 provider "aws" {
-  access_key = "foo";
+  access_key = "foo"
-  secret_key = "bar";
+  secret_key = "bar"
 }
 
 provider "do" {
-  api_key = "${var.foo}";
+  api_key = "${var.foo}"
 }
 
 resource "aws_security_group" "firewall" {

config/test-fixtures/validate-unknownthing/main.tf

@@ -1 +1 @@
-what "is this"
+what "is this" {}

config/test-fixtures/validate-unknownvar/main.tf

@@ -1,8 +1,8 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "do" {
-  api_key = "${var.bar}";
+  api_key = "${var.bar}"
 }

config/test-fixtures/validate-var-default/main.tf

@@ -4,6 +4,6 @@ variable "foo" {
 
 variable "foo" {
   default = {
-    "foo" = "bar"
+    foo = "bar"
   }
 }

terraform/plan.go

@@ -14,6 +14,7 @@ import (
 func init() {
 	gob.Register(make([]interface{}, 0))
 	gob.Register(make([]map[string]interface{}, 0))
+	gob.Register(make(map[string]interface{}))
 	gob.Register(make(map[string]string))
 }
 

terraform/plan_test.go

@@ -53,7 +53,7 @@ func TestReadWritePlan(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 
-	println(reflect.DeepEqual(actual.Config.Variables, plan.Config.Variables))
+	println(reflect.DeepEqual(actual.Config.Resources, plan.Config.Resources))
 
 	if !reflect.DeepEqual(actual, plan) {
 		t.Fatalf("bad: %#v", actual)

terraform/test-fixtures/apply-vars/main.tf

@@ -1,7 +1,7 @@
 variable "amis" {
     default = {
-        "us-east-1": "foo",
+        us-east-1 = "foo"
-        "us-west-2": "foo",
+        us-west-2 = "foo"
     }
 }
 

terraform/test-fixtures/graph-basic/main.tf

@@ -1,6 +1,6 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {

terraform/test-fixtures/graph-cycle/main.tf

@@ -1,6 +1,6 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {

terraform/test-fixtures/graph-provisioners/main.tf

@@ -1,6 +1,6 @@
 variable "foo" {
-    default = "bar";
+    default = "bar"
-    description = "bar";
+    description = "bar"
 }
 
 provider "aws" {}

terraform/test-fixtures/smc-uservars/main.tf

@@ -10,6 +10,6 @@ variable "bar" {
 # Mapping
 variable "map" {
     default = {
-        "foo" = "bar";
+        foo = "bar"
     }
 }