Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11886 from influxdata/fix(swagger)/add-orgID-to-macro-type 

Add orgID property to Macro (variable) type in swagger
pull/11887/head
Alirie Gray 2019-02-13 16:15:31 -08:00 committed by GitHub
parent 8f0e3f5e78 f27a3713f5
commit 4ed9c27b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
http/macro_test.go
View File

@ -77,7 +77,7 @@ func TestMacroService_handleGetMacros(t *testing.T) {
wants: wants{ wants: wants{
statusCode: http.StatusOK, statusCode: http.StatusOK,
contentType: "application/json; charset=utf-8", 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{ wants: wants{
statusCode: http.StatusOK, statusCode: http.StatusOK,
contentType: "application/json; charset=utf-8", 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{ wants: wants{
statusCode: 200, statusCode: 200,
contentType: "application/json; charset=utf-8", 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: ` macro: `
{ {
"name": "my-great-macro", "name": "my-great-macro",
"org_id": "0000000000000001", "orgID": "0000000000000001",
"arguments": { "arguments": {
"type": "constant", "type": "constant",
"values": [ "values": [
@ -346,7 +346,7 @@ func TestMacroService_handlePostMacro(t *testing.T) {
wants: wants{ wants: wants{
statusCode: 201, statusCode: 201,
contentType: "application/json; charset=utf-8", 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{ wants: wants{
statusCode: 200, statusCode: 200,
contentType: "application/json; charset=utf-8", 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"}}
`, `,
}, },
}, },

2
http/swagger.yml
View File

@ -5765,6 +5765,8 @@ components:
id: id:
readOnly: true readOnly: true
type: string type: string
orgID:
type: string
name: name:
type: string type: string
selected: selected:

2
macro.go
View File

@ -45,7 +45,7 @@ type MacroService interface {
// values when used in an InfluxQL or Flux query // values when used in an InfluxQL or Flux query
type Macro struct { type Macro struct {
ID ID `json:"id,omitempty"` ID ID `json:"id,omitempty"`
OrganizationID ID `json:"org_id,omitempty"` OrganizationID ID `json:"orgID,omitempty"`
Name string `json:"name"` Name string `json:"name"`
Selected []string `json:"selected"` Selected []string `json:"selected"`
Arguments *MacroArguments `json:"arguments"` Arguments *MacroArguments `json:"arguments"`

2
macro_test.go
View File

@ -25,7 +25,7 @@ func TestMacro_UnmarshalJSON(t *testing.T) {
json: ` json: `
{ {
"id": "debac1e0deadbeef", "id": "debac1e0deadbeef",
"org_id": "deadbeefdeadbeef", "orgID": "deadbeefdeadbeef",
"name": "howdy", "name": "howdy",
"selected": [], "selected": [],
"arguments": { "arguments": {