kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

use RequestNamespace(), the canonical way to get namespace

Browse Source
This commit is contained in:
Mahmood Ali
2019-09-27 07:40:58 -04:00
parent 19e79f1c8f
commit 96abf56a52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nomad/job_endpoint.go
View File

@@ -89,8 +89,8 @@ func (j *Job) Register(args *structs.JobRegisterRequest, reply *structs.JobRegis
}
// defensive check; http layer and RPC requester should ensure namespaces are set consistently
if args.Namespace != args.Job.Namespace {
return fmt.Errorf("mismatched request namespace in request: %q, %q", args.Namespace, args.Job.Namespace)
if args.RequestNamespace() != args.Job.Namespace {
return fmt.Errorf("mismatched request namespace in request: %q, %q", args.RequestNamespace(), args.Job.Namespace)
}
// Run admission controllers
@@ -349,8 +349,8 @@ func (j *Job) Validate(args *structs.JobValidateRequest, reply *structs.JobValid
defer metrics.MeasureSince([]string{"nomad", "job", "validate"}, time.Now())
// defensive check; http layer and RPC requester should ensure namespaces are set consistently
if args.Namespace != args.Job.Namespace {
return fmt.Errorf("mismatched request namespace in request: %q, %q", args.Namespace, args.Job.Namespace)
if args.RequestNamespace() != args.Job.Namespace {
return fmt.Errorf("mismatched request namespace in request: %q, %q", args.RequestNamespace(), args.Job.Namespace)
}
job, mutateWarnings, err := j.admissionMutators(args.Job)