Merge pull request #10276 from hashicorp/b-api-operator-query-meta

api: set operator query meta Set the query meta for LicenseGet request. It's expected by api consumers to determine the raft index.
hashicorp · May 14, 2021 · bcb3a9e · bcb3a9e
1 parent 126de79
commit bcb3a9e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/api/operator.go b/api/operator.go
@@ -305,7 +305,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
 	}
@@ -316,9 +316,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