From f27a3713f5fb2664e74f486d844b3ff269883064 Mon Sep 17 00:00:00 2001 From: Alirie Gray Date: Wed, 13 Feb 2019 15:30:07 -0800 Subject: [PATCH] Add orgID property to Macro (variable) type --- http/macro_test.go | 12 ++++++------ http/swagger.yml | 2 ++ macro.go | 2 +- macro_test.go | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/http/macro_test.go b/http/macro_test.go index 6c121ef254..8306992db3 100644 --- a/http/macro_test.go +++ b/http/macro_test.go @@ -77,7 +77,7 @@ func TestMacroService_handleGetMacros(t *testing.T) { wants: wants{ statusCode: http.StatusOK, contentType: "application/json; charset=utf-8", - body: `{"macros":[{"id":"6162207574726f71","org_id":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/6162207574726f71","org": "/api/v2/orgs/0000000000000001"}},{"id":"61726920617a696f","org_id":"0000000000000001","name":"macro-b","selected":["c"],"arguments":{"type":"map","values":{"a":"b","c":"d"}},"links":{"self":"/api/v2/macros/61726920617a696f","org": "/api/v2/orgs/0000000000000001"}}],"links":{"self":"/api/v2/macros?descending=false&limit=20&offset=0"}}`, + body: `{"macros":[{"id":"6162207574726f71","orgID":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/6162207574726f71","org": "/api/v2/orgs/0000000000000001"}},{"id":"61726920617a696f","orgID":"0000000000000001","name":"macro-b","selected":["c"],"arguments":{"type":"map","values":{"a":"b","c":"d"}},"links":{"self":"/api/v2/macros/61726920617a696f","org": "/api/v2/orgs/0000000000000001"}}],"links":{"self":"/api/v2/macros?descending=false&limit=20&offset=0"}}`, }, }, { @@ -128,7 +128,7 @@ func TestMacroService_handleGetMacros(t *testing.T) { wants: wants{ statusCode: http.StatusOK, contentType: "application/json; charset=utf-8", - body: `{"macros":[{"id":"6162207574726f71","org_id":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/6162207574726f71","org":"/api/v2/orgs/0000000000000001"}}],"links":{"self":"/api/v2/macros?descending=false&limit=20&offset=0&orgID=0000000000000001"}}`, + body: `{"macros":[{"id":"6162207574726f71","orgID":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/6162207574726f71","org":"/api/v2/orgs/0000000000000001"}}],"links":{"self":"/api/v2/macros?descending=false&limit=20&offset=0&orgID=0000000000000001"}}`, }, }, } @@ -212,7 +212,7 @@ func TestMacroService_handleGetMacro(t *testing.T) { wants: wants{ statusCode: 200, contentType: "application/json; charset=utf-8", - body: `{"id":"75650d0a636f6d70","org_id":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000001"}} + body: `{"id":"75650d0a636f6d70","orgID":"0000000000000001","name":"macro-a","selected":["b"],"arguments":{"type":"constant","values":["a","b"]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000001"}} `, }, }, @@ -329,7 +329,7 @@ func TestMacroService_handlePostMacro(t *testing.T) { macro: ` { "name": "my-great-macro", - "org_id": "0000000000000001", + "orgID": "0000000000000001", "arguments": { "type": "constant", "values": [ @@ -346,7 +346,7 @@ func TestMacroService_handlePostMacro(t *testing.T) { wants: wants{ statusCode: 201, contentType: "application/json; charset=utf-8", - body: `{"id":"75650d0a636f6d70","org_id":"0000000000000001","name":"my-great-macro","selected":["'foo'"],"arguments":{"type":"constant","values":["bar","foo"]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000001"}} + body: `{"id":"75650d0a636f6d70","orgID":"0000000000000001","name":"my-great-macro","selected":["'foo'"],"arguments":{"type":"constant","values":["bar","foo"]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000001"}} `, }, }, @@ -463,7 +463,7 @@ func TestMacroService_handlePatchMacro(t *testing.T) { wants: wants{ statusCode: 200, contentType: "application/json; charset=utf-8", - body: `{"id":"75650d0a636f6d70","org_id":"0000000000000002","name":"new-name","selected":[],"arguments":{"type":"constant","values":[]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000002"}} + body: `{"id":"75650d0a636f6d70","orgID":"0000000000000002","name":"new-name","selected":[],"arguments":{"type":"constant","values":[]},"links":{"self":"/api/v2/macros/75650d0a636f6d70","org":"/api/v2/orgs/0000000000000002"}} `, }, }, diff --git a/http/swagger.yml b/http/swagger.yml index e5f47d3744..54135051b6 100644 --- a/http/swagger.yml +++ b/http/swagger.yml @@ -5765,6 +5765,8 @@ components: id: readOnly: true type: string + orgID: + type: string name: type: string selected: diff --git a/macro.go b/macro.go index fdb53a8245..8eba11b5a9 100644 --- a/macro.go +++ b/macro.go @@ -45,7 +45,7 @@ type MacroService interface { // values when used in an InfluxQL or Flux query type Macro struct { ID ID `json:"id,omitempty"` - OrganizationID ID `json:"org_id,omitempty"` + OrganizationID ID `json:"orgID,omitempty"` Name string `json:"name"` Selected []string `json:"selected"` Arguments *MacroArguments `json:"arguments"` diff --git a/macro_test.go b/macro_test.go index adee4b8d8a..044765d0a8 100644 --- a/macro_test.go +++ b/macro_test.go @@ -25,7 +25,7 @@ func TestMacro_UnmarshalJSON(t *testing.T) { json: ` { "id": "debac1e0deadbeef", - "org_id": "deadbeefdeadbeef", + "orgID": "deadbeefdeadbeef", "name": "howdy", "selected": [], "arguments": {