Use provider region as default

hashicorp · Sep 14, 2020 · 3bb1560 · 3bb1560
1 parent f8f5901
commit 3bb1560
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/nomad/provider.go b/nomad/provider.go
@@ -12,6 +12,7 @@ import (
 type ProviderConfig struct {
 	client     *api.Client
 	vaultToken *string
+	region     *string
 }
 
 func Provider() terraform.ResourceProvider {
@@ -133,6 +134,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	res := ProviderConfig{
 		client:     client,
 		vaultToken: &vaultToken,
+		region:     &conf.Region,
 	}
 
 	return res, nil

diff --git a/nomad/resource_job_v2.go b/nomad/resource_job_v2.go
@@ -43,7 +43,7 @@ func resourceJobV2() *schema.Resource {
 func resourceJobV2Register(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(ProviderConfig).client
 	jobDefinition := d.Get("job").([]interface{})[0].(map[string]interface{})
-	job, err := getJob(jobDefinition)
+	job, err := getJob(jobDefinition, meta)
 	if err != nil {
 		return fmt.Errorf("Failed to get job definition: %v", err)
 	}
@@ -206,7 +206,7 @@ func getDuration(d interface{}) (*time.Duration, error) {
 // Those functions should have a 1 to 1 correspondance with the ones in
 // resource_job_v2_fields to make it easy to check we did not forget anything
 
-func getJob(d map[string]interface{}) (*api.Job, error) {
+func getJob(d map[string]interface{}, meta interface{}) (*api.Job, error) {
 	datacenters := getListOfString(d["datacenters"])
 
 	var parametrizedJob *api.ParameterizedJobConfig
@@ -246,6 +246,11 @@ func getJob(d map[string]interface{}) (*api.Job, error) {
 		ID = getString(d, "name")
 	}
 
+	region := getString(d, "region")
+	if region == nil {
+		region = meta.(ProviderConfig).region
+	}
+
 	return &api.Job{
 		ID:          ID,
 		Name:        getString(d, "name"),
@@ -255,7 +260,7 @@ func getJob(d map[string]interface{}) (*api.Job, error) {
 		Meta:        getMapOfString(d["meta"]),
 		AllAtOnce:   getBool(d, "all_at_once"),
 		Datacenters: datacenters,
-		Region:      getString(d, "region"),
+		Region:      region,
 		VaultToken:  getString(d, "vault_token"),
 		ConsulToken: getString(d, "consul_token"),
 

diff --git a/nomad/resource_job_v2_fields.go b/nomad/resource_job_v2_fields.go
@@ -26,7 +26,7 @@ func getJobFields() map[string]*schema.Schema {
 		},
 		"region": {
 			Type:     schema.TypeString,
-			Default:  "global",
+			Computed: true,
 			Optional: true,
 		},
 		"meta": {