Add a nomad_job_v2 resource

go.mod

@@ -12,13 +12,15 @@ 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/hashicorp/nomad/api v0.0.0-20200812181322-71e8a68d9948
+	github.com/davecgh/go-spew v1.1.1
+	github.com/google/go-cmp v0.4.0
+	github.com/hashicorp/go-multierror v1.1.0
+	github.com/hashicorp/go-version v1.2.1-0.20191009193637-2046c9d0f0b0
+	github.com/hashicorp/hcl v1.0.1-0.20191016231534-914dc3f8dd7c
+	github.com/hashicorp/nomad v0.12.5
+	github.com/hashicorp/nomad/api v0.0.0-20200924154459-261adf0b4d76
 	github.com/hashicorp/terraform-plugin-sdk v1.15.0
 	github.com/hashicorp/vault v0.10.4
-	github.com/mitchellh/mapstructure v1.1.2
+	github.com/mitchellh/mapstructure v1.3.1
 	github.com/stretchr/testify v1.5.1
 )

nomad/core/helper/funcs.go

@@ -8,9 +8,26 @@ import (
 
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcl/hcl/ast"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
-// boolToPtr returns the pointer to a boolean
+// MapStringStringSliceValueSet returns the set of values in a map[string][]string
+func MapStringStringSliceValueSet(m map[string][]string) []string {
+	set := make(map[string]struct{})
+	for _, slice := range m {
+		for _, v := range slice {
+			set[v] = struct{}{}
+		}
+	}
+
+	flat := make([]string, 0, len(set))
+	for k := range set {
+		flat = append(flat, k)
+	}
+	return flat
+}
+
+// BoolToPtr returns the pointer to a boolean
 func BoolToPtr(b bool) *bool {
 	return &b
 }
@@ -25,6 +42,11 @@ func TimeToPtr(t time.Duration) *time.Duration {
 	return &t
 }
 
+// IntToPtr returns the pointer to an int
+func IntToPtr(i int) *int {
+	return &i
+}
+
 func CheckHCLKeys(node ast.Node, valid []string) error {
 	var list *ast.ObjectList
 	switch n := node.(type) {
@@ -108,3 +130,30 @@ func unusedKeysImpl(path []string, val reflect.Value) error {
 	}
 	return nil
 }
+
+type StateWriter struct {
+	d      *schema.ResourceData
+	errors []string
+}
+
+func NewStateWriter(d *schema.ResourceData) *StateWriter {
+	return &StateWriter{d: d}
+}
+
+func (sw *StateWriter) Set(key string, value interface{}) {
+	err := sw.d.Set(key, value)
+	if err != nil {
+		sw.errors = append(
+			sw.errors,
+			fmt.Sprintf(" - failed to set '%s': %v", key, err),
+		)
+	}
+}
+
+func (sw *StateWriter) Error() error {
+	if sw.errors == nil {
+		return nil
+	}
+	errors := strings.Join(sw.errors, "\n")
+	return fmt.Errorf("Failed to write the state:\n%s", errors)
+}

nomad/provider.go

@@ -12,6 +12,7 @@ import (
 type ProviderConfig struct {
 	client     *api.Client
 	vaultToken *string
+	region     *string
 }
 
 func Provider() terraform.ResourceProvider {
@@ -83,6 +84,7 @@ func Provider() terraform.ResourceProvider {
 			"nomad_acl_policy":          resourceACLPolicy(),
 			"nomad_acl_token":           resourceACLToken(),
 			"nomad_job":                 resourceJob(),
+			"nomad_job_v2":              resourceJobV2(),
 			"nomad_namespace":           resourceNamespace(),
 			"nomad_quota_specification": resourceQuotaSpecification(),
 			"nomad_sentinel_policy":     resourceSentinelPolicy(),
@@ -132,6 +134,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	res := ProviderConfig{
 		client:     client,
 		vaultToken: &vaultToken,
+		region:     &conf.Region,
 	}
 
 	return res, nil

nomad/resource_job_test.go

@@ -199,7 +199,11 @@ func TestResourceJob_serviceWithoutDeployment(t *testing.T) {
 func TestResourceJob_multiregion(t *testing.T) {
 	r.Test(t, r.TestCase{
 		Providers: testProviders,
-		PreCheck:  func() { testAccPreCheck(t); testCheckMinVersion(t, "0.12.0-beta1") },
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testCheckMinVersion(t, "0.12.0-beta1")
+			testCheckEnt(t)
+		},
 		Steps: []r.TestStep{
 			{
 				Config: testResourceJob_multiregion,
@@ -1721,7 +1725,7 @@ func TestResourceJob_vault(t *testing.T) {
 func TestResourceJob_vaultMultiNamespace(t *testing.T) {
 	r.Test(t, r.TestCase{
 		Providers: testProviders,
-		PreCheck:  func() { testAccPreCheck(t); testCheckVaultEnabled(t) },
+		PreCheck:  func() { testAccPreCheck(t); testCheckEnt(t); testCheckVaultEnabled(t) },
 		Steps: []r.TestStep{
 			{
 				Config: testResourceJob_validVaultNamspaceConfig,