Remove all traces of libucl

Author: mitchellh

Makefile

@@ -1,69 +1,34 @@
-CGO_CFLAGS:=-I$(CURDIR)/vendor/libucl/include
-CGO_LDFLAGS:=-L$(CURDIR)/vendor/libucl
-LIBUCL_NAME=libucl.a
 TEST?=./...
 
-# Windows-only
-ifeq ($(OS), Windows_NT)
-	# The Libucl library is named libucl.dll
-	LIBUCL_NAME=libucl.dll
-
-	# Add the current directory on the path so the DLL is available.
-	export PATH := $(CURDIR):$(PATH)
-endif
-
-export CGO_CFLAGS CGO_LDFLAGS PATH
-
 default: test
 
-bin: config/y.go libucl
+bin: config/y.go
 	@sh -c "$(CURDIR)/scripts/build.sh"
 
-dev: config/y.go libucl
+dev: config/y.go
 	@TF_DEV=1 sh -c "$(CURDIR)/scripts/build.sh"
 
-libucl: vendor/libucl/$(LIBUCL_NAME)
-
-test: config/y.go libucl
+test: config/y.go
 	TF_ACC= go test $(TEST) $(TESTARGS) -timeout=10s
 
-testacc: config/y.go libucl
+testacc: config/y.go
 	@if [ "$(TEST)" = "./..." ]; then \
 		echo "ERROR: Set TEST to a specific package"; \
 		exit 1; \
 	fi
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 30m
 
-testrace: config/y.go libucl
+testrace: config/y.go
 	TF_ACC= go test -race $(TEST) $(TESTARGS)
 
-updatedeps: config/y.go libucl
+updatedeps: config/y.go
 	go get -u -v ./...
 
 config/y.go: config/expr.y
 	cd config/ && \
 		go tool yacc -p "expr" expr.y
 
-vendor/libucl/libucl.a: vendor/libucl
-	cd vendor/libucl && \
-		cmake cmake/ && \
-		make
-
-vendor/libucl/libucl.dll: vendor/libucl
-	cd vendor/libucl && \
-		$(MAKE) -f Makefile.w32 && \
-		cp .obj/libucl.dll . && \
-		cp libucl.dll $(CURDIR)
-
-vendor/libucl:
-	rm -rf vendor/libucl
-	mkdir -p vendor/libucl
-	git clone https://github.com/hashicorp/libucl.git vendor/libucl
-	cd vendor/libucl && \
-		git checkout fix-win32-compile
-
 clean:
 	rm config/y.go
-	rm -rf vendor
 
-.PHONY: clean default libucl test updatedeps
+.PHONY: clean default test updatedeps

command/flag_var.go

@@ -2,9 +2,10 @@ package command
 
 import (
 	"fmt"
+	"io/ioutil"
 	"strings"
 
-	"github.com/mitchellh/go-libucl"
+	"github.com/hashicorp/hcl"
 )
 
 // FlagVar is a flag.Value implementation for parsing user variables
@@ -55,25 +56,23 @@ func (v *FlagVarFile) Set(raw string) error {
 	return nil
 }
 
-const libuclParseFlags = libucl.ParserNoTime
-
 func loadVarFile(path string) (map[string]string, error) {
-	var obj *libucl.Object
-
-	parser := libucl.NewParser(libuclParseFlags)
-	err := parser.AddFile(path)
-	if err == nil {
-		obj = parser.Object()
-		defer obj.Close()
+	// Read the HCL file and prepare for parsing
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"Error reading %s: %s", path, err)
 	}
-	defer parser.Close()
 
+	// Parse it
+	obj, err := hcl.Parse(string(d))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf(
+			"Error parsing %s: %s", path, err)
 	}
 
 	var result map[string]string
-	if err := obj.Decode(&result); err != nil {
+	if err := hcl.DecodeObject(&result, obj); err != nil {
 		return nil, err
 	}
 

config.go

@@ -1,13 +1,15 @@
 package main
 
 import (
+	"fmt"
+	"io/ioutil"
 	"os/exec"
 	"path/filepath"
 
+	"github.com/hashicorp/hcl"
 	"github.com/hashicorp/terraform/plugin"
 	"github.com/hashicorp/terraform/rpc"
 	"github.com/hashicorp/terraform/terraform"
-	"github.com/mitchellh/go-libucl"
 	"github.com/mitchellh/osext"
 )
 
@@ -27,10 +29,6 @@ var BuiltinConfig Config
 // ContextOpts are the global ContextOpts we use to initialize the CLI.
 var ContextOpts terraform.ContextOpts
 
-// Put the parse flags we use for libucl in a constant so we can get
-// equally behaving parsing everywhere.
-const libuclParseFlags = libucl.ParserNoTime
-
 func init() {
 	BuiltinConfig.Providers = map[string]string{
 		"aws":          "terraform-provider-aws",
@@ -49,26 +47,23 @@ func init() {
 
 // LoadConfig loads the CLI configuration from ".terraformrc" files.
 func LoadConfig(path string) (*Config, error) {
-	var obj *libucl.Object
-
-	// Parse the file and get the root object.
-	parser := libucl.NewParser(libuclParseFlags)
-	err := parser.AddFile(path)
-	if err == nil {
-		obj = parser.Object()
-		defer obj.Close()
+	// Read the HCL file and prepare for parsing
+	d, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf(
+			"Error reading %s: %s", path, err)
 	}
-	defer parser.Close()
 
-	// If there was an error parsing, return now.
+	// Parse it
+	obj, err := hcl.Parse(string(d))
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf(
+			"Error parsing %s: %s", path, err)
 	}
 
 	// Build up the result
 	var result Config
-
-	if err := obj.Decode(&result); err != nil {
+	if err := hcl.DecodeObject(&result, obj); err != nil {
 		return nil, err
 	}