From a1ff65b2b632a1c22d76e581e9a8daf93450b397 Mon Sep 17 00:00:00 2001 From: Chris Baker <1675087+cgbaker@users.noreply.github.com> Date: Thu, 10 Sep 2020 22:08:25 +0000 Subject: [PATCH] move variable out of oss-only build into shared file, fixes ent compile error introduced by #8834 --- nomad/job_endpoint.go | 3 +++ nomad/job_endpoint_oss.go | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go index b0ed35553e71..6d0324858d66 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -34,6 +34,9 @@ const ( DispatchPayloadSizeLimit = 16 * 1024 ) +// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup +var ErrMultipleNamespaces = errors.New("multiple vault namespaces requires Nomad Enterprise") + var ( // allowRescheduleTransition is the transition that allows failed // allocations to be force rescheduled. We create a one off diff --git a/nomad/job_endpoint_oss.go b/nomad/job_endpoint_oss.go index 96c30a750d63..c9688f1ce87a 100644 --- a/nomad/job_endpoint_oss.go +++ b/nomad/job_endpoint_oss.go @@ -3,7 +3,6 @@ package nomad import ( - "errors" "fmt" "strings" @@ -11,9 +10,6 @@ import ( vapi "github.com/hashicorp/vault/api" ) -// ErrMultipleNamespaces is send when multiple namespaces are used in the OSS setup -var ErrMultipleNamespaces = errors.New("multiple vault namespaces requires Nomad Enterprise") - // enforceSubmitJob is used to check any Sentinel policies for the submit-job scope func (j *Job) enforceSubmitJob(override bool, job *structs.Job) (error, error) { return nil, nil