Merge branch 'master' into f-scaling-policy-data-source

hashicorp · Oct 30, 2020 · 2f46d72 · 2f46d72
2 parents b731ef4 + f809e1b
commit 2f46d72
Show file tree

Hide file tree

Showing 20 changed files with 1,129 additions and 3,373 deletions.
diff --git a/go.mod b/go.mod
@@ -12,13 +12,14 @@ exclude (
 )
 
 require (
-	github.com/google/go-cmp v0.3.1
-	github.com/hashicorp/go-multierror v1.0.0
-	github.com/hashicorp/go-version v1.2.0
-	github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f
+	github.com/google/go-cmp v0.5.0
+	github.com/hashicorp/go-version v1.2.1
+	github.com/hashicorp/nomad v0.12.5-0.20201029140339-d6255129a300
 	github.com/hashicorp/nomad/api v0.0.0-20201028165800-38e23b62a770
-	github.com/hashicorp/terraform-plugin-sdk v1.15.0
+	github.com/hashicorp/terraform-plugin-sdk v1.16.0
 	github.com/hashicorp/vault v0.10.4
-	github.com/mitchellh/mapstructure v1.1.2
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 )
+
+// Force using go-getter version that is compatible with terraform plugin
+replace github.com/hashicorp/go-getter => github.com/hashicorp/go-getter v1.4.0
diff --git a/go.sum b/go.sum
diff --git a/nomad/core/README.md b/nomad/core/README.md
diff --git a/nomad/core/helper/funcs.go b/nomad/core/helper/funcs.go
diff --git a/nomad/core/jobspec/helper.go b/nomad/core/jobspec/helper.go