Merge pull request #13946 from influxdata/fix/swagger-for-task-runs

fix(swagger): add log property to task runs endpoint docs
pull/13956/head
Alirie Gray 2019-05-17 14:18:01 -07:00 committed by GitHub
commit d6a542e21b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 8 deletions

View File

@ -5782,6 +5782,16 @@ components:
description: Time used for run's "now" option, RFC3339. description: Time used for run's "now" option, RFC3339.
type: string type: string
format: date-time format: date-time
log:
description: An array of logs associated with the run.
type: array
items:
type: object
properties:
time:
type: string
message:
type: string
startedAt: startedAt:
readOnly: true readOnly: true
description: Time run started executing, RFC3339Nano. description: Time run started executing, RFC3339Nano.

View File

@ -586,8 +586,7 @@ func TestTaskHandler_handleGetRun(t *testing.T) {
"scheduledFor": "2018-12-01T17:00:13Z", "scheduledFor": "2018-12-01T17:00:13Z",
"startedAt": "2018-12-01T17:00:03.155645Z", "startedAt": "2018-12-01T17:00:03.155645Z",
"finishedAt": "2018-12-01T17:00:13.155645Z", "finishedAt": "2018-12-01T17:00:13.155645Z",
"requestedAt": "2018-12-01T17:00:13Z", "requestedAt": "2018-12-01T17:00:13Z"
"log": null
}`, }`,
}, },
}, },
@ -702,8 +701,7 @@ func TestTaskHandler_handleGetRuns(t *testing.T) {
"scheduledFor": "2018-12-01T17:00:13Z", "scheduledFor": "2018-12-01T17:00:13Z",
"startedAt": "2018-12-01T17:00:03.155645Z", "startedAt": "2018-12-01T17:00:03.155645Z",
"finishedAt": "2018-12-01T17:00:13.155645Z", "finishedAt": "2018-12-01T17:00:13.155645Z",
"requestedAt": "2018-12-01T17:00:13Z", "requestedAt": "2018-12-01T17:00:13Z"
"log": null
} }
] ]
}`, }`,

View File

@ -64,7 +64,7 @@ type Run struct {
StartedAt string `json:"startedAt,omitempty"` StartedAt string `json:"startedAt,omitempty"`
FinishedAt string `json:"finishedAt,omitempty"` FinishedAt string `json:"finishedAt,omitempty"`
RequestedAt string `json:"requestedAt,omitempty"` RequestedAt string `json:"requestedAt,omitempty"`
Log []Log `json:"log"` Log []Log `json:"log,omitempty"`
} }
// ScheduledForTime gives the time.Time that the run is scheduled for. // ScheduledForTime gives the time.Time that the run is scheduled for.

View File

@ -156,6 +156,7 @@ func TestTagValueSeriesIDCache_addToSet(t *testing.T) {
} }
func TestTagValueSeriesIDCache_ConcurrentGetPutDelete(t *testing.T) { func TestTagValueSeriesIDCache_ConcurrentGetPutDelete(t *testing.T) {
t.Skip("https://github.com/influxdata/influxdb/issues/13963")
// Exercise concurrent operations against a series ID cache. // Exercise concurrent operations against a series ID cache.
// This will catch any likely data races, when run with the race detector. // This will catch any likely data races, when run with the race detector.

View File

@ -17,7 +17,7 @@ describe('Tasks', () => {
}) })
it('can create a task', () => { it('can create a task', () => {
const taskName = '🦄ask' const taskName = 'Task'
cy.get('.empty-state').within(() => { cy.get('.empty-state').within(() => {
cy.contains('Create').click() cy.contains('Create').click()
}) })
@ -84,7 +84,7 @@ describe('Tasks', () => {
cy.createTask(id) cy.createTask(id)
}) })
const newName = '🅱️ask' const newName = 'Task'
cy.getByTestID('task-card').within(() => { cy.getByTestID('task-card').within(() => {
cy.getByTestID('task-card--name').trigger('mouseover') cy.getByTestID('task-card--name').trigger('mouseover')
@ -112,7 +112,7 @@ describe('Tasks', () => {
cy.getByTestID('dropdown--item new').click() cy.getByTestID('dropdown--item new').click()
cy.getByInputName('name').type('🦄ask') cy.getByInputName('name').type('Task')
cy.getByInputName('interval').type('24h') cy.getByInputName('interval').type('24h')
cy.getByInputName('offset').type('20m') cy.getByInputName('offset').type('20m')