From 2212e30c4fcc58a011c5f39a47978ce56e9b25f2 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Mon, 13 Jul 2020 10:01:21 -0400
Subject: [PATCH] multiregion: allow empty region DCs

It's supposed to be possible for a region not to have `datacenters` set so
that it can use the job's `datacenters` field. This requires that operators
use the same DC name across multiple regions, but that's the default client
configuration.
---
 nomad/structs/structs.go      | 6 +++---
 nomad/structs/structs_test.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index 4996b3638e22..0cb69233b380 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -4034,7 +4034,7 @@ func (j *Job) Validate() error {
 	}
 
 	if j.IsMultiregion() {
-		if err := j.Multiregion.Validate(j.Type); err != nil {
+		if err := j.Multiregion.Validate(j.Type, j.Datacenters); err != nil {
 			mErr.Errors = append(mErr.Errors, err)
 		}
 	}
@@ -4600,7 +4600,7 @@ func (m *Multiregion) Copy() *Multiregion {
 	return copy
 }
 
-func (m *Multiregion) Validate(jobType string) error {
+func (m *Multiregion) Validate(jobType string, jobDatacenters []string) error {
 	var mErr multierror.Error
 	seen := map[string]struct{}{}
 	for _, region := range m.Regions {
@@ -4610,7 +4610,7 @@ func (m *Multiregion) Validate(jobType string) error {
 					region.Name))
 		}
 		seen[region.Name] = struct{}{}
-		if len(region.Datacenters) == 0 {
+		if len(region.Datacenters) == 0 && len(jobDatacenters) == 0 {
 			mErr.Errors = append(mErr.Errors,
 				fmt.Errorf("Multiregion region %q must have at least 1 datacenter",
 					region.Name),
diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
index 062a73566d7e..67b67725840b 100644
--- a/nomad/structs/structs_test.go
+++ b/nomad/structs/structs_test.go
@@ -5609,7 +5609,7 @@ func TestMultiregion_Validate(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.Name, func(t *testing.T) {
-			err := tc.Case.Validate(tc.JobType)
+			err := tc.Case.Validate(tc.JobType, []string{})
 			if len(tc.Errors) == 0 {
 				require.NoError(err)
 			} else {