From 1df9984a035d62ad2136bb21e666c154f5c96e23 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 31 Mar 2021 15:40:42 -0400 Subject: [PATCH] api: set operator query meta --- api/operator.go | 12 ++++++++---- vendor/github.com/hashicorp/nomad/api/operator.go | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/api/operator.go b/api/operator.go index 3c4ae1e2d6ee..f06ec0bcee17 100644 --- a/api/operator.go +++ b/api/operator.go @@ -319,7 +319,7 @@ func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, erro } var reply LicenseReply - _, resp, err := op.c.doRequest(req) + rtt, resp, err := op.c.doRequest(req) if err != nil { return nil, nil, err } @@ -330,9 +330,13 @@ func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, erro } err = json.NewDecoder(resp.Body).Decode(&reply) - if err == nil { - return &reply, nil, nil + if err != nil { + return nil, nil, err } - return nil, nil, err + qm := &QueryMeta{} + parseQueryMeta(resp, qm) + qm.RequestTime = rtt + + return &reply, qm, nil } diff --git a/vendor/github.com/hashicorp/nomad/api/operator.go b/vendor/github.com/hashicorp/nomad/api/operator.go index 3c4ae1e2d6ee..f06ec0bcee17 100644 --- a/vendor/github.com/hashicorp/nomad/api/operator.go +++ b/vendor/github.com/hashicorp/nomad/api/operator.go @@ -319,7 +319,7 @@ func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, erro } var reply LicenseReply - _, resp, err := op.c.doRequest(req) + rtt, resp, err := op.c.doRequest(req) if err != nil { return nil, nil, err } @@ -330,9 +330,13 @@ func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, erro } err = json.NewDecoder(resp.Body).Decode(&reply) - if err == nil { - return &reply, nil, nil + if err != nil { + return nil, nil, err } - return nil, nil, err + qm := &QueryMeta{} + parseQueryMeta(resp, qm) + qm.RequestTime = rtt + + return &reply, qm, nil }