From 8b20eda5e97cb5664d654fc6e2e54432b31a37a8 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Mon, 1 Jun 2020 10:34:25 -0700 Subject: [PATCH 01/25] Add labels column to workflows list --- .../workflows-list/workflows-list.scss | 21 ++++++++++ .../workflows-list/workflows-list.tsx | 39 ++++++++++++++----- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.scss b/ui/src/app/workflows/components/workflows-list/workflows-list.scss index d8bd1d0e1044..c5587acda4bb 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.scss +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.scss @@ -2,6 +2,7 @@ .workflows-list { padding: 1em; + &__title { font-weight: bolder; font-size: 15px; @@ -10,6 +11,26 @@ padding-bottom: 0.5em; } + &__labels { + display: flex; + flex-wrap: wrap; + align-items: center; + height: 100%; + + &--tag { + line-height: normal; + background-color: $argo-color-gray-3; + border-radius: 3px; + height: auto; + padding: 0.5em 8px; + margin-right: 4px; + + &:hover { + color: $argo-color-teal-5; + } + } + } + &__info { line-height: 24px; margin: 1em 0; diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 056a38caa1b7..03c8083ef12d 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -264,12 +264,26 @@ export class WorkflowsList extends BasePage, State> {
NAME
-
NAMESPACE
-
STARTED
-
FINISHED
-
DURATION
+
NAMESPACE
+
STARTED
+
FINISHED
+
DURATION
+
LABELS
- {this.state.workflows.map(w => ( + {this.state.workflows.map(w => { + let labels = [] + if (w.metadata.labels) { + labels.push(Object.keys(w.metadata.labels).map((key) => ( +
+ {key} +
+ ))) + } else { + labels.push(
No labels
) + } + return ( , State> {
{w.metadata.name}
-
{w.metadata.namespace}
-
+
{w.metadata.namespace}
+
-
+
-
+
{() => formatDuration(wfDuration(w.status))}
+
+
+ {labels} +
+
- ))} + )})}
this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, pagination)} From 736cd00d988d7f6f5fb51951f334ad14ba9f04f4 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Mon, 1 Jun 2020 11:22:12 -0700 Subject: [PATCH 02/25] feat(ui): add ability to filter workflows by label by clicking on a label in the new labels column --- .../app/shared/components/tags-input/tags-input.tsx | 4 ++-- .../components/workflows-list/workflows-list.tsx | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/src/app/shared/components/tags-input/tags-input.tsx b/ui/src/app/shared/components/tags-input/tags-input.tsx index d8c218ba4e9e..829f5673314f 100644 --- a/ui/src/app/shared/components/tags-input/tags-input.tsx +++ b/ui/src/app/shared/components/tags-input/tags-input.tsx @@ -26,7 +26,7 @@ export class TagsInput extends React.Component this.inputElement && this.inputElement.focus()}> - {this.state.tags.map((tag, i) => ( + {this.props.tags ? this.props.tags.map((tag, i) => ( {tag}{' '} - ))} + )) : } (this.autocompleteApi = api)} diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 03c8083ef12d..cfa699ace6a3 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -276,7 +276,16 @@ export class WorkflowsList extends BasePage, State> { labels.push(Object.keys(w.metadata.labels).map((key) => (
+ key={`${w.metadata.namespace}-${w.metadata.name}-${key}`} + onClick={async (e) => { + e.preventDefault() + let value = `${key}=${w.metadata.labels[key]}` + if (this.state.selectedLabels.indexOf(value) === -1) { + const newTags = this.state.selectedLabels.concat(value) + await this.setState({selectedLabels: newTags}) + } + this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination) + }}> {key}
))) From 6af5d5dccbdadd8d77f7bcee6b4364ea2580abd7 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Mon, 1 Jun 2020 15:34:45 -0700 Subject: [PATCH 03/25] Refactor labels column into its own component. Add show / hide button to take up less real estate. --- .../workflow-labels/workflow-labels.scss | 53 +++++++++++++++++ .../workflow-labels/workflow-labels.tsx | 58 +++++++++++++++++++ .../workflows-list/workflows-list.scss | 24 ++------ .../workflows-list/workflows-list.tsx | 44 ++++++-------- 4 files changed, 132 insertions(+), 47 deletions(-) create mode 100644 ui/src/app/workflows/components/workflow-labels/workflow-labels.scss create mode 100644 ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss new file mode 100644 index 000000000000..192fef50cbec --- /dev/null +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -0,0 +1,53 @@ +@import 'node_modules/argo-ui/src/styles/config'; + +.wf-row-labels { + display: flex; + flex-wrap: wrap; + align-items: center; + height: 100%; + padding: 1em 0; + $gutter: 0.5em; + + &__action { + text-decoration: underline; + cursor: pointer; + line-height: normal; + height: auto; + align-self: center; + padding: 10px; + padding-left: 0; + } + + .tag { + line-height: normal; + background-color: $argo-color-gray-3; + border-radius: 3px; + height: auto; + margin: $gutter 0; + margin-right: 4px; + display: flex; + overflow: hidden; + + &:hover { + .key { + color: $argo-color-teal-5; + } + .value { + color: $argo-color-gray-3; + } + } + + .key, .value { + padding: 0.5em 8px; + } + + .key { + color: $argo-color-gray-6; + } + + .value { + color: white; + background-color: $argo-color-teal-5; + } + } + } \ No newline at end of file diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx new file mode 100644 index 000000000000..6694d6ab484c --- /dev/null +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx @@ -0,0 +1,58 @@ +import * as React from 'react'; +import * as models from '../../../../models'; + +require('./workflow-labels.scss'); + +interface WorkflowLabelsProps { + workflow: models.Workflow; + onChange: (key: string) => void; +} + +export class WorkflowLabels extends React.Component { + + constructor(props: WorkflowLabelsProps) { + super(props); + this.state = { hidden: true }; + } + + + public render() { + let labels = [] + if (!this.state.hidden) { + let w = this.props.workflow + if (w.metadata.labels) { + labels.push(Object.keys(w.metadata.labels).map((key) => ( +
{ + e.preventDefault() + this.props.onChange(key) + }}> +
{key}
+
{w.metadata.labels[key]}
+
+ ))) + } else { + labels.push(
No labels
) + } + } + + return ( +
+ { labels } +
{ + e.preventDefault(); + this.setState({hidden:!this.state.hidden})} + } + className={`wf-row-labels__action wf-row-labels__action--${this.state.hidden ? 'show' : 'hide'}`}> + { this.state.hidden ? + (SHOW ) : + (HIDE ) + } +
+
+ ) + } +} \ No newline at end of file diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.scss b/ui/src/app/workflows/components/workflows-list/workflows-list.scss index c5587acda4bb..0839594949c7 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.scss +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.scss @@ -3,6 +3,10 @@ .workflows-list { padding: 1em; + &__labels-container { + height: 100%; + } + &__title { font-weight: bolder; font-size: 15px; @@ -11,26 +15,6 @@ padding-bottom: 0.5em; } - &__labels { - display: flex; - flex-wrap: wrap; - align-items: center; - height: 100%; - - &--tag { - line-height: normal; - background-color: $argo-color-gray-3; - border-radius: 3px; - height: auto; - padding: 0.5em 8px; - margin-right: 4px; - - &:hover { - color: $argo-color-teal-5; - } - } - } - &__info { line-height: 24px; margin: 1em 0; diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index cfa699ace6a3..59b519658f29 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -25,6 +25,7 @@ import {Timestamp} from '../../../shared/components/timestamp'; import {formatDuration, wfDuration} from '../../../shared/duration'; import {Pagination, parseLimit} from '../../../shared/pagination'; import {WorkflowFilters} from '../workflow-filters/workflow-filters'; +import {WorkflowLabels} from '../workflow-labels/workflow-labels'; require('./workflows-list.scss'); @@ -264,34 +265,13 @@ export class WorkflowsList extends BasePage, State> {
NAME
-
NAMESPACE
+
NAMESPACE
STARTED
FINISHED
DURATION
-
LABELS
+
LABELS
{this.state.workflows.map(w => { - let labels = [] - if (w.metadata.labels) { - labels.push(Object.keys(w.metadata.labels).map((key) => ( -
{ - e.preventDefault() - let value = `${key}=${w.metadata.labels[key]}` - if (this.state.selectedLabels.indexOf(value) === -1) { - const newTags = this.state.selectedLabels.concat(value) - await this.setState({selectedLabels: newTags}) - } - this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination) - }}> - {key} -
- ))) - } else { - labels.push(
No labels
) - } return ( , State> {
{w.metadata.name}
-
{w.metadata.namespace}
+
{w.metadata.namespace}
@@ -311,9 +291,19 @@ export class WorkflowsList extends BasePage, State> {
{() => formatDuration(wfDuration(w.status))}
-
-
- {labels} +
+
+ { + let value = `${key}=${w.metadata.labels[key]}` + if (this.state.selectedLabels.indexOf(value) === -1) { + const newTags = this.state.selectedLabels.concat(value) + await this.setState({selectedLabels: newTags}) + } + this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination) + }} + />
From 0b4cf3416f79fab93e52fadc069149c091c6fddc Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Mon, 1 Jun 2020 15:48:25 -0700 Subject: [PATCH 04/25] fix(ui): linting issue with FontAwesome tags not being self closing --- .../workflows/components/workflow-labels/workflow-labels.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx index 6694d6ab484c..fe531976bf21 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx @@ -48,8 +48,8 @@ export class WorkflowLabels extends React.Component { this.state.hidden ? - (SHOW ) : - (HIDE ) + (SHOW ) : + (HIDE ) }
From 50018716fa89e8f76c1984af257f6581b62e630c Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Mon, 1 Jun 2020 15:55:12 -0700 Subject: [PATCH 05/25] Fix no new line at EOF issue --- .../workflow-labels/workflow-labels.scss | 84 +++++++++---------- .../workflow-labels/workflow-labels.tsx | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index 192fef50cbec..e61a26b44b01 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -1,53 +1,53 @@ @import 'node_modules/argo-ui/src/styles/config'; .wf-row-labels { - display: flex; - flex-wrap: wrap; - align-items: center; - height: 100%; - padding: 1em 0; - $gutter: 0.5em; + display: flex; + flex-wrap: wrap; + align-items: center; + height: 100%; + padding: 1em 0; + $gutter: 0.5em; - &__action { - text-decoration: underline; - cursor: pointer; - line-height: normal; - height: auto; - align-self: center; - padding: 10px; - padding-left: 0; - } - - .tag { - line-height: normal; - background-color: $argo-color-gray-3; - border-radius: 3px; - height: auto; - margin: $gutter 0; - margin-right: 4px; - display: flex; - overflow: hidden; - - &:hover { - .key { - color: $argo-color-teal-5; - } - .value { - color: $argo-color-gray-3; - } - } + &__action { + text-decoration: underline; + cursor: pointer; + line-height: normal; + height: auto; + align-self: center; + padding: 10px; + padding-left: 0; + } - .key, .value { - padding: 0.5em 8px; - } + .tag { + line-height: normal; + background-color: $argo-color-gray-3; + border-radius: 3px; + height: auto; + margin: $gutter 0; + margin-right: 4px; + display: flex; + overflow: hidden; + &:hover { .key { - color: $argo-color-gray-6; + color: $argo-color-teal-5; } - .value { - color: white; - background-color: $argo-color-teal-5; + color: $argo-color-gray-3; } } - } \ No newline at end of file + + .key, .value { + padding: 0.5em 8px; + } + + .key { + color: $argo-color-gray-6; + } + + .value { + color: white; + background-color: $argo-color-teal-5; + } + } +} diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx index fe531976bf21..58373346472e 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx @@ -55,4 +55,4 @@ export class WorkflowLabels extends React.Component ) } -} \ No newline at end of file +} From e88cd10cee8e5d0008a4d47c88fcc5980f67fce4 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 09:28:05 -0700 Subject: [PATCH 06/25] Linted --- .../components/tags-input/tags-input.tsx | 32 ++++--- .../workflow-labels/workflow-labels.tsx | 91 ++++++++++--------- .../workflows-list/workflows-list.tsx | 73 +++++++-------- 3 files changed, 103 insertions(+), 93 deletions(-) diff --git a/ui/src/app/shared/components/tags-input/tags-input.tsx b/ui/src/app/shared/components/tags-input/tags-input.tsx index 829f5673314f..369b652f48b8 100644 --- a/ui/src/app/shared/components/tags-input/tags-input.tsx +++ b/ui/src/app/shared/components/tags-input/tags-input.tsx @@ -26,20 +26,24 @@ export class TagsInput extends React.Component this.inputElement && this.inputElement.focus()}> - {this.props.tags ? this.props.tags.map((tag, i) => ( - - {tag}{' '} - { - const newTags = [...this.state.tags.slice(0, i), ...this.state.tags.slice(i + 1)]; - this.setState({tags: newTags}); - this.onTagsChange(newTags); - e.stopPropagation(); - }} - /> - - )) : } + {this.props.tags ? ( + this.props.tags.map((tag, i) => ( + + {tag}{' '} + { + const newTags = [...this.state.tags.slice(0, i), ...this.state.tags.slice(i + 1)]; + this.setState({tags: newTags}); + this.onTagsChange(newTags); + e.stopPropagation(); + }} + /> + + )) + ) : ( + + )} (this.autocompleteApi = api)} diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx index 58373346472e..552d4c33dc71 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx @@ -8,51 +8,56 @@ interface WorkflowLabelsProps { onChange: (key: string) => void; } -export class WorkflowLabels extends React.Component { - - constructor(props: WorkflowLabelsProps) { +export class WorkflowLabels extends React.Component { + constructor(props: WorkflowLabelsProps) { super(props); - this.state = { hidden: true }; + this.state = {hidden: true}; } + public render() { + const labels = []; + if (!this.state.hidden) { + const w = this.props.workflow; + if (w.metadata.labels) { + labels.push( + Object.keys(w.metadata.labels).map(key => ( +
{ + e.preventDefault(); + this.props.onChange(key); + }}> +
{key}
+
{w.metadata.labels[key]}
+
+ )) + ); + } else { + labels.push(
No labels
); + } + } - public render() { - let labels = [] - if (!this.state.hidden) { - let w = this.props.workflow - if (w.metadata.labels) { - labels.push(Object.keys(w.metadata.labels).map((key) => ( -
{ - e.preventDefault() - this.props.onChange(key) - }}> -
{key}
-
{w.metadata.labels[key]}
-
- ))) - } else { - labels.push(
No labels
) - } - } - - return ( -
- { labels } -
{ - e.preventDefault(); - this.setState({hidden:!this.state.hidden})} - } - className={`wf-row-labels__action wf-row-labels__action--${this.state.hidden ? 'show' : 'hide'}`}> - { this.state.hidden ? - (SHOW ) : - (HIDE ) - } -
-
- ) - } + return ( +
+ {labels} +
{ + e.preventDefault(); + this.setState({hidden: !this.state.hidden}); + }} + className={`wf-row-labels__action wf-row-labels__action--${this.state.hidden ? 'show' : 'hide'}`}> + {this.state.hidden ? ( + + SHOW {' '} + + ) : ( + + HIDE + + )} +
+
+ ); + } } diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 59b519658f29..78fabd15de1a 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -271,43 +271,44 @@ export class WorkflowsList extends BasePage, State> {
DURATION
LABELS
- {this.state.workflows.map(w => { + {this.state.workflows.map(w => { return ( - -
- -
-
{w.metadata.name}
-
{w.metadata.namespace}
-
- -
-
- -
-
- {() => formatDuration(wfDuration(w.status))} -
-
-
- { - let value = `${key}=${w.metadata.labels[key]}` - if (this.state.selectedLabels.indexOf(value) === -1) { - const newTags = this.state.selectedLabels.concat(value) - await this.setState({selectedLabels: newTags}) - } - this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination) - }} - /> -
-
- - )})} + +
+ +
+
{w.metadata.name}
+
{w.metadata.namespace}
+
+ +
+
+ +
+
+ {() => formatDuration(wfDuration(w.status))} +
+
+
+ { + const value = `${key}=${w.metadata.labels[key]}`; + if (this.state.selectedLabels.indexOf(value) === -1) { + const newTags = this.state.selectedLabels.concat(value); + await this.setState({selectedLabels: newTags}); + } + this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination); + }} + /> +
+
+ + ); + })}
this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, pagination)} From b61ca97576f440c2a02ca8db686146fef0ec0580 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 11:21:46 -0700 Subject: [PATCH 07/25] Remove text-decoration from SHOW / HIDE buttons and remove async / await from labels column --- .../components/workflow-labels/workflow-labels.scss | 1 - .../workflows/components/workflows-list/workflows-list.tsx | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index e61a26b44b01..fa129552e021 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -9,7 +9,6 @@ $gutter: 0.5em; &__action { - text-decoration: underline; cursor: pointer; line-height: normal; height: auto; diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 78fabd15de1a..fcc20af0e08d 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -297,11 +297,12 @@ export class WorkflowsList extends BasePage, State> { workflow={w} onChange={async key => { const value = `${key}=${w.metadata.labels[key]}`; + let newTags: string[] = []; if (this.state.selectedLabels.indexOf(value) === -1) { - const newTags = this.state.selectedLabels.concat(value); - await this.setState({selectedLabels: newTags}); + newTags = this.state.selectedLabels.concat(value); + this.setState({selectedLabels: newTags}); } - this.changeFilters(this.state.namespace, this.state.selectedPhases, this.state.selectedLabels, this.state.pagination); + this.changeFilters(this.state.namespace, this.state.selectedPhases, newTags, this.state.pagination); }} /> From 9a7b5dccfc960e89d3e0d81dac2153ab819d9ef8 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 11:26:04 -0700 Subject: [PATCH 08/25] Resize workflows list columns for better visibility. --- .../components/workflows-list/workflows-list.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index fcc20af0e08d..79f83fad7665 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -264,10 +264,10 @@ export class WorkflowsList extends BasePage, State> {
-
NAME
-
NAMESPACE
-
STARTED
-
FINISHED
+
NAME
+
NAMESPACE
+
STARTED
+
FINISHED
DURATION
LABELS
@@ -280,12 +280,12 @@ export class WorkflowsList extends BasePage, State> {
-
{w.metadata.name}
-
{w.metadata.namespace}
-
+
{w.metadata.name}
+
{w.metadata.namespace}
+
-
+
From a7a7c027f206455ef2b132e2c8305934f73f99bb Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 11:28:35 -0700 Subject: [PATCH 09/25] Change variable name of workflow to match convention --- .../workflows-list/workflows-list.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 79f83fad7665..71e9f2f1da5a 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -271,32 +271,32 @@ export class WorkflowsList extends BasePage, State> {
DURATION
LABELS
- {this.state.workflows.map(w => { + {this.state.workflows.map(wf => { return ( + key={`${wf.metadata.namespace}-${wf.metadata.name}`} + to={uiUrl(`workflows/${wf.metadata.namespace}/${wf.metadata.name}`)}>
- +
-
{w.metadata.name}
-
{w.metadata.namespace}
+
{wf.metadata.name}
+
{wf.metadata.namespace}
- +
- +
- {() => formatDuration(wfDuration(w.status))} + {() => formatDuration(wfDuration(wf.status))}
{ - const value = `${key}=${w.metadata.labels[key]}`; + const value = `${key}=${wf.metadata.labels[key]}`; let newTags: string[] = []; if (this.state.selectedLabels.indexOf(value) === -1) { newTags = this.state.selectedLabels.concat(value); From 376d96f8e1c639076d93995f5984cf742dafd79f Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 11:29:36 -0700 Subject: [PATCH 10/25] Linted --- .../app/workflows/components/workflows-list/workflows-list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 71e9f2f1da5a..12e3670d6c99 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -297,7 +297,7 @@ export class WorkflowsList extends BasePage, State> { workflow={wf} onChange={async key => { const value = `${key}=${wf.metadata.labels[key]}`; - let newTags: string[] = []; + let newTags: string[] = []; if (this.state.selectedLabels.indexOf(value) === -1) { newTags = this.state.selectedLabels.concat(value); this.setState({selectedLabels: newTags}); From 71864097f6e13a3465c9732d008272bf3879e4ae Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 13:15:11 -0700 Subject: [PATCH 11/25] Refactor workflows list by separating out rows into an independent component to keep track of show/hide state. Reformat column widths for readability and change format of labels --- .../workflow-labels/workflow-labels.scss | 16 +--- .../workflow-labels/workflow-labels.tsx | 63 +++++---------- .../workflows-list/workflows-list.scss | 4 + .../workflows-list/workflows-list.tsx | 62 +++++---------- .../workflows-row/workflows-row.tsx | 76 +++++++++++++++++++ 5 files changed, 122 insertions(+), 99 deletions(-) create mode 100644 ui/src/app/workflows/components/workflows-row/workflows-row.tsx diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index fa129552e021..6cd588d677c1 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -5,25 +5,17 @@ flex-wrap: wrap; align-items: center; height: 100%; - padding: 1em 0; + padding: 0.25em 0; $gutter: 0.5em; - - &__action { - cursor: pointer; - line-height: normal; - height: auto; - align-self: center; - padding: 10px; - padding-left: 0; - } + font-size: .8125em; .tag { line-height: normal; - background-color: $argo-color-gray-3; + background-color: $argo-color-gray-1; border-radius: 3px; height: auto; margin: $gutter 0; - margin-right: 4px; + margin-right: 10px; display: flex; overflow: hidden; diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx index 552d4c33dc71..9750cea5ce62 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.tsx @@ -8,56 +8,33 @@ interface WorkflowLabelsProps { onChange: (key: string) => void; } -export class WorkflowLabels extends React.Component { +export class WorkflowLabels extends React.Component { constructor(props: WorkflowLabelsProps) { super(props); - this.state = {hidden: true}; } public render() { const labels = []; - if (!this.state.hidden) { - const w = this.props.workflow; - if (w.metadata.labels) { - labels.push( - Object.keys(w.metadata.labels).map(key => ( -
{ - e.preventDefault(); - this.props.onChange(key); - }}> -
{key}
-
{w.metadata.labels[key]}
-
- )) - ); - } else { - labels.push(
No labels
); - } + const w = this.props.workflow; + if (w.metadata.labels) { + labels.push( + Object.keys(w.metadata.labels).map(key => ( +
{ + e.preventDefault(); + this.props.onChange(key); + }}> +
{key}
+
{w.metadata.labels[key]}
+
+ )) + ); + } else { + labels.push(
No labels
); } - return ( -
- {labels} -
{ - e.preventDefault(); - this.setState({hidden: !this.state.hidden}); - }} - className={`wf-row-labels__action wf-row-labels__action--${this.state.hidden ? 'show' : 'hide'}`}> - {this.state.hidden ? ( - - SHOW {' '} - - ) : ( - - HIDE - - )} -
-
- ); + return
{labels}
; } } diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.scss b/ui/src/app/workflows/components/workflows-list/workflows-list.scss index 0839594949c7..9ad0ea2df2bc 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.scss +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.scss @@ -3,6 +3,10 @@ .workflows-list { padding: 1em; + &__status { + max-width: 40px; + } + &__labels-container { height: 100%; } diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 12e3670d6c99..25a94b9a2d7b 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import {Link, RouteComponentProps} from 'react-router-dom'; +import {RouteComponentProps} from 'react-router-dom'; import {Subscription} from 'rxjs'; import {Autocomplete, Page, SlidingPanel} from 'argo-ui'; @@ -17,15 +17,11 @@ import {ZeroState} from '../../../shared/components/zero-state'; import {exampleWorkflow} from '../../../shared/examples'; import {Utils} from '../../../shared/utils'; -import {Ticker} from 'argo-ui/src/index'; import {CostOptimisationNudge} from '../../../shared/components/cost-optimisation-nudge'; import {PaginationPanel} from '../../../shared/components/pagination-panel'; -import {PhaseIcon} from '../../../shared/components/phase-icon'; -import {Timestamp} from '../../../shared/components/timestamp'; -import {formatDuration, wfDuration} from '../../../shared/duration'; import {Pagination, parseLimit} from '../../../shared/pagination'; import {WorkflowFilters} from '../workflow-filters/workflow-filters'; -import {WorkflowLabels} from '../workflow-labels/workflow-labels'; +import {WorkflowsRow} from '../workflows-row/workflows-row'; require('./workflows-list.scss'); @@ -263,51 +259,29 @@ export class WorkflowsList extends BasePage, State> { )}
-
-
NAME
-
NAMESPACE
+
+
NAME
+
NAMESPACE
STARTED
FINISHED
DURATION
-
LABELS
+
LABELS
{this.state.workflows.map(wf => { return ( - -
- -
-
{wf.metadata.name}
-
{wf.metadata.namespace}
-
- -
-
- -
-
- {() => formatDuration(wfDuration(wf.status))} -
-
-
- { - const value = `${key}=${wf.metadata.labels[key]}`; - let newTags: string[] = []; - if (this.state.selectedLabels.indexOf(value) === -1) { - newTags = this.state.selectedLabels.concat(value); - this.setState({selectedLabels: newTags}); - } - this.changeFilters(this.state.namespace, this.state.selectedPhases, newTags, this.state.pagination); - }} - /> -
-
- + onChange={key => { + const value = `${key}=${wf.metadata.labels[key]}`; + let newTags: string[] = []; + if (this.state.selectedLabels.indexOf(value) === -1) { + newTags = this.state.selectedLabels.concat(value); + this.setState({selectedLabels: newTags}); + } + this.changeFilters(this.state.namespace, this.state.selectedPhases, newTags, this.state.pagination); + }} + /> ); })}
diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx new file mode 100644 index 000000000000..c130d5b40ad5 --- /dev/null +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -0,0 +1,76 @@ +import {Ticker} from 'argo-ui/src/index'; +import * as React from 'react'; +import {Link} from 'react-router-dom'; +import * as models from '../../../../models'; +import {uiUrl} from '../../../shared/base'; +import {PhaseIcon} from '../../../shared/components/phase-icon'; +import {Timestamp} from '../../../shared/components/timestamp'; +import {formatDuration, wfDuration} from '../../../shared/duration'; +import {WorkflowLabels} from '../workflow-labels/workflow-labels'; + +interface WorkflowsRowProps { + workflow: models.Workflow; + onChange: (key: string) => void; +} +export class WorkflowsRow extends React.Component { + constructor(props: WorkflowsRowProps) { + super(props); + this.state = {hideLabels: true}; + } + + public render() { + const wf = this.props.workflow; + return ( +
+ +
+ +
+
{wf.metadata.name}
+
{wf.metadata.namespace}
+
+ +
+
+ +
+
+ {() => formatDuration(wfDuration(wf.status))} +
+
+
+
{ + e.preventDefault(); + this.setState({hideLabels: !this.state.hideLabels}); + }} + className={`workflows-row__action workflows-row__action--${this.state.hideLabels ? 'show' : 'hide'}`}> + {this.state.hideLabels ? ( + + SHOW {' '} + + ) : ( + + HIDE + + )} +
+
+
+ + {this.state.hideLabels ? ( + + ) : ( +
+ { + this.props.onChange(key); + }} + /> +
+ )} +
+ ); + } +} From 85e115ad651b4887c130a23bba05af9acafd08c1 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 14:40:34 -0700 Subject: [PATCH 12/25] Style labels to emphasize which row they belong to --- .../workflows/components/workflow-labels/workflow-labels.scss | 4 ++++ .../app/workflows/components/workflows-row/workflows-row.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index 6cd588d677c1..4303f6136bb8 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -8,6 +8,10 @@ padding: 0.25em 0; $gutter: 0.5em; font-size: .8125em; + background-color: $argo-color-gray-5; + margin-top: -8px; + padding: 0.5em 15px; + border-radius: 0 0 3px 3px; .tag { line-height: normal; diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx index c130d5b40ad5..7f295877eddf 100644 --- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -21,7 +21,7 @@ export class WorkflowsRow extends React.Component +
From c0b630f09b26e5df7d7cb16a62d9e51221757700 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 14:58:08 -0700 Subject: [PATCH 13/25] Fix colors of label drawer for better contrast --- .../workflows/components/workflow-labels/workflow-labels.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index 4303f6136bb8..38bbd8a16aef 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -8,14 +8,14 @@ padding: 0.25em 0; $gutter: 0.5em; font-size: .8125em; - background-color: $argo-color-gray-5; + background-color: $argo-color-gray-1; margin-top: -8px; padding: 0.5em 15px; border-radius: 0 0 3px 3px; .tag { line-height: normal; - background-color: $argo-color-gray-1; + background-color: $argo-color-gray-3; border-radius: 3px; height: auto; margin: $gutter 0; From 1a5031f067b1f7f00d1b97ac6e404a03af2dd3e1 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 17:08:03 -0700 Subject: [PATCH 14/25] feat(ui): Add more details to workflow labels drawer: message, resources duration, and conditions --- .../workflow-drawer/workflow-drawer.scss | 119 ++++++++++++++++++ .../workflow-drawer/workflow-drawer.tsx | 89 +++++++++++++ .../workflow-labels/workflow-labels.scss | 45 +------ .../workflows-list/workflows-list.tsx | 2 +- .../workflows-row/workflows-row.tsx | 28 ++--- 5 files changed, 224 insertions(+), 59 deletions(-) create mode 100644 ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss create mode 100644 ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss new file mode 100644 index 000000000000..b0d75e5d735f --- /dev/null +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss @@ -0,0 +1,119 @@ +@import 'node_modules/argo-ui/src/styles/config'; + +.workflow-drawer { + height: 100%; + font-size: .8125em; + background-color: $argo-color-gray-1; + margin-top: -8px; + padding: 1.5em 15px; + border-radius: 0 0 3px 3px; + + &__section { + padding: 1em 0; + box-sizing: border-box; + border-top: 2px solid $argo-color-gray-3; + + &:first-child { + padding-top: 0; + } + + &:last-child { + padding-bottom: 0; + } + } + + &__message { + + &--label { + margin-bottom: 1em; + } + + &--content { + font-weight: 600; + } + + } + + &__labels { + border-top: none; + &--list { + margin-top: 0.5em; + } + } + + .tag { + line-height: normal; + background-color: $argo-color-gray-3; + border-radius: 3px; + height: auto; + margin: 0.5em 0; + margin-right: 10px; + display: flex; + overflow: hidden; + cursor: pointer; + + &:hover { + .key { + color: $argo-color-teal-5; + } + .value { + color: $argo-color-gray-3; + } + } + + .key, .value { + padding: 0.5em 8px; + } + + .key { + color: $argo-color-gray-6; + } + + .value { + color: white; + background-color: $argo-color-teal-5; + } + } + + &__resourcesDuration { + display: flex; + align-items: center; + + $gutter: 2em; + + &--label { + margin-left: 0.5em; + } + + &--value { + font-weight: 600; + } + + &--container { + padding-left: $gutter / 2; + margin-left: $gutter / 2; + border-left: 1px solid $argo-color-gray-3; + } + + } + + &__conditions { + display: flex; + margin-top: 0.5em; + + .tag { + cursor: default; + &:hover { + + .key { + color: $argo-color-gray-6; + } + + .value { + color: white; + } + + } + } + } +} \ No newline at end of file diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx new file mode 100644 index 000000000000..e65b7faca719 --- /dev/null +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx @@ -0,0 +1,89 @@ +import * as React from 'react'; +import * as models from '../../../../models'; + +import {WorkflowLabels} from '../workflow-labels/workflow-labels'; + +require('./workflow-drawer.scss'); + +interface WorkflowDrawerProps { + workflow: models.Workflow; + onChange: (key: string) => void; +} + +export class WorkflowDrawer extends React.Component { + render () { + let wf = this.props.workflow; + return ( +
+
+
LABELS
+
+ { + this.props.onChange(key); + }} + /> +
+
+ { !wf.status.message ? : +
+
+ MESSAGE +
+
+ {wf.status.message} +
+
+ } + { !wf.status.resourcesDuration ? : +
+
+
+ RESOURCES DURATION  + + + +
+
+
+ + {wf.status.resourcesDuration.cpu} sec + + + (*1 CPU) + +
+
+ + {wf.status.resourcesDuration.memory} sec + + + (*100Mi Memory) + +
+
+
+
+ } + { !wf.status.conditions ? : +
+
+ CONDITIONS +
+
+ { wf.status.conditions.map((condition) => { + return ( +
+
{condition.type}
+
{condition.status}
+
+ ) + }) } +
+
+ } +
+ ) + } +} \ No newline at end of file diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index 38bbd8a16aef..31d29b68f14e 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -1,48 +1,7 @@ @import 'node_modules/argo-ui/src/styles/config'; .wf-row-labels { - display: flex; - flex-wrap: wrap; + display: flex; + flex-wrap: wrap; align-items: center; - height: 100%; - padding: 0.25em 0; - $gutter: 0.5em; - font-size: .8125em; - background-color: $argo-color-gray-1; - margin-top: -8px; - padding: 0.5em 15px; - border-radius: 0 0 3px 3px; - - .tag { - line-height: normal; - background-color: $argo-color-gray-3; - border-radius: 3px; - height: auto; - margin: $gutter 0; - margin-right: 10px; - display: flex; - overflow: hidden; - - &:hover { - .key { - color: $argo-color-teal-5; - } - .value { - color: $argo-color-gray-3; - } - } - - .key, .value { - padding: 0.5em 8px; - } - - .key { - color: $argo-color-gray-6; - } - - .value { - color: white; - background-color: $argo-color-teal-5; - } - } } diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 25a94b9a2d7b..4d02d5d593fa 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -265,7 +265,7 @@ export class WorkflowsList extends BasePage, State> {
STARTED
FINISHED
DURATION
-
LABELS
+
DETAILS
{this.state.workflows.map(wf => { return ( diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx index 7f295877eddf..451f3d4706ae 100644 --- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -6,16 +6,16 @@ import {uiUrl} from '../../../shared/base'; import {PhaseIcon} from '../../../shared/components/phase-icon'; import {Timestamp} from '../../../shared/components/timestamp'; import {formatDuration, wfDuration} from '../../../shared/duration'; -import {WorkflowLabels} from '../workflow-labels/workflow-labels'; +import {WorkflowDrawer} from '../workflow-drawer/workflow-drawer'; interface WorkflowsRowProps { workflow: models.Workflow; onChange: (key: string) => void; } -export class WorkflowsRow extends React.Component { +export class WorkflowsRow extends React.Component { constructor(props: WorkflowsRowProps) { super(props); - this.state = {hideLabels: true}; + this.state = {hideDrawer: true}; } public render() { @@ -42,10 +42,10 @@ export class WorkflowsRow extends React.Component { e.preventDefault(); - this.setState({hideLabels: !this.state.hideLabels}); + this.setState({hideDrawer: !this.state.hideDrawer}); }} - className={`workflows-row__action workflows-row__action--${this.state.hideLabels ? 'show' : 'hide'}`}> - {this.state.hideLabels ? ( + className={`workflows-row__action workflows-row__action--${this.state.hideDrawer ? 'show' : 'hide'}`}> + {this.state.hideDrawer ? ( SHOW {' '} @@ -58,17 +58,15 @@ export class WorkflowsRow extends React.Component
- {this.state.hideLabels ? ( + {this.state.hideDrawer ? ( ) : ( -
- { - this.props.onChange(key); - }} - /> -
+ { + this.props.onChange(key); + }} + /> )}
); From d85d1927d45806808cd62fd700eb55b4b2a2d2fc Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 17:14:42 -0700 Subject: [PATCH 15/25] Linted --- .../workflow-drawer/workflow-drawer.tsx | 138 +++++++++--------- .../workflows-row/workflows-row.tsx | 2 +- 2 files changed, 66 insertions(+), 74 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx index e65b7faca719..9cb9964c9b34 100644 --- a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx @@ -11,79 +11,71 @@ interface WorkflowDrawerProps { } export class WorkflowDrawer extends React.Component { - render () { - let wf = this.props.workflow; - return ( -
-
-
LABELS
-
- { - this.props.onChange(key); - }} - /> -
-
- { !wf.status.message ? : -
-
- MESSAGE -
-
- {wf.status.message} -
-
- } - { !wf.status.resourcesDuration ? : + public render() { + const wf = this.props.workflow; + return ( +
+
+
LABELS
+
+ { + this.props.onChange(key); + }} + /> +
+
+ {!wf.status.message ? ( + + ) : ( +
+
MESSAGE
+
{wf.status.message}
+
+ )} + {!wf.status.resourcesDuration ? ( + + ) : (
-
-
+
+
RESOURCES DURATION  - - - -
-
-
- - {wf.status.resourcesDuration.cpu} sec - - - (*1 CPU) - -
-
- - {wf.status.resourcesDuration.memory} sec - - - (*100Mi Memory) - -
-
-
-
- } - { !wf.status.conditions ? : + + + +
+
+
+ {wf.status.resourcesDuration.cpu} sec + (*1 CPU) +
+
+ {wf.status.resourcesDuration.memory} sec + (*100Mi Memory) +
+
+
+
+ )} + {!wf.status.conditions ? ( + + ) : (
-
- CONDITIONS -
-
- { wf.status.conditions.map((condition) => { - return ( -
-
{condition.type}
-
{condition.status}
-
- ) - }) } -
-
- } -
- ) - } -} \ No newline at end of file +
CONDITIONS
+
+ {wf.status.conditions.map(condition => { + return ( +
+
{condition.type}
+
{condition.status}
+
+ ); + })} +
+
+ )} +
+ ); + } +} diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx index 451f3d4706ae..157de997db09 100644 --- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -66,7 +66,7 @@ export class WorkflowsRow extends React.Component { this.props.onChange(key); }} - /> + /> )}
); From b24ee9047a4ea50779038b5567df83a80568a0ce Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 17:29:08 -0700 Subject: [PATCH 16/25] Fix format of labels --- .../components/workflow-drawer/workflow-drawer.scss | 4 ++++ .../components/workflow-drawer/workflow-drawer.tsx | 6 +++--- .../components/workflow-labels/workflow-labels.scss | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss index b0d75e5d735f..5104961dd900 100644 --- a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.scss @@ -20,6 +20,10 @@ &:last-child { padding-bottom: 0; } + + &:only-child { + padding: 0; + } } &__message { diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx index 9cb9964c9b34..bdcd736d97eb 100644 --- a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx @@ -27,7 +27,7 @@ export class WorkflowDrawer extends React.Component {
{!wf.status.message ? ( - + null ) : (
MESSAGE
@@ -35,7 +35,7 @@ export class WorkflowDrawer extends React.Component {
)} {!wf.status.resourcesDuration ? ( - + null ) : (
@@ -59,7 +59,7 @@ export class WorkflowDrawer extends React.Component {
)} {!wf.status.conditions ? ( - + null ) : (
CONDITIONS
diff --git a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss index 38bbd8a16aef..ac06ff12ef8e 100644 --- a/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss +++ b/ui/src/app/workflows/components/workflow-labels/workflow-labels.scss @@ -5,12 +5,9 @@ flex-wrap: wrap; align-items: center; height: 100%; - padding: 0.25em 0; $gutter: 0.5em; - font-size: .8125em; background-color: $argo-color-gray-1; margin-top: -8px; - padding: 0.5em 15px; border-radius: 0 0 3px 3px; .tag { From 251f89fd2e860c6b7697166c5f08c357ed524232 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Tue, 2 Jun 2020 17:29:36 -0700 Subject: [PATCH 17/25] Linted --- .../components/workflow-drawer/workflow-drawer.tsx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx index bdcd736d97eb..4bae64c278cc 100644 --- a/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx +++ b/ui/src/app/workflows/components/workflow-drawer/workflow-drawer.tsx @@ -26,17 +26,13 @@ export class WorkflowDrawer extends React.Component { />
- {!wf.status.message ? ( - null - ) : ( + {!wf.status.message ? null : (
MESSAGE
{wf.status.message}
)} - {!wf.status.resourcesDuration ? ( - null - ) : ( + {!wf.status.resourcesDuration ? null : (
@@ -58,9 +54,7 @@ export class WorkflowDrawer extends React.Component {
)} - {!wf.status.conditions ? ( - null - ) : ( + {!wf.status.conditions ? null : (
CONDITIONS
From 7ec99615c21e418a12c34fe4674d7e64a4082335 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Wed, 3 Jun 2020 14:10:58 -0700 Subject: [PATCH 18/25] Add lazy loading for workflows list drawer --- .../components/workflows-row/workflows-row.tsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx index 82dda5abcb7f..c34a39fc2182 100644 --- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -6,6 +6,7 @@ import {uiUrl} from '../../../shared/base'; import {PhaseIcon} from '../../../shared/components/phase-icon'; import {Timestamp} from '../../../shared/components/timestamp'; import {formatDuration, wfDuration} from '../../../shared/duration'; +import {services} from '../../../shared/services'; import {WorkflowDrawer} from '../workflow-drawer/workflow-drawer'; interface WorkflowsRowProps { @@ -13,10 +14,13 @@ interface WorkflowsRowProps { onChange: (key: string) => void; } -export class WorkflowsRow extends React.Component { +export class WorkflowsRow extends React.Component { constructor(props: WorkflowsRowProps) { super(props); - this.state = {hideDrawer: true}; + this.state = { + workflow: this.props.workflow, + hideDrawer: true + }; } public render() { @@ -43,6 +47,7 @@ export class WorkflowsRow extends React.Component { e.preventDefault(); + this.fetchWorkflow(); this.setState({hideDrawer: !this.state.hideDrawer}); }} className={`workflows-row__action workflows-row__action--${this.state.hideDrawer ? 'show' : 'hide'}`}> @@ -72,4 +77,10 @@ export class WorkflowsRow extends React.Component ); } + + private fetchWorkflow(): void { + services.workflows.get(this.props.workflow.metadata.namespace, this.props.workflow.metadata.name).then(wf => { + this.setState({workflow: wf}); + }); + } } From ae73519024852b3f1953d7273c219fe1534684fb Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Wed, 3 Jun 2020 16:41:09 -0700 Subject: [PATCH 19/25] fix(server): Allow for field selection for workflow-event endpoint. Fixes #3163 --- api/openapi-spec/swagger.json | 5 ++++ go.mod | 9 +++---- go.sum | 26 +++---------------- pkg/apiclient/workflow/workflow.proto | 1 + pkg/apiclient/workflow/workflow.swagger.json | 6 +++++ .../app/shared/services/workflows-service.ts | 5 +++- 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 6ca5c096602b..68ef7246c36b 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -754,6 +754,11 @@ "description": "The continue option should be set when retrieving more results from the server. Since this value is\nserver defined, clients may only use the continue value from a previous query result with identical\nquery parameters (except for the value of continue) and the server may reject a continue value it\ndoes not recognize. If the specified continue value is no longer valid whether due to expiration\n(generally five to fifteen minutes) or a configuration change on the server, the server will\nrespond with a 410 ResourceExpired error together with a continue token. If the client needs a\nconsistent list, it must restart their list without the continue field. Otherwise, the client may\nsend another list request with the token received with the 410 error, the server will respond with\na list starting from the next key, but from the latest snapshot, which is inconsistent from the\nprevious list results - objects that are created, modified, or deleted after the first list request\nwill be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last\nresourceVersion value returned by the server and not miss any modifications.", "name": "listOptions.continue", "in": "query" + }, + { + "type": "string", + "name": "fields", + "in": "query" } ], "responses": { diff --git a/go.mod b/go.mod index 6b27be49050f..675c32f34055 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/go-openapi/swag v0.19.8 // indirect github.com/go-sql-driver/mysql v1.4.1 github.com/gogo/protobuf v1.3.1 - github.com/golang/protobuf v1.4.0 + github.com/golang/protobuf v1.3.5 github.com/googleapis/gnostic v0.3.1 // indirect github.com/gophercloud/gophercloud v0.7.0 // indirect github.com/gorilla/websocket v1.4.1 @@ -71,19 +71,18 @@ require ( github.com/valyala/fasttemplate v1.1.0 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20200422194213-44a606286825 - golang.org/x/net v0.0.0-20200421231249-e086a090c8fd + golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 + golang.org/x/net v0.0.0-20200301022130-244492dfa37a golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect google.golang.org/api v0.20.0 - google.golang.org/appengine v1.6.6 // indirect google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24 google.golang.org/grpc v1.28.0 gopkg.in/ini.v1 v1.54.0 // indirect gopkg.in/jcmturner/goidentity.v2 v2.0.0 // indirect gopkg.in/jcmturner/gokrb5.v5 v5.3.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect - gopkg.in/square/go-jose.v2 v2.5.0 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v2 v2.2.8 k8s.io/api v0.0.0-20191219150132-17cfeff5d095 diff --git a/go.sum b/go.sum index c6003812a567..c8cbd7f904e6 100644 --- a/go.sum +++ b/go.sum @@ -206,12 +206,6 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -497,8 +491,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200422194213-44a606286825 h1:dSChiwOTvzwbHFTMq2l6uRardHH7/E6SqEkqccinS/o= -golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA= +golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -563,8 +557,6 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -611,8 +603,6 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d h1:62ap6LNOjDU6uGmKXHJbSfciMoV+FeI1sRXx/pLDL44= golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -687,8 +677,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -722,12 +710,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -753,8 +735,8 @@ gopkg.in/jcmturner/rpc.v0 v0.0.2 h1:wBTgrbL1qmLBUPsYVCqdJiI5aJgQhexmK+JkTHPUNJI= gopkg.in/jcmturner/rpc.v0 v0.0.2/go.mod h1:NzMq6cRzR9lipgw7WxRBHNx5N8SifBuaCQsOT1kWY/E= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/square/go-jose.v2 v2.5.0 h1:OZ4sdq+Y+SHfYB7vfthi1Ei8b0vkP8ZPQgUfUwdUSqo= -gopkg.in/square/go-jose.v2 v2.5.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto index fdae7050471c..32a0dc74cb3a 100644 --- a/pkg/apiclient/workflow/workflow.proto +++ b/pkg/apiclient/workflow/workflow.proto @@ -89,6 +89,7 @@ message WorkflowDeleteResponse { message WatchWorkflowsRequest { string namespace = 1; k8s.io.apimachinery.pkg.apis.meta.v1.ListOptions listOptions = 2; + string fields = 3; } message WorkflowWatchEvent { diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json index 7772b7003bc6..f084bcfbe8f8 100644 --- a/pkg/apiclient/workflow/workflow.swagger.json +++ b/pkg/apiclient/workflow/workflow.swagger.json @@ -98,6 +98,12 @@ "in": "query", "required": false, "type": "string" + }, + { + "name": "fields", + "in": "query", + "required": false, + "type": "string" } ], "tags": [ diff --git a/ui/src/app/shared/services/workflows-service.ts b/ui/src/app/shared/services/workflows-service.ts index d2ea2be4619d..e4295dfc5e23 100644 --- a/ui/src/app/shared/services/workflows-service.ts +++ b/ui/src/app/shared/services/workflows-service.ts @@ -8,6 +8,7 @@ import requests from './requests'; import {WorkflowDeleteResponse} from './responses'; export class WorkflowsService { + public create(workflow: Workflow, namespace: string) { return requests .post(`api/v1/workflows/${namespace}`) @@ -32,7 +33,9 @@ export class WorkflowsService { } public watch(filter: {namespace?: string; name?: string; phases?: Array; labels?: Array}): Observable> { - const url = `api/v1/workflow-events/${filter.namespace || ''}?${this.queryParams(filter).join('&')}`; + const params = this.queryParams(filter); + params.push(`fields=result.object.metadata.name,result.object.metadata.namespace,result.object.status.finishedAt,result.object.status.startedAt,result.object.status.phase`); + const url = `api/v1/workflow-events/${filter.namespace || ''}?${params.join('&')}`; return requests.loadEventSource(url, true).map(data => JSON.parse(data).result as models.kubernetes.WatchEvent); } From 162f49559cb4a24eadccb20129b8ce04fb36faca Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Thu, 4 Jun 2020 16:42:09 -0700 Subject: [PATCH 20/25] Apply codegen changes --- pkg/apiclient/workflow/workflow.pb.go | 212 ++++++++++++++++---------- 1 file changed, 131 insertions(+), 81 deletions(-) diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go index 48bfe808bae1..e0a7ef27c7d4 100644 --- a/pkg/apiclient/workflow/workflow.pb.go +++ b/pkg/apiclient/workflow/workflow.pb.go @@ -806,6 +806,7 @@ var xxx_messageInfo_WorkflowDeleteResponse proto.InternalMessageInfo type WatchWorkflowsRequest struct { Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` + Fields string `protobuf:"bytes,3,opt,name=fields,proto3" json:"fields,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -858,6 +859,13 @@ func (m *WatchWorkflowsRequest) GetListOptions() *v1.ListOptions { return nil } +func (m *WatchWorkflowsRequest) GetFields() string { + if m != nil { + return m.Fields + } + return "" +} + type WorkflowWatchEvent struct { // the type of change Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` @@ -1121,87 +1129,86 @@ func init() { } var fileDescriptor_1f6bb75f9e833cb6 = []byte{ - // 1265 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x5d, 0x6f, 0xdc, 0x44, - 0x17, 0xc7, 0x35, 0x9b, 0x3e, 0x6d, 0x3a, 0x4d, 0xd2, 0xa7, 0x03, 0x94, 0x95, 0xd5, 0xa6, 0xe9, - 0x40, 0x21, 0x7d, 0x89, 0x9d, 0x4d, 0x0b, 0x94, 0x4a, 0x05, 0xb5, 0x4d, 0x89, 0x80, 0x15, 0x54, - 0x5e, 0x10, 0x2a, 0x77, 0x8e, 0xf7, 0xc4, 0x71, 0xe3, 0xf5, 0x18, 0xcf, 0xec, 0x46, 0x4b, 0x15, - 0x10, 0x5c, 0x72, 0x01, 0x17, 0xdc, 0x20, 0xb8, 0xe1, 0x55, 0x42, 0x42, 0x42, 0x45, 0x7c, 0x09, - 0x2e, 0x91, 0xf8, 0x02, 0x28, 0xea, 0x07, 0x41, 0x33, 0xb6, 0xc7, 0x76, 0x76, 0xbb, 0x35, 0x71, - 0x45, 0xef, 0x66, 0x3c, 0x9e, 0x73, 0x7e, 0x73, 0xce, 0x99, 0xe3, 0xbf, 0x8c, 0xcf, 0x44, 0x5b, - 0x9e, 0xe5, 0x44, 0xbe, 0x1b, 0xf8, 0x10, 0x0a, 0x6b, 0x9b, 0xc5, 0x5b, 0x1b, 0x01, 0xdb, 0xd6, - 0x03, 0x33, 0x8a, 0x99, 0x60, 0x64, 0x3a, 0x9b, 0x1b, 0x4b, 0x9e, 0x2f, 0x36, 0xfb, 0xeb, 0xa6, - 0xcb, 0x7a, 0x96, 0xc7, 0x3c, 0x66, 0xa9, 0x17, 0xd6, 0xfb, 0x1b, 0x6a, 0xa6, 0x26, 0x6a, 0x94, - 0x6c, 0x34, 0x4e, 0x78, 0x8c, 0x79, 0x01, 0x48, 0x17, 0x96, 0x13, 0x86, 0x4c, 0x38, 0xc2, 0x67, - 0x21, 0x4f, 0x57, 0x2f, 0x6d, 0x5d, 0xe6, 0xa6, 0xcf, 0xe4, 0x6a, 0xcf, 0x71, 0x37, 0xfd, 0x10, - 0xe2, 0xa1, 0x95, 0x12, 0x71, 0xab, 0x07, 0xc2, 0xb1, 0x06, 0x2d, 0xcb, 0x83, 0x10, 0x62, 0x47, - 0x40, 0x37, 0xdd, 0x75, 0xa3, 0x80, 0xe0, 0xc4, 0xca, 0xe9, 0x1d, 0x35, 0xc8, 0xb7, 0xea, 0x73, - 0x0c, 0x5a, 0x4e, 0x10, 0x6d, 0x3a, 0xa3, 0x46, 0x68, 0xee, 0xda, 0x72, 0x59, 0x0c, 0x63, 0x1c, - 0xd1, 0xdf, 0x1b, 0xf8, 0xa9, 0xf7, 0x52, 0x4b, 0x37, 0x62, 0x70, 0x04, 0xd8, 0xf0, 0x41, 0x1f, - 0xb8, 0x20, 0x27, 0xf0, 0xe1, 0xd0, 0xe9, 0x01, 0x8f, 0x1c, 0x17, 0x9a, 0x68, 0x01, 0x2d, 0x1e, - 0xb6, 0xf3, 0x07, 0xe4, 0x36, 0xd6, 0xf1, 0x6a, 0x36, 0x16, 0xd0, 0xe2, 0x91, 0x95, 0xab, 0x66, - 0xce, 0x6c, 0x66, 0xcc, 0x6a, 0x60, 0x46, 0x5b, 0x9e, 0x29, 0x99, 0x4d, 0x1d, 0xf2, 0x8c, 0xd9, - 0xcc, 0x7c, 0xdb, 0xda, 0x1c, 0xa1, 0x18, 0xfb, 0x21, 0x17, 0x4e, 0xe8, 0xc2, 0xeb, 0xab, 0xcd, - 0x29, 0xe9, 0xf9, 0x7a, 0xa3, 0x89, 0xec, 0xc2, 0x53, 0x42, 0xf1, 0x0c, 0x87, 0x78, 0x00, 0xf1, - 0x6a, 0x3c, 0xb4, 0xfb, 0x61, 0xf3, 0xc0, 0x02, 0x5a, 0x9c, 0xb6, 0x4b, 0xcf, 0xc8, 0x6d, 0x3c, - 0xeb, 0xaa, 0x13, 0xbd, 0x1d, 0xa9, 0x84, 0x34, 0xff, 0xa7, 0x38, 0x2f, 0x9a, 0x49, 0x58, 0xcc, - 0x62, 0x46, 0x72, 0x44, 0x99, 0x11, 0x73, 0xd0, 0x32, 0x6f, 0x14, 0xb7, 0xda, 0x65, 0x4b, 0xf4, - 0x1e, 0xc2, 0x24, 0x23, 0x5f, 0x03, 0x91, 0x85, 0x8c, 0xe0, 0x03, 0x32, 0x42, 0x69, 0xb4, 0xd4, - 0xb8, 0x1c, 0xc6, 0xc6, 0xde, 0x30, 0xde, 0xc2, 0xd8, 0x03, 0x91, 0x01, 0x4e, 0x29, 0xc0, 0xe5, - 0x6a, 0x80, 0x6b, 0x7a, 0x9f, 0x5d, 0xb0, 0x41, 0x8e, 0xe3, 0x83, 0x1b, 0x3e, 0x04, 0x5d, 0xae, - 0x62, 0x72, 0xd8, 0x4e, 0x67, 0xf4, 0x5b, 0x84, 0x9f, 0xc8, 0x90, 0xdb, 0x3e, 0x17, 0xd5, 0xd2, - 0xdc, 0xc1, 0x47, 0x02, 0x9f, 0x6b, 0xc0, 0x24, 0xd3, 0xad, 0x6a, 0x80, 0xed, 0x7c, 0xa3, 0x5d, - 0xb4, 0x52, 0x40, 0x9c, 0x2a, 0x21, 0x7a, 0xf8, 0x69, 0x5d, 0x0e, 0xc0, 0xfb, 0xeb, 0x3d, 0xbf, - 0x46, 0x64, 0x0d, 0x3c, 0xdd, 0x83, 0x1e, 0xf3, 0x3f, 0x84, 0xae, 0x72, 0x33, 0x6d, 0xeb, 0x39, - 0xfd, 0x11, 0xe1, 0x27, 0x73, 0x4f, 0x22, 0x1e, 0xee, 0xdf, 0xcd, 0x05, 0x7c, 0x2c, 0x06, 0x2e, - 0x9c, 0x58, 0x74, 0xfa, 0xae, 0x0b, 0x9c, 0x6f, 0xf4, 0x83, 0xd4, 0xdf, 0xe8, 0x82, 0x7c, 0x3b, - 0x64, 0x5d, 0x78, 0x4d, 0x9e, 0xb7, 0x03, 0x01, 0xb8, 0x82, 0xc5, 0x69, 0x9e, 0x46, 0x17, 0xe8, - 0x76, 0x7e, 0x35, 0x65, 0x3c, 0x7a, 0x50, 0x0b, 0x73, 0xd4, 0xf1, 0xd4, 0x83, 0x1c, 0xb7, 0x71, - 0x33, 0x73, 0xfc, 0x0e, 0xc4, 0x3d, 0x3f, 0x2c, 0xb4, 0x85, 0x7f, 0xed, 0x9b, 0x7e, 0x51, 0xa8, - 0xbc, 0x8e, 0x60, 0xd1, 0x7f, 0x74, 0x0a, 0xd2, 0xc4, 0x87, 0x7a, 0xc0, 0xb9, 0xe3, 0x41, 0x1a, - 0xe2, 0x6c, 0x4a, 0xdf, 0xc0, 0xc7, 0x35, 0x50, 0x9f, 0x47, 0x10, 0x76, 0xf7, 0x7f, 0xba, 0x1f, - 0x0a, 0xad, 0xa0, 0xcd, 0xbc, 0xfd, 0x1f, 0xae, 0x89, 0x0f, 0x45, 0xac, 0xfb, 0x96, 0xdc, 0x94, - 0x1c, 0x29, 0x9b, 0x92, 0x6b, 0x18, 0x07, 0xcc, 0xcb, 0xee, 0xe0, 0x01, 0x75, 0x07, 0x4f, 0x17, - 0xee, 0xa0, 0x29, 0x9b, 0xbb, 0xbc, 0x71, 0xb7, 0x58, 0xb7, 0xad, 0x5f, 0xb4, 0x0b, 0x9b, 0x64, - 0xc5, 0xeb, 0x5a, 0x5a, 0x85, 0x00, 0x6a, 0xe4, 0x53, 0xf6, 0xd5, 0xae, 0x32, 0x51, 0x6e, 0x5b, - 0x15, 0xfb, 0xea, 0x6a, 0x71, 0xab, 0x5d, 0xb6, 0x44, 0x9b, 0x79, 0x62, 0x32, 0x4a, 0x1e, 0xb1, - 0x90, 0x03, 0xfd, 0x4c, 0x1e, 0xc0, 0x11, 0xee, 0x66, 0xb6, 0xce, 0x1f, 0x5f, 0x03, 0xa3, 0x1f, - 0xe7, 0x29, 0x57, 0x4c, 0x37, 0x07, 0x10, 0xaa, 0x48, 0x8a, 0x61, 0xa4, 0x23, 0x29, 0xc7, 0xe4, - 0x5d, 0x7c, 0x90, 0xad, 0xdf, 0x01, 0x57, 0x3c, 0x9a, 0x8f, 0x64, 0x6a, 0x8c, 0xbe, 0x82, 0xa7, - 0xdb, 0xcc, 0xbb, 0x19, 0x8a, 0x78, 0x28, 0xeb, 0xc6, 0x65, 0xa1, 0x80, 0x50, 0xa4, 0x9e, 0xb3, - 0x69, 0xb1, 0xa2, 0x1a, 0xa5, 0x8a, 0xa2, 0x9f, 0x97, 0x3e, 0x06, 0xa1, 0x78, 0xdc, 0xdf, 0x7c, - 0x7a, 0xbf, 0x50, 0x9f, 0x9d, 0x52, 0xe7, 0x9f, 0x8c, 0x44, 0xf1, 0x4c, 0x0c, 0x9c, 0xf5, 0x63, - 0x17, 0xde, 0xf4, 0xc3, 0x6e, 0x7a, 0xce, 0xd2, 0xb3, 0xe2, 0x3b, 0x85, 0xdb, 0x55, 0x7a, 0x46, - 0x00, 0xcf, 0x26, 0x1f, 0x9c, 0xf2, 0x2d, 0x7b, 0x75, 0x5f, 0xe7, 0xeb, 0x64, 0x96, 0xb8, 0x5d, - 0xb6, 0xba, 0x72, 0xef, 0x18, 0x3e, 0xaa, 0x8f, 0x09, 0xf1, 0xc0, 0x77, 0x81, 0x7c, 0x8d, 0xf0, - 0x5c, 0x22, 0x36, 0xb2, 0x15, 0x72, 0x2a, 0x37, 0x3a, 0x56, 0x9b, 0x19, 0xf5, 0xe2, 0x4e, 0x17, - 0x3f, 0xfd, 0xeb, 0xfe, 0x97, 0x0d, 0x4a, 0x4f, 0x2a, 0x69, 0x38, 0x68, 0x69, 0x2d, 0xc9, 0xad, - 0xbb, 0x3a, 0xb6, 0x3b, 0x57, 0xd0, 0x39, 0xf2, 0x15, 0xc2, 0x47, 0xd6, 0x40, 0x68, 0xb2, 0x13, - 0xa3, 0x64, 0xb9, 0xfe, 0xa9, 0x8b, 0x75, 0x41, 0x61, 0x3d, 0x47, 0x9e, 0x9d, 0x88, 0x95, 0x8c, - 0x77, 0x24, 0xda, 0xac, 0xbc, 0xa1, 0xba, 0x21, 0x90, 0x93, 0xa3, 0x70, 0x05, 0xa5, 0x63, 0x5c, - 0xab, 0x45, 0x27, 0x2d, 0xd1, 0x33, 0x8a, 0xf0, 0x14, 0x99, 0x1c, 0x38, 0xf2, 0x11, 0x9e, 0x2b, - 0xf7, 0xaa, 0x52, 0x46, 0xc7, 0x75, 0x31, 0x63, 0x4c, 0x60, 0xf3, 0xd6, 0x42, 0xcf, 0x2b, 0xbf, - 0x67, 0xc8, 0x33, 0x7b, 0xfd, 0x2e, 0x81, 0x5c, 0x2f, 0x79, 0x5f, 0x46, 0xe4, 0x13, 0x84, 0xe7, - 0x92, 0xfe, 0x39, 0xa9, 0xa4, 0x4a, 0xdf, 0x01, 0x63, 0xe1, 0xc1, 0x2f, 0xa4, 0x2d, 0x38, 0x4d, - 0xcf, 0xb9, 0x6a, 0xe9, 0xf9, 0x09, 0xe1, 0x59, 0xa5, 0xad, 0x34, 0xc2, 0xfc, 0xa8, 0x87, 0xa2, - 0xf8, 0xaa, 0x5b, 0x3d, 0x2f, 0x28, 0x3c, 0xcb, 0x38, 0x57, 0x05, 0xcf, 0x8a, 0xa5, 0x67, 0x59, - 0xe1, 0xbf, 0x22, 0xfc, 0xff, 0x4c, 0x6d, 0x6a, 0xd4, 0xd3, 0xe3, 0x50, 0x4b, 0x8a, 0xb4, 0x2e, - 0xed, 0x65, 0x45, 0xbb, 0x62, 0x2c, 0x55, 0xa4, 0x4d, 0x9c, 0x4b, 0xe0, 0x9f, 0x11, 0x9e, 0x4b, - 0xe4, 0xe0, 0xa4, 0xe4, 0x96, 0x04, 0x63, 0x5d, 0xd8, 0x17, 0x15, 0xec, 0xb2, 0x71, 0xbe, 0x32, - 0x6c, 0x0f, 0x24, 0xea, 0x2f, 0x08, 0x1f, 0x4d, 0x05, 0x96, 0x66, 0x1d, 0x53, 0x67, 0x65, 0x0d, - 0x56, 0x17, 0xf6, 0x25, 0x05, 0xdb, 0x32, 0x2e, 0x54, 0x82, 0xe5, 0x89, 0x6f, 0x49, 0xfb, 0x1b, - 0xc2, 0xc7, 0xb4, 0xdc, 0xd5, 0xbc, 0x74, 0x94, 0x77, 0xaf, 0x26, 0xae, 0x4b, 0xfc, 0xb2, 0x22, - 0xbe, 0x68, 0x98, 0x95, 0x88, 0x45, 0xe6, 0x5d, 0x32, 0x7f, 0x8f, 0xf0, 0x8c, 0xd4, 0xd4, 0x1a, - 0x77, 0x4c, 0x0f, 0x2c, 0x68, 0xee, 0xba, 0xa4, 0x97, 0x14, 0xa9, 0x69, 0x9c, 0xad, 0x16, 0x5b, - 0xc1, 0x22, 0x09, 0xf9, 0x0d, 0xc2, 0x33, 0x52, 0x65, 0x4c, 0x82, 0x2c, 0xa8, 0x90, 0xba, 0x90, - 0x4b, 0x0a, 0xf2, 0x79, 0x4a, 0x27, 0x43, 0x06, 0x7e, 0xa8, 0xee, 0xd3, 0x10, 0x1f, 0x4a, 0x74, - 0x33, 0x1f, 0xf7, 0x75, 0xcb, 0x25, 0xbd, 0x41, 0xf2, 0xd5, 0x4c, 0x7c, 0xd1, 0x2b, 0xca, 0xd7, - 0x25, 0xb2, 0x52, 0x29, 0x20, 0x77, 0x53, 0xfd, 0xb5, 0x63, 0x05, 0xcc, 0x5b, 0x46, 0xe4, 0x3b, - 0x84, 0xe7, 0x3a, 0xe5, 0xce, 0x73, 0x6a, 0xdc, 0xf5, 0x78, 0x84, 0x7d, 0xc7, 0x52, 0xc0, 0x67, - 0xe9, 0x43, 0x9a, 0xb8, 0x6e, 0x37, 0xd7, 0xaf, 0xfe, 0xb1, 0x3b, 0x8f, 0xfe, 0xdc, 0x9d, 0x47, - 0x7f, 0xef, 0xce, 0xa3, 0xf7, 0xad, 0x87, 0xfd, 0x97, 0xda, 0xf3, 0x93, 0x6d, 0xfd, 0xa0, 0xfa, - 0xcd, 0x74, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xa5, 0x06, 0x11, 0x85, 0x13, 0x00, - 0x00, + // 1264 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xdf, 0x6e, 0xdc, 0xc4, + 0x17, 0xc7, 0x35, 0x9b, 0xfe, 0xda, 0x74, 0x9a, 0xa4, 0xbf, 0x0e, 0x50, 0x56, 0x56, 0x9b, 0xa6, + 0x03, 0x85, 0xf4, 0x4f, 0xec, 0x6c, 0x5a, 0xa0, 0x54, 0x2a, 0xa8, 0x6d, 0x4a, 0x04, 0xac, 0xa0, + 0xf2, 0x82, 0x50, 0xb9, 0x73, 0xbc, 0x27, 0x8e, 0x1b, 0xaf, 0xc7, 0x78, 0x66, 0x37, 0x5a, 0xaa, + 0x80, 0xe0, 0x01, 0xe0, 0x82, 0x1b, 0x04, 0x37, 0x50, 0x40, 0x42, 0x42, 0x42, 0x45, 0xbc, 0x04, + 0x97, 0x48, 0xbc, 0x00, 0x8a, 0xfa, 0x20, 0x68, 0xc6, 0xf6, 0xd8, 0xce, 0x6e, 0xb7, 0x26, 0xae, + 0x80, 0xbb, 0x19, 0x8f, 0xe7, 0x9c, 0xcf, 0x9c, 0x73, 0xe6, 0xf8, 0x2b, 0xe3, 0x33, 0xd1, 0x96, + 0x67, 0x39, 0x91, 0xef, 0x06, 0x3e, 0x84, 0xc2, 0xda, 0x66, 0xf1, 0xd6, 0x46, 0xc0, 0xb6, 0xf5, + 0xc0, 0x8c, 0x62, 0x26, 0x18, 0x99, 0xce, 0xe6, 0xc6, 0x92, 0xe7, 0x8b, 0xcd, 0xfe, 0xba, 0xe9, + 0xb2, 0x9e, 0xe5, 0x31, 0x8f, 0x59, 0xea, 0x85, 0xf5, 0xfe, 0x86, 0x9a, 0xa9, 0x89, 0x1a, 0x25, + 0x1b, 0x8d, 0x13, 0x1e, 0x63, 0x5e, 0x00, 0xd2, 0x85, 0xe5, 0x84, 0x21, 0x13, 0x8e, 0xf0, 0x59, + 0xc8, 0xd3, 0xd5, 0x4b, 0x5b, 0x97, 0xb9, 0xe9, 0x33, 0xb9, 0xda, 0x73, 0xdc, 0x4d, 0x3f, 0x84, + 0x78, 0x68, 0xa5, 0x44, 0xdc, 0xea, 0x81, 0x70, 0xac, 0x41, 0xcb, 0xf2, 0x20, 0x84, 0xd8, 0x11, + 0xd0, 0x4d, 0x77, 0xdd, 0x28, 0x20, 0x38, 0xb1, 0x72, 0x7a, 0x47, 0x0d, 0xf2, 0xad, 0xfa, 0x1c, + 0x83, 0x96, 0x13, 0x44, 0x9b, 0xce, 0xa8, 0x11, 0x9a, 0xbb, 0xb6, 0x5c, 0x16, 0xc3, 0x18, 0x47, + 0xf4, 0xd7, 0x06, 0x7e, 0xea, 0xbd, 0xd4, 0xd2, 0x8d, 0x18, 0x1c, 0x01, 0x36, 0x7c, 0xd0, 0x07, + 0x2e, 0xc8, 0x09, 0x7c, 0x38, 0x74, 0x7a, 0xc0, 0x23, 0xc7, 0x85, 0x26, 0x5a, 0x40, 0x8b, 0x87, + 0xed, 0xfc, 0x01, 0xb9, 0x8d, 0x75, 0xbc, 0x9a, 0x8d, 0x05, 0xb4, 0x78, 0x64, 0xe5, 0xaa, 0x99, + 0x33, 0x9b, 0x19, 0xb3, 0x1a, 0x98, 0xd1, 0x96, 0x67, 0x4a, 0x66, 0x53, 0x87, 0x3c, 0x63, 0x36, + 0x33, 0xdf, 0xb6, 0x36, 0x47, 0x28, 0xc6, 0x7e, 0xc8, 0x85, 0x13, 0xba, 0xf0, 0xfa, 0x6a, 0x73, + 0x4a, 0x7a, 0xbe, 0xde, 0x68, 0x22, 0xbb, 0xf0, 0x94, 0x50, 0x3c, 0xc3, 0x21, 0x1e, 0x40, 0xbc, + 0x1a, 0x0f, 0xed, 0x7e, 0xd8, 0x3c, 0xb0, 0x80, 0x16, 0xa7, 0xed, 0xd2, 0x33, 0x72, 0x1b, 0xcf, + 0xba, 0xea, 0x44, 0x6f, 0x47, 0x2a, 0x21, 0xcd, 0xff, 0x29, 0xce, 0x8b, 0x66, 0x12, 0x16, 0xb3, + 0x98, 0x91, 0x1c, 0x51, 0x66, 0xc4, 0x1c, 0xb4, 0xcc, 0x1b, 0xc5, 0xad, 0x76, 0xd9, 0x12, 0xbd, + 0x8f, 0x30, 0xc9, 0xc8, 0xd7, 0x40, 0x64, 0x21, 0x23, 0xf8, 0x80, 0x8c, 0x50, 0x1a, 0x2d, 0x35, + 0x2e, 0x87, 0xb1, 0xb1, 0x37, 0x8c, 0xb7, 0x30, 0xf6, 0x40, 0x64, 0x80, 0x53, 0x0a, 0x70, 0xb9, + 0x1a, 0xe0, 0x9a, 0xde, 0x67, 0x17, 0x6c, 0x90, 0xe3, 0xf8, 0xe0, 0x86, 0x0f, 0x41, 0x97, 0xab, + 0x98, 0x1c, 0xb6, 0xd3, 0x19, 0xfd, 0x06, 0xe1, 0x27, 0x32, 0xe4, 0xb6, 0xcf, 0x45, 0xb5, 0x34, + 0x77, 0xf0, 0x91, 0xc0, 0xe7, 0x1a, 0x30, 0xc9, 0x74, 0xab, 0x1a, 0x60, 0x3b, 0xdf, 0x68, 0x17, + 0xad, 0x14, 0x10, 0xa7, 0x4a, 0x88, 0x1e, 0x7e, 0x5a, 0x97, 0x03, 0xf0, 0xfe, 0x7a, 0xcf, 0xaf, + 0x11, 0x59, 0x03, 0x4f, 0xf7, 0xa0, 0xc7, 0xfc, 0x0f, 0xa1, 0xab, 0xdc, 0x4c, 0xdb, 0x7a, 0x4e, + 0xbf, 0x47, 0xf8, 0xc9, 0xdc, 0x93, 0x88, 0x87, 0xfb, 0x77, 0x73, 0x01, 0x1f, 0x8b, 0x81, 0x0b, + 0x27, 0x16, 0x9d, 0xbe, 0xeb, 0x02, 0xe7, 0x1b, 0xfd, 0x20, 0xf5, 0x37, 0xba, 0x20, 0xdf, 0x0e, + 0x59, 0x17, 0x5e, 0x93, 0xe7, 0xed, 0x40, 0x00, 0xae, 0x60, 0x71, 0x9a, 0xa7, 0xd1, 0x05, 0xba, + 0x9d, 0x5f, 0x4d, 0x19, 0x8f, 0x1e, 0xd4, 0xc2, 0x1c, 0x75, 0x3c, 0xf5, 0x30, 0xc7, 0x6d, 0xdc, + 0xcc, 0x1c, 0xbf, 0x03, 0x71, 0xcf, 0x0f, 0x0b, 0x6d, 0xe1, 0x6f, 0xfb, 0xa6, 0x9f, 0x17, 0x2a, + 0xaf, 0x23, 0x58, 0xf4, 0x0f, 0x9d, 0x82, 0x34, 0xf1, 0xa1, 0x1e, 0x70, 0xee, 0x78, 0x90, 0x86, + 0x38, 0x9b, 0xd2, 0x37, 0xf0, 0x71, 0x0d, 0xd4, 0xe7, 0x11, 0x84, 0xdd, 0xfd, 0x9f, 0xee, 0xbb, + 0x42, 0x2b, 0x68, 0x33, 0x6f, 0xff, 0x87, 0x6b, 0xe2, 0x43, 0x11, 0xeb, 0xbe, 0x25, 0x37, 0x25, + 0x47, 0xca, 0xa6, 0xe4, 0x1a, 0xc6, 0x01, 0xf3, 0xb2, 0x3b, 0x78, 0x40, 0xdd, 0xc1, 0xd3, 0x85, + 0x3b, 0x68, 0xca, 0xe6, 0x2e, 0x6f, 0xdc, 0x2d, 0xd6, 0x6d, 0xeb, 0x17, 0xed, 0xc2, 0x26, 0x59, + 0xf1, 0xba, 0x96, 0x56, 0x21, 0x80, 0x1a, 0xf9, 0x94, 0x7d, 0xb5, 0xab, 0x4c, 0x94, 0xdb, 0x56, + 0xc5, 0xbe, 0xba, 0x5a, 0xdc, 0x6a, 0x97, 0x2d, 0xd1, 0x66, 0x9e, 0x98, 0x8c, 0x92, 0x47, 0x2c, + 0xe4, 0x40, 0xef, 0xc9, 0x03, 0x38, 0xc2, 0xdd, 0xcc, 0xd6, 0xf9, 0x7f, 0xb0, 0x81, 0x7d, 0x9c, + 0x97, 0x82, 0x62, 0xbd, 0x39, 0x80, 0x50, 0x45, 0x58, 0x0c, 0x23, 0x1d, 0x61, 0x39, 0x26, 0xef, + 0xe2, 0x83, 0x6c, 0xfd, 0x0e, 0xb8, 0xe2, 0xf1, 0x7c, 0x3c, 0x53, 0x63, 0xf4, 0x15, 0x3c, 0xdd, + 0x66, 0xde, 0xcd, 0x50, 0xc4, 0x43, 0x59, 0x4f, 0x2e, 0x0b, 0x05, 0x84, 0x22, 0xf5, 0x9c, 0x4d, + 0x8b, 0x95, 0xd6, 0x28, 0x55, 0x1a, 0xfd, 0xac, 0xf4, 0x91, 0x08, 0xc5, 0xbf, 0xad, 0x05, 0xe8, + 0x83, 0x42, 0xdd, 0x76, 0x4a, 0x5f, 0x84, 0xc9, 0x48, 0x14, 0xcf, 0xc4, 0xc0, 0x59, 0x3f, 0x76, + 0xe1, 0x4d, 0x3f, 0xec, 0xa6, 0xe7, 0x2c, 0x3d, 0x2b, 0xbe, 0x53, 0xb8, 0x75, 0xa5, 0x67, 0x04, + 0xf0, 0x6c, 0xf2, 0x21, 0x2a, 0xdf, 0xbe, 0x57, 0xf7, 0x75, 0xbe, 0x4e, 0x66, 0x89, 0xdb, 0x65, + 0xab, 0x2b, 0xf7, 0x8f, 0xe1, 0xa3, 0xfa, 0x98, 0x10, 0x0f, 0x7c, 0x17, 0xc8, 0x57, 0x08, 0xcf, + 0x25, 0x22, 0x24, 0x5b, 0x21, 0xa7, 0x72, 0xa3, 0x63, 0x35, 0x9b, 0x51, 0x2f, 0xee, 0x74, 0xf1, + 0xd3, 0x3f, 0x1e, 0x7c, 0xd1, 0xa0, 0xf4, 0xa4, 0x92, 0x8c, 0x83, 0x96, 0xd6, 0x98, 0xdc, 0xba, + 0xab, 0x63, 0xbb, 0x73, 0x05, 0x9d, 0x23, 0x5f, 0x22, 0x7c, 0x64, 0x0d, 0x84, 0x26, 0x3b, 0x31, + 0x4a, 0x96, 0xeb, 0xa2, 0xba, 0x58, 0x17, 0x14, 0xd6, 0x73, 0xe4, 0xd9, 0x89, 0x58, 0xc9, 0x78, + 0x47, 0xa2, 0xcd, 0xca, 0x9b, 0xab, 0x1b, 0x05, 0x39, 0x39, 0x0a, 0x57, 0x50, 0x40, 0xc6, 0xb5, + 0x5a, 0x74, 0xd2, 0x12, 0x3d, 0xa3, 0x08, 0x4f, 0x91, 0xc9, 0x81, 0x23, 0x1f, 0xe1, 0xb9, 0x72, + 0x0f, 0x2b, 0x65, 0x74, 0x5c, 0x77, 0x33, 0xc6, 0x04, 0x36, 0x6f, 0x2d, 0xf4, 0xbc, 0xf2, 0x7b, + 0x86, 0x3c, 0xb3, 0xd7, 0xef, 0x12, 0xc8, 0xf5, 0x92, 0xf7, 0x65, 0x44, 0x3e, 0x41, 0x78, 0x2e, + 0xe9, 0xab, 0x93, 0x4a, 0xaa, 0xf4, 0x7d, 0x30, 0x16, 0x1e, 0xfe, 0x42, 0xda, 0x9a, 0xd3, 0xf4, + 0x9c, 0xab, 0x96, 0x9e, 0x1f, 0x10, 0x9e, 0x55, 0x9a, 0x4b, 0x23, 0xcc, 0x8f, 0x7a, 0x28, 0x8a, + 0xb2, 0xba, 0xd5, 0xf3, 0x82, 0xc2, 0xb3, 0x8c, 0x73, 0x55, 0xf0, 0xac, 0x58, 0x7a, 0x96, 0x15, + 0xfe, 0x33, 0xc2, 0xff, 0xcf, 0x54, 0xa8, 0x46, 0x3d, 0x3d, 0x0e, 0xb5, 0xa4, 0x54, 0xeb, 0xd2, + 0x5e, 0x56, 0xb4, 0x2b, 0xc6, 0x52, 0x45, 0xda, 0xc4, 0xb9, 0x04, 0xfe, 0x11, 0xe1, 0xb9, 0x44, + 0x26, 0x4e, 0x4a, 0x6e, 0x49, 0x48, 0xd6, 0x85, 0x7d, 0x51, 0xc1, 0x2e, 0x1b, 0xe7, 0x2b, 0xc3, + 0xf6, 0x40, 0xa2, 0xfe, 0x84, 0xf0, 0xd1, 0x54, 0x78, 0x69, 0xd6, 0x31, 0x75, 0x56, 0xd6, 0x66, + 0x75, 0x61, 0x5f, 0x52, 0xb0, 0x2d, 0xe3, 0x42, 0x25, 0x58, 0x9e, 0xf8, 0x96, 0xb4, 0xbf, 0x20, + 0x7c, 0x4c, 0xcb, 0x60, 0xcd, 0x4b, 0x47, 0x79, 0xf7, 0x6a, 0xe5, 0xba, 0xc4, 0x2f, 0x2b, 0xe2, + 0x8b, 0x86, 0x59, 0x89, 0x58, 0x64, 0xde, 0x25, 0xf3, 0x3d, 0x84, 0x67, 0xa4, 0xd6, 0xd6, 0xb8, + 0x63, 0x7a, 0x60, 0x41, 0x8b, 0xd7, 0x25, 0xbd, 0xa4, 0x48, 0x4d, 0xe3, 0x6c, 0xb5, 0xd8, 0x0a, + 0x16, 0x49, 0xc8, 0xaf, 0x11, 0x9e, 0x91, 0x2a, 0x63, 0x12, 0x64, 0x41, 0x85, 0xd4, 0x85, 0x5c, + 0x52, 0x90, 0xcf, 0x53, 0x3a, 0x19, 0x32, 0xf0, 0x43, 0x75, 0x9f, 0x86, 0xf8, 0x50, 0xa2, 0xa7, + 0xf9, 0xb8, 0xaf, 0x5b, 0x2e, 0xf5, 0x0d, 0x92, 0xaf, 0x66, 0xe2, 0x8b, 0x5e, 0x51, 0xbe, 0x2e, + 0x91, 0x95, 0x4a, 0x01, 0xb9, 0x9b, 0xea, 0xaf, 0x1d, 0x2b, 0x60, 0xde, 0x32, 0x22, 0xdf, 0x22, + 0x3c, 0xd7, 0x29, 0x77, 0x9e, 0x53, 0xe3, 0xae, 0xc7, 0x63, 0xec, 0x3b, 0x96, 0x02, 0x3e, 0x4b, + 0x1f, 0xd1, 0xc4, 0x75, 0xbb, 0xb9, 0x7e, 0xf5, 0xb7, 0xdd, 0x79, 0xf4, 0xfb, 0xee, 0x3c, 0xfa, + 0x73, 0x77, 0x1e, 0xbd, 0x6f, 0x3d, 0xea, 0x7f, 0xd5, 0x9e, 0x9f, 0x6f, 0xeb, 0x07, 0xd5, 0xef, + 0xa7, 0x8b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x67, 0xf8, 0xbe, 0xcf, 0x9d, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2453,6 +2460,13 @@ func (m *WatchWorkflowsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.Fields) > 0 { + i -= len(m.Fields) + copy(dAtA[i:], m.Fields) + i = encodeVarintWorkflow(dAtA, i, uint64(len(m.Fields))) + i-- + dAtA[i] = 0x1a + } if m.ListOptions != nil { { size, err := m.ListOptions.MarshalToSizedBuffer(dAtA[:i]) @@ -2982,6 +2996,10 @@ func (m *WatchWorkflowsRequest) Size() (n int) { l = m.ListOptions.Size() n += 1 + l + sovWorkflow(uint64(l)) } + l = len(m.Fields) + if l > 0 { + n += 1 + l + sovWorkflow(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -4999,6 +5017,38 @@ func (m *WatchWorkflowsRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWorkflow + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthWorkflow + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthWorkflow + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Fields = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipWorkflow(dAtA[iNdEx:]) From 1e850fce1b9e4be1c134a2b45aef41fbe557a443 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Fri, 5 Jun 2020 13:52:27 -0700 Subject: [PATCH 21/25] Revert go.mod and go.sum --- go.mod | 9 +++++---- go.sum | 26 ++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 675c32f34055..6b27be49050f 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/go-openapi/swag v0.19.8 // indirect github.com/go-sql-driver/mysql v1.4.1 github.com/gogo/protobuf v1.3.1 - github.com/golang/protobuf v1.3.5 + github.com/golang/protobuf v1.4.0 github.com/googleapis/gnostic v0.3.1 // indirect github.com/gophercloud/gophercloud v0.7.0 // indirect github.com/gorilla/websocket v1.4.1 @@ -71,18 +71,19 @@ require ( github.com/valyala/fasttemplate v1.1.0 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 - golang.org/x/net v0.0.0-20200301022130-244492dfa37a + golang.org/x/crypto v0.0.0-20200422194213-44a606286825 + golang.org/x/net v0.0.0-20200421231249-e086a090c8fd golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect google.golang.org/api v0.20.0 + google.golang.org/appengine v1.6.6 // indirect google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24 google.golang.org/grpc v1.28.0 gopkg.in/ini.v1 v1.54.0 // indirect gopkg.in/jcmturner/goidentity.v2 v2.0.0 // indirect gopkg.in/jcmturner/gokrb5.v5 v5.3.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect - gopkg.in/square/go-jose.v2 v2.5.1 // indirect + gopkg.in/square/go-jose.v2 v2.5.0 // indirect gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v2 v2.2.8 k8s.io/api v0.0.0-20191219150132-17cfeff5d095 diff --git a/go.sum b/go.sum index c8cbd7f904e6..c6003812a567 100644 --- a/go.sum +++ b/go.sum @@ -206,6 +206,12 @@ github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -491,8 +497,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 h1:QmwruyY+bKbDDL0BaglrbZABEali68eoMFhTZpCjYVA= -golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200422194213-44a606286825 h1:dSChiwOTvzwbHFTMq2l6uRardHH7/E6SqEkqccinS/o= +golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -557,6 +563,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -603,6 +611,8 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d h1:62ap6LNOjDU6uGmKXHJbSfciMoV+FeI1sRXx/pLDL44= golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -677,6 +687,8 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -710,6 +722,12 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -735,8 +753,8 @@ gopkg.in/jcmturner/rpc.v0 v0.0.2 h1:wBTgrbL1qmLBUPsYVCqdJiI5aJgQhexmK+JkTHPUNJI= gopkg.in/jcmturner/rpc.v0 v0.0.2/go.mod h1:NzMq6cRzR9lipgw7WxRBHNx5N8SifBuaCQsOT1kWY/E= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.0 h1:OZ4sdq+Y+SHfYB7vfthi1Ei8b0vkP8ZPQgUfUwdUSqo= +gopkg.in/square/go-jose.v2 v2.5.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= From 0900405a195180b16a1360c1a1c03cc1ab012d6c Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Fri, 5 Jun 2020 16:14:50 -0700 Subject: [PATCH 22/25] Remove 'fields' from workflow protobuf --- api/openapi-spec/swagger.json | 11 ----------- pkg/apiclient/workflow/workflow.proto | 3 --- pkg/apiclient/workflow/workflow.swagger.json | 13 ------------- 3 files changed, 27 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 68ef7246c36b..90d6132ccf62 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -754,11 +754,6 @@ "description": "The continue option should be set when retrieving more results from the server. Since this value is\nserver defined, clients may only use the continue value from a previous query result with identical\nquery parameters (except for the value of continue) and the server may reject a continue value it\ndoes not recognize. If the specified continue value is no longer valid whether due to expiration\n(generally five to fifteen minutes) or a configuration change on the server, the server will\nrespond with a 410 ResourceExpired error together with a continue token. If the client needs a\nconsistent list, it must restart their list without the continue field. Otherwise, the client may\nsend another list request with the token received with the 410 error, the server will respond with\na list starting from the next key, but from the latest snapshot, which is inconsistent from the\nprevious list results - objects that are created, modified, or deleted after the first list request\nwill be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last\nresourceVersion value returned by the server and not miss any modifications.", "name": "listOptions.continue", "in": "query" - }, - { - "type": "string", - "name": "fields", - "in": "query" } ], "responses": { @@ -1125,12 +1120,6 @@ "description": "The continue option should be set when retrieving more results from the server. Since this value is\nserver defined, clients may only use the continue value from a previous query result with identical\nquery parameters (except for the value of continue) and the server may reject a continue value it\ndoes not recognize. If the specified continue value is no longer valid whether due to expiration\n(generally five to fifteen minutes) or a configuration change on the server, the server will\nrespond with a 410 ResourceExpired error together with a continue token. If the client needs a\nconsistent list, it must restart their list without the continue field. Otherwise, the client may\nsend another list request with the token received with the 410 error, the server will respond with\na list starting from the next key, but from the latest snapshot, which is inconsistent from the\nprevious list results - objects that are created, modified, or deleted after the first list request\nwill be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last\nresourceVersion value returned by the server and not miss any modifications.", "name": "listOptions.continue", "in": "query" - }, - { - "type": "string", - "description": "Fields to be included or excluded in the response. e.g. \"items.spec,items.status.phase\", \"-items.status.nodes\".", - "name": "fields", - "in": "query" } ], "responses": { diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto index 32a0dc74cb3a..3d0efbb03f53 100644 --- a/pkg/apiclient/workflow/workflow.proto +++ b/pkg/apiclient/workflow/workflow.proto @@ -31,8 +31,6 @@ message WorkflowGetRequest { message WorkflowListRequest { string namespace = 1; k8s.io.apimachinery.pkg.apis.meta.v1.ListOptions listOptions = 2; - // Fields to be included or excluded in the response. e.g. "items.spec,items.status.phase", "-items.status.nodes" - string fields = 3; } message WorkflowResubmitRequest { @@ -89,7 +87,6 @@ message WorkflowDeleteResponse { message WatchWorkflowsRequest { string namespace = 1; k8s.io.apimachinery.pkg.apis.meta.v1.ListOptions listOptions = 2; - string fields = 3; } message WorkflowWatchEvent { diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json index f084bcfbe8f8..e7ae1f756cea 100644 --- a/pkg/apiclient/workflow/workflow.swagger.json +++ b/pkg/apiclient/workflow/workflow.swagger.json @@ -98,12 +98,6 @@ "in": "query", "required": false, "type": "string" - }, - { - "name": "fields", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -188,13 +182,6 @@ "in": "query", "required": false, "type": "string" - }, - { - "name": "fields", - "description": "Fields to be included or excluded in the response. e.g. \"items.spec,items.status.phase\", \"-items.status.nodes\".", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ From 761c2466050fba21edfe396024274eed5d8cc032 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Fri, 5 Jun 2020 16:48:41 -0700 Subject: [PATCH 23/25] Apply codegen patch --- pkg/apiclient/workflow/workflow.pb.go | 273 ++++++++------------------ 1 file changed, 85 insertions(+), 188 deletions(-) diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go index e0a7ef27c7d4..70d4d8518029 100644 --- a/pkg/apiclient/workflow/workflow.pb.go +++ b/pkg/apiclient/workflow/workflow.pb.go @@ -189,13 +189,11 @@ func (m *WorkflowGetRequest) GetFields() string { } type WorkflowListRequest struct { - Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` - ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` - // Fields to be included or excluded in the response. e.g. "items.spec,items.status.phase", "-items.status.nodes" - Fields string `protobuf:"bytes,3,opt,name=fields,proto3" json:"fields,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *WorkflowListRequest) Reset() { *m = WorkflowListRequest{} } @@ -245,13 +243,6 @@ func (m *WorkflowListRequest) GetListOptions() *v1.ListOptions { return nil } -func (m *WorkflowListRequest) GetFields() string { - if m != nil { - return m.Fields - } - return "" -} - type WorkflowResubmitRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` @@ -806,7 +797,6 @@ var xxx_messageInfo_WorkflowDeleteResponse proto.InternalMessageInfo type WatchWorkflowsRequest struct { Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` - Fields string `protobuf:"bytes,3,opt,name=fields,proto3" json:"fields,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -859,13 +849,6 @@ func (m *WatchWorkflowsRequest) GetListOptions() *v1.ListOptions { return nil } -func (m *WatchWorkflowsRequest) GetFields() string { - if m != nil { - return m.Fields - } - return "" -} - type WorkflowWatchEvent struct { // the type of change Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` @@ -1129,86 +1112,86 @@ func init() { } var fileDescriptor_1f6bb75f9e833cb6 = []byte{ - // 1264 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x98, 0xdf, 0x6e, 0xdc, 0xc4, - 0x17, 0xc7, 0x35, 0x9b, 0xfe, 0xda, 0x74, 0x9a, 0xa4, 0xbf, 0x0e, 0x50, 0x56, 0x56, 0x9b, 0xa6, - 0x03, 0x85, 0xf4, 0x4f, 0xec, 0x6c, 0x5a, 0xa0, 0x54, 0x2a, 0xa8, 0x6d, 0x4a, 0x04, 0xac, 0xa0, - 0xf2, 0x82, 0x50, 0xb9, 0x73, 0xbc, 0x27, 0x8e, 0x1b, 0xaf, 0xc7, 0x78, 0x66, 0x37, 0x5a, 0xaa, - 0x80, 0xe0, 0x01, 0xe0, 0x82, 0x1b, 0x04, 0x37, 0x50, 0x40, 0x42, 0x42, 0x42, 0x45, 0xbc, 0x04, - 0x97, 0x48, 0xbc, 0x00, 0x8a, 0xfa, 0x20, 0x68, 0xc6, 0xf6, 0xd8, 0xce, 0x6e, 0xb7, 0x26, 0xae, - 0x80, 0xbb, 0x19, 0x8f, 0xe7, 0x9c, 0xcf, 0x9c, 0x73, 0xe6, 0xf8, 0x2b, 0xe3, 0x33, 0xd1, 0x96, - 0x67, 0x39, 0x91, 0xef, 0x06, 0x3e, 0x84, 0xc2, 0xda, 0x66, 0xf1, 0xd6, 0x46, 0xc0, 0xb6, 0xf5, - 0xc0, 0x8c, 0x62, 0x26, 0x18, 0x99, 0xce, 0xe6, 0xc6, 0x92, 0xe7, 0x8b, 0xcd, 0xfe, 0xba, 0xe9, - 0xb2, 0x9e, 0xe5, 0x31, 0x8f, 0x59, 0xea, 0x85, 0xf5, 0xfe, 0x86, 0x9a, 0xa9, 0x89, 0x1a, 0x25, - 0x1b, 0x8d, 0x13, 0x1e, 0x63, 0x5e, 0x00, 0xd2, 0x85, 0xe5, 0x84, 0x21, 0x13, 0x8e, 0xf0, 0x59, - 0xc8, 0xd3, 0xd5, 0x4b, 0x5b, 0x97, 0xb9, 0xe9, 0x33, 0xb9, 0xda, 0x73, 0xdc, 0x4d, 0x3f, 0x84, - 0x78, 0x68, 0xa5, 0x44, 0xdc, 0xea, 0x81, 0x70, 0xac, 0x41, 0xcb, 0xf2, 0x20, 0x84, 0xd8, 0x11, - 0xd0, 0x4d, 0x77, 0xdd, 0x28, 0x20, 0x38, 0xb1, 0x72, 0x7a, 0x47, 0x0d, 0xf2, 0xad, 0xfa, 0x1c, - 0x83, 0x96, 0x13, 0x44, 0x9b, 0xce, 0xa8, 0x11, 0x9a, 0xbb, 0xb6, 0x5c, 0x16, 0xc3, 0x18, 0x47, - 0xf4, 0xd7, 0x06, 0x7e, 0xea, 0xbd, 0xd4, 0xd2, 0x8d, 0x18, 0x1c, 0x01, 0x36, 0x7c, 0xd0, 0x07, - 0x2e, 0xc8, 0x09, 0x7c, 0x38, 0x74, 0x7a, 0xc0, 0x23, 0xc7, 0x85, 0x26, 0x5a, 0x40, 0x8b, 0x87, - 0xed, 0xfc, 0x01, 0xb9, 0x8d, 0x75, 0xbc, 0x9a, 0x8d, 0x05, 0xb4, 0x78, 0x64, 0xe5, 0xaa, 0x99, - 0x33, 0x9b, 0x19, 0xb3, 0x1a, 0x98, 0xd1, 0x96, 0x67, 0x4a, 0x66, 0x53, 0x87, 0x3c, 0x63, 0x36, - 0x33, 0xdf, 0xb6, 0x36, 0x47, 0x28, 0xc6, 0x7e, 0xc8, 0x85, 0x13, 0xba, 0xf0, 0xfa, 0x6a, 0x73, - 0x4a, 0x7a, 0xbe, 0xde, 0x68, 0x22, 0xbb, 0xf0, 0x94, 0x50, 0x3c, 0xc3, 0x21, 0x1e, 0x40, 0xbc, - 0x1a, 0x0f, 0xed, 0x7e, 0xd8, 0x3c, 0xb0, 0x80, 0x16, 0xa7, 0xed, 0xd2, 0x33, 0x72, 0x1b, 0xcf, - 0xba, 0xea, 0x44, 0x6f, 0x47, 0x2a, 0x21, 0xcd, 0xff, 0x29, 0xce, 0x8b, 0x66, 0x12, 0x16, 0xb3, - 0x98, 0x91, 0x1c, 0x51, 0x66, 0xc4, 0x1c, 0xb4, 0xcc, 0x1b, 0xc5, 0xad, 0x76, 0xd9, 0x12, 0xbd, - 0x8f, 0x30, 0xc9, 0xc8, 0xd7, 0x40, 0x64, 0x21, 0x23, 0xf8, 0x80, 0x8c, 0x50, 0x1a, 0x2d, 0x35, - 0x2e, 0x87, 0xb1, 0xb1, 0x37, 0x8c, 0xb7, 0x30, 0xf6, 0x40, 0x64, 0x80, 0x53, 0x0a, 0x70, 0xb9, - 0x1a, 0xe0, 0x9a, 0xde, 0x67, 0x17, 0x6c, 0x90, 0xe3, 0xf8, 0xe0, 0x86, 0x0f, 0x41, 0x97, 0xab, - 0x98, 0x1c, 0xb6, 0xd3, 0x19, 0xfd, 0x06, 0xe1, 0x27, 0x32, 0xe4, 0xb6, 0xcf, 0x45, 0xb5, 0x34, - 0x77, 0xf0, 0x91, 0xc0, 0xe7, 0x1a, 0x30, 0xc9, 0x74, 0xab, 0x1a, 0x60, 0x3b, 0xdf, 0x68, 0x17, - 0xad, 0x14, 0x10, 0xa7, 0x4a, 0x88, 0x1e, 0x7e, 0x5a, 0x97, 0x03, 0xf0, 0xfe, 0x7a, 0xcf, 0xaf, - 0x11, 0x59, 0x03, 0x4f, 0xf7, 0xa0, 0xc7, 0xfc, 0x0f, 0xa1, 0xab, 0xdc, 0x4c, 0xdb, 0x7a, 0x4e, - 0xbf, 0x47, 0xf8, 0xc9, 0xdc, 0x93, 0x88, 0x87, 0xfb, 0x77, 0x73, 0x01, 0x1f, 0x8b, 0x81, 0x0b, - 0x27, 0x16, 0x9d, 0xbe, 0xeb, 0x02, 0xe7, 0x1b, 0xfd, 0x20, 0xf5, 0x37, 0xba, 0x20, 0xdf, 0x0e, - 0x59, 0x17, 0x5e, 0x93, 0xe7, 0xed, 0x40, 0x00, 0xae, 0x60, 0x71, 0x9a, 0xa7, 0xd1, 0x05, 0xba, - 0x9d, 0x5f, 0x4d, 0x19, 0x8f, 0x1e, 0xd4, 0xc2, 0x1c, 0x75, 0x3c, 0xf5, 0x30, 0xc7, 0x6d, 0xdc, - 0xcc, 0x1c, 0xbf, 0x03, 0x71, 0xcf, 0x0f, 0x0b, 0x6d, 0xe1, 0x6f, 0xfb, 0xa6, 0x9f, 0x17, 0x2a, - 0xaf, 0x23, 0x58, 0xf4, 0x0f, 0x9d, 0x82, 0x34, 0xf1, 0xa1, 0x1e, 0x70, 0xee, 0x78, 0x90, 0x86, - 0x38, 0x9b, 0xd2, 0x37, 0xf0, 0x71, 0x0d, 0xd4, 0xe7, 0x11, 0x84, 0xdd, 0xfd, 0x9f, 0xee, 0xbb, - 0x42, 0x2b, 0x68, 0x33, 0x6f, 0xff, 0x87, 0x6b, 0xe2, 0x43, 0x11, 0xeb, 0xbe, 0x25, 0x37, 0x25, - 0x47, 0xca, 0xa6, 0xe4, 0x1a, 0xc6, 0x01, 0xf3, 0xb2, 0x3b, 0x78, 0x40, 0xdd, 0xc1, 0xd3, 0x85, - 0x3b, 0x68, 0xca, 0xe6, 0x2e, 0x6f, 0xdc, 0x2d, 0xd6, 0x6d, 0xeb, 0x17, 0xed, 0xc2, 0x26, 0x59, - 0xf1, 0xba, 0x96, 0x56, 0x21, 0x80, 0x1a, 0xf9, 0x94, 0x7d, 0xb5, 0xab, 0x4c, 0x94, 0xdb, 0x56, - 0xc5, 0xbe, 0xba, 0x5a, 0xdc, 0x6a, 0x97, 0x2d, 0xd1, 0x66, 0x9e, 0x98, 0x8c, 0x92, 0x47, 0x2c, - 0xe4, 0x40, 0xef, 0xc9, 0x03, 0x38, 0xc2, 0xdd, 0xcc, 0xd6, 0xf9, 0x7f, 0xb0, 0x81, 0x7d, 0x9c, - 0x97, 0x82, 0x62, 0xbd, 0x39, 0x80, 0x50, 0x45, 0x58, 0x0c, 0x23, 0x1d, 0x61, 0x39, 0x26, 0xef, - 0xe2, 0x83, 0x6c, 0xfd, 0x0e, 0xb8, 0xe2, 0xf1, 0x7c, 0x3c, 0x53, 0x63, 0xf4, 0x15, 0x3c, 0xdd, - 0x66, 0xde, 0xcd, 0x50, 0xc4, 0x43, 0x59, 0x4f, 0x2e, 0x0b, 0x05, 0x84, 0x22, 0xf5, 0x9c, 0x4d, - 0x8b, 0x95, 0xd6, 0x28, 0x55, 0x1a, 0xfd, 0xac, 0xf4, 0x91, 0x08, 0xc5, 0xbf, 0xad, 0x05, 0xe8, - 0x83, 0x42, 0xdd, 0x76, 0x4a, 0x5f, 0x84, 0xc9, 0x48, 0x14, 0xcf, 0xc4, 0xc0, 0x59, 0x3f, 0x76, - 0xe1, 0x4d, 0x3f, 0xec, 0xa6, 0xe7, 0x2c, 0x3d, 0x2b, 0xbe, 0x53, 0xb8, 0x75, 0xa5, 0x67, 0x04, - 0xf0, 0x6c, 0xf2, 0x21, 0x2a, 0xdf, 0xbe, 0x57, 0xf7, 0x75, 0xbe, 0x4e, 0x66, 0x89, 0xdb, 0x65, - 0xab, 0x2b, 0xf7, 0x8f, 0xe1, 0xa3, 0xfa, 0x98, 0x10, 0x0f, 0x7c, 0x17, 0xc8, 0x57, 0x08, 0xcf, - 0x25, 0x22, 0x24, 0x5b, 0x21, 0xa7, 0x72, 0xa3, 0x63, 0x35, 0x9b, 0x51, 0x2f, 0xee, 0x74, 0xf1, - 0xd3, 0x3f, 0x1e, 0x7c, 0xd1, 0xa0, 0xf4, 0xa4, 0x92, 0x8c, 0x83, 0x96, 0xd6, 0x98, 0xdc, 0xba, - 0xab, 0x63, 0xbb, 0x73, 0x05, 0x9d, 0x23, 0x5f, 0x22, 0x7c, 0x64, 0x0d, 0x84, 0x26, 0x3b, 0x31, - 0x4a, 0x96, 0xeb, 0xa2, 0xba, 0x58, 0x17, 0x14, 0xd6, 0x73, 0xe4, 0xd9, 0x89, 0x58, 0xc9, 0x78, - 0x47, 0xa2, 0xcd, 0xca, 0x9b, 0xab, 0x1b, 0x05, 0x39, 0x39, 0x0a, 0x57, 0x50, 0x40, 0xc6, 0xb5, - 0x5a, 0x74, 0xd2, 0x12, 0x3d, 0xa3, 0x08, 0x4f, 0x91, 0xc9, 0x81, 0x23, 0x1f, 0xe1, 0xb9, 0x72, - 0x0f, 0x2b, 0x65, 0x74, 0x5c, 0x77, 0x33, 0xc6, 0x04, 0x36, 0x6f, 0x2d, 0xf4, 0xbc, 0xf2, 0x7b, - 0x86, 0x3c, 0xb3, 0xd7, 0xef, 0x12, 0xc8, 0xf5, 0x92, 0xf7, 0x65, 0x44, 0x3e, 0x41, 0x78, 0x2e, - 0xe9, 0xab, 0x93, 0x4a, 0xaa, 0xf4, 0x7d, 0x30, 0x16, 0x1e, 0xfe, 0x42, 0xda, 0x9a, 0xd3, 0xf4, - 0x9c, 0xab, 0x96, 0x9e, 0x1f, 0x10, 0x9e, 0x55, 0x9a, 0x4b, 0x23, 0xcc, 0x8f, 0x7a, 0x28, 0x8a, - 0xb2, 0xba, 0xd5, 0xf3, 0x82, 0xc2, 0xb3, 0x8c, 0x73, 0x55, 0xf0, 0xac, 0x58, 0x7a, 0x96, 0x15, - 0xfe, 0x33, 0xc2, 0xff, 0xcf, 0x54, 0xa8, 0x46, 0x3d, 0x3d, 0x0e, 0xb5, 0xa4, 0x54, 0xeb, 0xd2, - 0x5e, 0x56, 0xb4, 0x2b, 0xc6, 0x52, 0x45, 0xda, 0xc4, 0xb9, 0x04, 0xfe, 0x11, 0xe1, 0xb9, 0x44, - 0x26, 0x4e, 0x4a, 0x6e, 0x49, 0x48, 0xd6, 0x85, 0x7d, 0x51, 0xc1, 0x2e, 0x1b, 0xe7, 0x2b, 0xc3, - 0xf6, 0x40, 0xa2, 0xfe, 0x84, 0xf0, 0xd1, 0x54, 0x78, 0x69, 0xd6, 0x31, 0x75, 0x56, 0xd6, 0x66, - 0x75, 0x61, 0x5f, 0x52, 0xb0, 0x2d, 0xe3, 0x42, 0x25, 0x58, 0x9e, 0xf8, 0x96, 0xb4, 0xbf, 0x20, - 0x7c, 0x4c, 0xcb, 0x60, 0xcd, 0x4b, 0x47, 0x79, 0xf7, 0x6a, 0xe5, 0xba, 0xc4, 0x2f, 0x2b, 0xe2, - 0x8b, 0x86, 0x59, 0x89, 0x58, 0x64, 0xde, 0x25, 0xf3, 0x3d, 0x84, 0x67, 0xa4, 0xd6, 0xd6, 0xb8, - 0x63, 0x7a, 0x60, 0x41, 0x8b, 0xd7, 0x25, 0xbd, 0xa4, 0x48, 0x4d, 0xe3, 0x6c, 0xb5, 0xd8, 0x0a, - 0x16, 0x49, 0xc8, 0xaf, 0x11, 0x9e, 0x91, 0x2a, 0x63, 0x12, 0x64, 0x41, 0x85, 0xd4, 0x85, 0x5c, - 0x52, 0x90, 0xcf, 0x53, 0x3a, 0x19, 0x32, 0xf0, 0x43, 0x75, 0x9f, 0x86, 0xf8, 0x50, 0xa2, 0xa7, - 0xf9, 0xb8, 0xaf, 0x5b, 0x2e, 0xf5, 0x0d, 0x92, 0xaf, 0x66, 0xe2, 0x8b, 0x5e, 0x51, 0xbe, 0x2e, - 0x91, 0x95, 0x4a, 0x01, 0xb9, 0x9b, 0xea, 0xaf, 0x1d, 0x2b, 0x60, 0xde, 0x32, 0x22, 0xdf, 0x22, - 0x3c, 0xd7, 0x29, 0x77, 0x9e, 0x53, 0xe3, 0xae, 0xc7, 0x63, 0xec, 0x3b, 0x96, 0x02, 0x3e, 0x4b, - 0x1f, 0xd1, 0xc4, 0x75, 0xbb, 0xb9, 0x7e, 0xf5, 0xb7, 0xdd, 0x79, 0xf4, 0xfb, 0xee, 0x3c, 0xfa, - 0x73, 0x77, 0x1e, 0xbd, 0x6f, 0x3d, 0xea, 0x7f, 0xd5, 0x9e, 0x9f, 0x6f, 0xeb, 0x07, 0xd5, 0xef, - 0xa7, 0x8b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x67, 0xf8, 0xbe, 0xcf, 0x9d, 0x13, 0x00, 0x00, + // 1260 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x5d, 0x6f, 0xdc, 0x44, + 0x17, 0xc7, 0x35, 0xdb, 0x3e, 0x6d, 0x3a, 0x4d, 0xd2, 0xa7, 0x03, 0x94, 0x95, 0xd5, 0xa6, 0xe9, + 0x40, 0x21, 0x7d, 0x89, 0x9d, 0x4d, 0x0b, 0x94, 0x4a, 0x05, 0xb5, 0x49, 0x89, 0x80, 0x15, 0x54, + 0x5e, 0x10, 0x2a, 0x77, 0x8e, 0xf7, 0xc4, 0x71, 0xe3, 0xf5, 0x18, 0xcf, 0xec, 0x46, 0x4b, 0x15, + 0x10, 0x5c, 0x21, 0x2e, 0xe0, 0x82, 0x1b, 0x04, 0x57, 0xbc, 0x49, 0x48, 0x48, 0xa8, 0x88, 0x2f, + 0xc1, 0x25, 0x12, 0x5f, 0x00, 0x45, 0xfd, 0x20, 0x68, 0xc6, 0xf6, 0xd8, 0xce, 0x6e, 0xb7, 0x26, + 0xae, 0xe8, 0xdd, 0x8c, 0xc7, 0x73, 0xce, 0x6f, 0xce, 0x99, 0x73, 0xfc, 0x97, 0xf1, 0xd9, 0x68, + 0xcb, 0xb3, 0x9c, 0xc8, 0x77, 0x03, 0x1f, 0x42, 0x61, 0x6d, 0xb3, 0x78, 0x6b, 0x23, 0x60, 0xdb, + 0x7a, 0x60, 0x46, 0x31, 0x13, 0x8c, 0x4c, 0x65, 0x73, 0x63, 0xd1, 0xf3, 0xc5, 0x66, 0x7f, 0xdd, + 0x74, 0x59, 0xcf, 0xf2, 0x98, 0xc7, 0x2c, 0xf5, 0xc2, 0x7a, 0x7f, 0x43, 0xcd, 0xd4, 0x44, 0x8d, + 0x92, 0x8d, 0xc6, 0x49, 0x8f, 0x31, 0x2f, 0x00, 0xe9, 0xc2, 0x72, 0xc2, 0x90, 0x09, 0x47, 0xf8, + 0x2c, 0xe4, 0xe9, 0xea, 0xe5, 0xad, 0x2b, 0xdc, 0xf4, 0x99, 0x5c, 0xed, 0x39, 0xee, 0xa6, 0x1f, + 0x42, 0x3c, 0xb4, 0x52, 0x22, 0x6e, 0xf5, 0x40, 0x38, 0xd6, 0xa0, 0x65, 0x79, 0x10, 0x42, 0xec, + 0x08, 0xe8, 0xa6, 0xbb, 0x56, 0x0a, 0x08, 0x4e, 0xac, 0x9c, 0xde, 0x51, 0x83, 0x7c, 0xab, 0x3e, + 0xc7, 0xa0, 0xe5, 0x04, 0xd1, 0xa6, 0x33, 0x6a, 0x84, 0xe6, 0xae, 0x2d, 0x97, 0xc5, 0x30, 0xc6, + 0x11, 0xfd, 0xbd, 0x81, 0x9f, 0x7a, 0x2f, 0xb5, 0xb4, 0x12, 0x83, 0x23, 0xc0, 0x86, 0x0f, 0xfa, + 0xc0, 0x05, 0x39, 0x89, 0x8f, 0x84, 0x4e, 0x0f, 0x78, 0xe4, 0xb8, 0xd0, 0x44, 0xf3, 0x68, 0xe1, + 0x88, 0x9d, 0x3f, 0x20, 0xb7, 0xb1, 0x8e, 0x57, 0xb3, 0x31, 0x8f, 0x16, 0x8e, 0x2e, 0x5f, 0x33, + 0x73, 0x66, 0x33, 0x63, 0x56, 0x03, 0x33, 0xda, 0xf2, 0x4c, 0xc9, 0x6c, 0xea, 0x90, 0x67, 0xcc, + 0x66, 0xe6, 0xdb, 0xd6, 0xe6, 0x08, 0xc5, 0xd8, 0x0f, 0xb9, 0x70, 0x42, 0x17, 0x5e, 0x5f, 0x6d, + 0x1e, 0x90, 0x9e, 0x6f, 0x34, 0x9a, 0xc8, 0x2e, 0x3c, 0x25, 0x14, 0x4f, 0x73, 0x88, 0x07, 0x10, + 0xaf, 0xc6, 0x43, 0xbb, 0x1f, 0x36, 0x0f, 0xce, 0xa3, 0x85, 0x29, 0xbb, 0xf4, 0x8c, 0xdc, 0xc6, + 0x33, 0xae, 0x3a, 0xd1, 0xdb, 0x91, 0x4a, 0x48, 0xf3, 0x7f, 0x8a, 0xf3, 0x92, 0x99, 0x84, 0xc5, + 0x2c, 0x66, 0x24, 0x47, 0x94, 0x19, 0x31, 0x07, 0x2d, 0x73, 0xa5, 0xb8, 0xd5, 0x2e, 0x5b, 0xa2, + 0xf7, 0x10, 0x26, 0x19, 0xf9, 0x1a, 0x88, 0x2c, 0x64, 0x04, 0x1f, 0x94, 0x11, 0x4a, 0xa3, 0xa5, + 0xc6, 0xe5, 0x30, 0x36, 0xf6, 0x86, 0xf1, 0x16, 0xc6, 0x1e, 0x88, 0x0c, 0xf0, 0x80, 0x02, 0x5c, + 0xaa, 0x06, 0xb8, 0xa6, 0xf7, 0xd9, 0x05, 0x1b, 0xe4, 0x04, 0x3e, 0xb4, 0xe1, 0x43, 0xd0, 0xe5, + 0x2a, 0x26, 0x47, 0xec, 0x74, 0x46, 0x3f, 0x43, 0xf8, 0x89, 0x0c, 0xb9, 0xed, 0x73, 0x51, 0x2d, + 0xcd, 0x1d, 0x7c, 0x34, 0xf0, 0xb9, 0x06, 0x4c, 0x32, 0xdd, 0xaa, 0x06, 0xd8, 0xce, 0x37, 0xda, + 0x45, 0x2b, 0xd4, 0xc3, 0x4f, 0xeb, 0xb4, 0x03, 0xef, 0xaf, 0xf7, 0xfc, 0x1a, 0x11, 0x34, 0xf0, + 0x54, 0x0f, 0x7a, 0xcc, 0xff, 0x10, 0xba, 0x2a, 0x7e, 0x53, 0xb6, 0x9e, 0xd3, 0x1f, 0x11, 0x7e, + 0x32, 0xf7, 0x24, 0xe2, 0xe1, 0xfe, 0xdd, 0x5c, 0xc4, 0xc7, 0x63, 0xe0, 0xc2, 0x89, 0x45, 0xa7, + 0xef, 0xba, 0xc0, 0xf9, 0x46, 0x3f, 0x48, 0xfd, 0x8d, 0x2e, 0xc8, 0xb7, 0x43, 0xd6, 0x85, 0xd7, + 0x64, 0xe8, 0x3b, 0x10, 0x80, 0x2b, 0x58, 0x9c, 0xe6, 0x63, 0x74, 0x81, 0x6e, 0xe7, 0x25, 0x28, + 0xe3, 0xd1, 0x83, 0x5a, 0x98, 0xa3, 0x8e, 0x0f, 0x3c, 0xc8, 0x71, 0x1b, 0x37, 0x33, 0xc7, 0xef, + 0x40, 0xdc, 0xf3, 0xc3, 0x42, 0xf9, 0xff, 0x6b, 0xdf, 0xf4, 0xcb, 0xc2, 0x0d, 0xeb, 0x08, 0x16, + 0xfd, 0x47, 0xa7, 0x20, 0x4d, 0x7c, 0xb8, 0x07, 0x9c, 0x3b, 0x1e, 0xa4, 0x21, 0xce, 0xa6, 0xf4, + 0x0d, 0x7c, 0x42, 0x03, 0xf5, 0x79, 0x04, 0x61, 0x77, 0xff, 0xa7, 0xfb, 0xa1, 0x50, 0xf2, 0x6d, + 0xe6, 0xed, 0xff, 0x70, 0x4d, 0x7c, 0x38, 0x62, 0xdd, 0xb7, 0xe4, 0xa6, 0xe4, 0x48, 0xd9, 0x94, + 0x5c, 0xc7, 0x38, 0x60, 0x5e, 0x56, 0x6b, 0x07, 0x55, 0xad, 0x9d, 0x29, 0xd4, 0x9a, 0x29, 0x9b, + 0xb8, 0xac, 0xac, 0x5b, 0xac, 0xdb, 0xd6, 0x2f, 0xda, 0x85, 0x4d, 0xf2, 0xc6, 0xeb, 0xbb, 0xb4, + 0x0a, 0x01, 0xd4, 0xc8, 0xa7, 0xec, 0x9f, 0x5d, 0x65, 0xa2, 0xdc, 0x9e, 0x2a, 0xf6, 0xcf, 0xd5, + 0xe2, 0x56, 0xbb, 0x6c, 0x89, 0x36, 0xf3, 0xc4, 0x64, 0x94, 0x3c, 0x62, 0x21, 0x07, 0xfa, 0xb9, + 0x3c, 0x80, 0x23, 0xdc, 0xcd, 0x6c, 0x9d, 0x3f, 0xc6, 0x46, 0xf5, 0x71, 0x9e, 0x72, 0xc5, 0x74, + 0x73, 0x00, 0xa1, 0x8a, 0xa4, 0x18, 0x46, 0x3a, 0x92, 0x72, 0x4c, 0xde, 0xc5, 0x87, 0xd8, 0xfa, + 0x1d, 0x70, 0xc5, 0xa3, 0xf9, 0x18, 0xa6, 0xc6, 0xe8, 0x2b, 0x78, 0xaa, 0xcd, 0xbc, 0x9b, 0xa1, + 0x88, 0x87, 0xf2, 0xde, 0xb8, 0x2c, 0x14, 0x10, 0x8a, 0xd4, 0x73, 0x36, 0x2d, 0xde, 0xa8, 0x46, + 0xe9, 0x46, 0xd1, 0x2f, 0x4a, 0x4d, 0x3f, 0x14, 0x8f, 0xfb, 0xdb, 0x4e, 0xef, 0x17, 0xee, 0x67, + 0xa7, 0xd4, 0xf9, 0x27, 0x23, 0x51, 0x3c, 0x1d, 0x03, 0x67, 0xfd, 0xd8, 0x85, 0x37, 0xfd, 0xb0, + 0x9b, 0x9e, 0xb3, 0xf4, 0xac, 0xf8, 0x4e, 0xa1, 0xba, 0x4a, 0xcf, 0x08, 0xe0, 0x99, 0xe4, 0x83, + 0x53, 0xae, 0xb2, 0x57, 0xf7, 0x75, 0xbe, 0x4e, 0x66, 0x89, 0xdb, 0x65, 0xab, 0xcb, 0xf7, 0x8e, + 0xe3, 0x63, 0xfa, 0x98, 0x10, 0x0f, 0x7c, 0x17, 0xc8, 0x37, 0x08, 0xcf, 0x26, 0xa2, 0x22, 0x5b, + 0x21, 0xa7, 0x73, 0xa3, 0x63, 0x35, 0x98, 0x51, 0x2f, 0xee, 0x74, 0xe1, 0xd3, 0xbf, 0xee, 0x7f, + 0xd5, 0xa0, 0xf4, 0x94, 0x92, 0x80, 0x83, 0x96, 0xd6, 0x8c, 0xdc, 0xba, 0xab, 0x63, 0xbb, 0x73, + 0x15, 0x9d, 0x27, 0x5f, 0x23, 0x7c, 0x74, 0x0d, 0x84, 0x26, 0x3b, 0x39, 0x4a, 0x96, 0xeb, 0x9c, + 0xba, 0x58, 0x17, 0x15, 0xd6, 0x73, 0xe4, 0xd9, 0x89, 0x58, 0xc9, 0x78, 0x47, 0xa2, 0xcd, 0xc8, + 0x0a, 0xd5, 0x0d, 0x81, 0x9c, 0x1a, 0x85, 0x2b, 0x28, 0x1a, 0xe3, 0x7a, 0x2d, 0x3a, 0x69, 0x89, + 0x9e, 0x55, 0x84, 0xa7, 0xc9, 0xe4, 0xc0, 0x91, 0x8f, 0xf0, 0x6c, 0xb9, 0x57, 0x95, 0x32, 0x3a, + 0xae, 0x8b, 0x19, 0x63, 0x02, 0x9b, 0xb7, 0x16, 0x7a, 0x41, 0xf9, 0x3d, 0x4b, 0x9e, 0xd9, 0xeb, + 0x77, 0x11, 0xe4, 0x7a, 0xc9, 0xfb, 0x12, 0x22, 0x9f, 0x20, 0x3c, 0x9b, 0xf4, 0xcf, 0x49, 0x57, + 0xaa, 0xf4, 0x1d, 0x30, 0xe6, 0x1f, 0xfc, 0x42, 0xda, 0x82, 0xd3, 0xf4, 0x9c, 0xaf, 0x96, 0x9e, + 0x9f, 0x10, 0x9e, 0x51, 0xda, 0x4a, 0x23, 0xcc, 0x8d, 0x7a, 0x28, 0x8a, 0xaf, 0xba, 0xb7, 0xe7, + 0x05, 0x85, 0x67, 0x19, 0xe7, 0xab, 0xe0, 0x59, 0xb1, 0xf4, 0x2c, 0x6f, 0xf8, 0xaf, 0x08, 0xff, + 0x3f, 0x53, 0x9b, 0x1a, 0xf5, 0xcc, 0x38, 0xd4, 0x92, 0x22, 0xad, 0x4b, 0x7b, 0x45, 0xd1, 0x2e, + 0x1b, 0x8b, 0x15, 0x69, 0x13, 0xe7, 0x12, 0xf8, 0x67, 0x84, 0x67, 0x13, 0x39, 0x38, 0x29, 0xb9, + 0x25, 0xc1, 0x58, 0x17, 0xf6, 0x45, 0x05, 0xbb, 0x64, 0x5c, 0xa8, 0x0c, 0xdb, 0x03, 0x89, 0xfa, + 0x0b, 0xc2, 0xc7, 0x52, 0x81, 0xa5, 0x59, 0xc7, 0xdc, 0xb3, 0xb2, 0x06, 0xab, 0x0b, 0xfb, 0x92, + 0x82, 0x6d, 0x19, 0x17, 0x2b, 0xc1, 0xf2, 0xc4, 0xb7, 0xa4, 0xfd, 0x0d, 0xe1, 0xe3, 0x5a, 0xee, + 0x6a, 0x5e, 0x3a, 0xca, 0xbb, 0x57, 0x13, 0xd7, 0x25, 0x7e, 0x59, 0x11, 0x5f, 0x32, 0xcc, 0x4a, + 0xc4, 0x22, 0xf3, 0x2e, 0x99, 0xbf, 0x47, 0x78, 0x5a, 0x6a, 0x6a, 0x8d, 0x3b, 0xa6, 0x07, 0x16, + 0x34, 0x77, 0x5d, 0xd2, 0xcb, 0x8a, 0xd4, 0x34, 0xce, 0x55, 0x8b, 0xad, 0x60, 0x91, 0x84, 0xfc, + 0x16, 0xe1, 0x69, 0xa9, 0x32, 0x26, 0x41, 0x16, 0x54, 0x48, 0x5d, 0xc8, 0x45, 0x05, 0xf9, 0x3c, + 0xa5, 0x93, 0x21, 0x03, 0x3f, 0x54, 0xf5, 0x34, 0xc4, 0x87, 0x13, 0xdd, 0xcc, 0xc7, 0x7d, 0xdd, + 0x72, 0x49, 0x6f, 0x90, 0x7c, 0x35, 0x13, 0x5f, 0xf4, 0xaa, 0xf2, 0x75, 0x99, 0x2c, 0x57, 0x0a, + 0xc8, 0xdd, 0x54, 0x7f, 0xed, 0x58, 0x01, 0xf3, 0x96, 0x10, 0xf9, 0x0e, 0xe1, 0xd9, 0x4e, 0xb9, + 0xf3, 0x9c, 0x1e, 0x57, 0x1e, 0x8f, 0xb0, 0xef, 0x58, 0x0a, 0xf8, 0x1c, 0x7d, 0x48, 0x13, 0xd7, + 0xed, 0xe6, 0xc6, 0xb5, 0x3f, 0x76, 0xe7, 0xd0, 0x9f, 0xbb, 0x73, 0xe8, 0xef, 0xdd, 0x39, 0xf4, + 0xbe, 0xf5, 0xb0, 0xff, 0x4f, 0x7b, 0x7e, 0xa6, 0xad, 0x1f, 0x52, 0xbf, 0x93, 0x2e, 0xfd, 0x13, + 0x00, 0x00, 0xff, 0xff, 0x61, 0xda, 0xb2, 0x9b, 0x6d, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1973,13 +1956,6 @@ func (m *WorkflowListRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Fields) > 0 { - i -= len(m.Fields) - copy(dAtA[i:], m.Fields) - i = encodeVarintWorkflow(dAtA, i, uint64(len(m.Fields))) - i-- - dAtA[i] = 0x1a - } if m.ListOptions != nil { { size, err := m.ListOptions.MarshalToSizedBuffer(dAtA[:i]) @@ -2460,13 +2436,6 @@ func (m *WatchWorkflowsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Fields) > 0 { - i -= len(m.Fields) - copy(dAtA[i:], m.Fields) - i = encodeVarintWorkflow(dAtA, i, uint64(len(m.Fields))) - i-- - dAtA[i] = 0x1a - } if m.ListOptions != nil { { size, err := m.ListOptions.MarshalToSizedBuffer(dAtA[:i]) @@ -2766,10 +2735,6 @@ func (m *WorkflowListRequest) Size() (n int) { l = m.ListOptions.Size() n += 1 + l + sovWorkflow(uint64(l)) } - l = len(m.Fields) - if l > 0 { - n += 1 + l + sovWorkflow(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2996,10 +2961,6 @@ func (m *WatchWorkflowsRequest) Size() (n int) { l = m.ListOptions.Size() n += 1 + l + sovWorkflow(uint64(l)) } - l = len(m.Fields) - if l > 0 { - n += 1 + l + sovWorkflow(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3593,38 +3554,6 @@ func (m *WorkflowListRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWorkflow - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthWorkflow - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthWorkflow - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Fields = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipWorkflow(dAtA[iNdEx:]) @@ -5017,38 +4946,6 @@ func (m *WatchWorkflowsRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowWorkflow - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthWorkflow - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthWorkflow - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Fields = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipWorkflow(dAtA[iNdEx:]) From eb6b43443a2c1f2a899ff59102fd7d7c57d00fa8 Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Fri, 5 Jun 2020 17:01:29 -0700 Subject: [PATCH 24/25] Add fields back to protobuf for list --- pkg/apiclient/workflow/workflow.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto index 3d0efbb03f53..fdae7050471c 100644 --- a/pkg/apiclient/workflow/workflow.proto +++ b/pkg/apiclient/workflow/workflow.proto @@ -31,6 +31,8 @@ message WorkflowGetRequest { message WorkflowListRequest { string namespace = 1; k8s.io.apimachinery.pkg.apis.meta.v1.ListOptions listOptions = 2; + // Fields to be included or excluded in the response. e.g. "items.spec,items.status.phase", "-items.status.nodes" + string fields = 3; } message WorkflowResubmitRequest { From 4882ea8ceeb37ce7d01712148609003a2579097c Mon Sep 17 00:00:00 2001 From: Remington Breeze Date: Fri, 5 Jun 2020 17:12:34 -0700 Subject: [PATCH 25/25] Apply codegen changes --- api/openapi-spec/swagger.json | 6 + pkg/apiclient/workflow/workflow.pb.go | 219 ++++++++++++------- pkg/apiclient/workflow/workflow.swagger.json | 7 + 3 files changed, 149 insertions(+), 83 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 90d6132ccf62..6ca5c096602b 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -1120,6 +1120,12 @@ "description": "The continue option should be set when retrieving more results from the server. Since this value is\nserver defined, clients may only use the continue value from a previous query result with identical\nquery parameters (except for the value of continue) and the server may reject a continue value it\ndoes not recognize. If the specified continue value is no longer valid whether due to expiration\n(generally five to fifteen minutes) or a configuration change on the server, the server will\nrespond with a 410 ResourceExpired error together with a continue token. If the client needs a\nconsistent list, it must restart their list without the continue field. Otherwise, the client may\nsend another list request with the token received with the 410 error, the server will respond with\na list starting from the next key, but from the latest snapshot, which is inconsistent from the\nprevious list results - objects that are created, modified, or deleted after the first list request\nwill be included in the response, as long as their keys are after the \"next key\".\n\nThis field is not supported when watch is true. Clients may start a watch from the last\nresourceVersion value returned by the server and not miss any modifications.", "name": "listOptions.continue", "in": "query" + }, + { + "type": "string", + "description": "Fields to be included or excluded in the response. e.g. \"items.spec,items.status.phase\", \"-items.status.nodes\".", + "name": "fields", + "in": "query" } ], "responses": { diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go index 70d4d8518029..48bfe808bae1 100644 --- a/pkg/apiclient/workflow/workflow.pb.go +++ b/pkg/apiclient/workflow/workflow.pb.go @@ -189,11 +189,13 @@ func (m *WorkflowGetRequest) GetFields() string { } type WorkflowListRequest struct { - Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` - ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Namespace string `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"` + ListOptions *v1.ListOptions `protobuf:"bytes,2,opt,name=listOptions,proto3" json:"listOptions,omitempty"` + // Fields to be included or excluded in the response. e.g. "items.spec,items.status.phase", "-items.status.nodes" + Fields string `protobuf:"bytes,3,opt,name=fields,proto3" json:"fields,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *WorkflowListRequest) Reset() { *m = WorkflowListRequest{} } @@ -243,6 +245,13 @@ func (m *WorkflowListRequest) GetListOptions() *v1.ListOptions { return nil } +func (m *WorkflowListRequest) GetFields() string { + if m != nil { + return m.Fields + } + return "" +} + type WorkflowResubmitRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` @@ -1112,86 +1121,87 @@ func init() { } var fileDescriptor_1f6bb75f9e833cb6 = []byte{ - // 1260 bytes of a gzipped FileDescriptorProto + // 1265 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x5d, 0x6f, 0xdc, 0x44, - 0x17, 0xc7, 0x35, 0xdb, 0x3e, 0x6d, 0x3a, 0x4d, 0xd2, 0xa7, 0x03, 0x94, 0x95, 0xd5, 0xa6, 0xe9, - 0x40, 0x21, 0x7d, 0x89, 0x9d, 0x4d, 0x0b, 0x94, 0x4a, 0x05, 0xb5, 0x49, 0x89, 0x80, 0x15, 0x54, + 0x17, 0xc7, 0x35, 0x9b, 0x3e, 0x6d, 0x3a, 0x4d, 0xd2, 0xa7, 0x03, 0x94, 0x95, 0xd5, 0xa6, 0xe9, + 0x40, 0x21, 0x7d, 0x89, 0x9d, 0x4d, 0x0b, 0x94, 0x4a, 0x05, 0xb5, 0x4d, 0x89, 0x80, 0x15, 0x54, 0x5e, 0x10, 0x2a, 0x77, 0x8e, 0xf7, 0xc4, 0x71, 0xe3, 0xf5, 0x18, 0xcf, 0xec, 0x46, 0x4b, 0x15, - 0x10, 0x5c, 0x21, 0x2e, 0xe0, 0x82, 0x1b, 0x04, 0x57, 0xbc, 0x49, 0x48, 0x48, 0xa8, 0x88, 0x2f, - 0xc1, 0x25, 0x12, 0x5f, 0x00, 0x45, 0xfd, 0x20, 0x68, 0xc6, 0xf6, 0xd8, 0xce, 0x6e, 0xb7, 0x26, - 0xae, 0xe8, 0xdd, 0x8c, 0xc7, 0x73, 0xce, 0x6f, 0xce, 0x99, 0x73, 0xfc, 0x97, 0xf1, 0xd9, 0x68, - 0xcb, 0xb3, 0x9c, 0xc8, 0x77, 0x03, 0x1f, 0x42, 0x61, 0x6d, 0xb3, 0x78, 0x6b, 0x23, 0x60, 0xdb, - 0x7a, 0x60, 0x46, 0x31, 0x13, 0x8c, 0x4c, 0x65, 0x73, 0x63, 0xd1, 0xf3, 0xc5, 0x66, 0x7f, 0xdd, - 0x74, 0x59, 0xcf, 0xf2, 0x98, 0xc7, 0x2c, 0xf5, 0xc2, 0x7a, 0x7f, 0x43, 0xcd, 0xd4, 0x44, 0x8d, - 0x92, 0x8d, 0xc6, 0x49, 0x8f, 0x31, 0x2f, 0x00, 0xe9, 0xc2, 0x72, 0xc2, 0x90, 0x09, 0x47, 0xf8, - 0x2c, 0xe4, 0xe9, 0xea, 0xe5, 0xad, 0x2b, 0xdc, 0xf4, 0x99, 0x5c, 0xed, 0x39, 0xee, 0xa6, 0x1f, - 0x42, 0x3c, 0xb4, 0x52, 0x22, 0x6e, 0xf5, 0x40, 0x38, 0xd6, 0xa0, 0x65, 0x79, 0x10, 0x42, 0xec, - 0x08, 0xe8, 0xa6, 0xbb, 0x56, 0x0a, 0x08, 0x4e, 0xac, 0x9c, 0xde, 0x51, 0x83, 0x7c, 0xab, 0x3e, - 0xc7, 0xa0, 0xe5, 0x04, 0xd1, 0xa6, 0x33, 0x6a, 0x84, 0xe6, 0xae, 0x2d, 0x97, 0xc5, 0x30, 0xc6, - 0x11, 0xfd, 0xbd, 0x81, 0x9f, 0x7a, 0x2f, 0xb5, 0xb4, 0x12, 0x83, 0x23, 0xc0, 0x86, 0x0f, 0xfa, - 0xc0, 0x05, 0x39, 0x89, 0x8f, 0x84, 0x4e, 0x0f, 0x78, 0xe4, 0xb8, 0xd0, 0x44, 0xf3, 0x68, 0xe1, - 0x88, 0x9d, 0x3f, 0x20, 0xb7, 0xb1, 0x8e, 0x57, 0xb3, 0x31, 0x8f, 0x16, 0x8e, 0x2e, 0x5f, 0x33, - 0x73, 0x66, 0x33, 0x63, 0x56, 0x03, 0x33, 0xda, 0xf2, 0x4c, 0xc9, 0x6c, 0xea, 0x90, 0x67, 0xcc, - 0x66, 0xe6, 0xdb, 0xd6, 0xe6, 0x08, 0xc5, 0xd8, 0x0f, 0xb9, 0x70, 0x42, 0x17, 0x5e, 0x5f, 0x6d, - 0x1e, 0x90, 0x9e, 0x6f, 0x34, 0x9a, 0xc8, 0x2e, 0x3c, 0x25, 0x14, 0x4f, 0x73, 0x88, 0x07, 0x10, - 0xaf, 0xc6, 0x43, 0xbb, 0x1f, 0x36, 0x0f, 0xce, 0xa3, 0x85, 0x29, 0xbb, 0xf4, 0x8c, 0xdc, 0xc6, - 0x33, 0xae, 0x3a, 0xd1, 0xdb, 0x91, 0x4a, 0x48, 0xf3, 0x7f, 0x8a, 0xf3, 0x92, 0x99, 0x84, 0xc5, - 0x2c, 0x66, 0x24, 0x47, 0x94, 0x19, 0x31, 0x07, 0x2d, 0x73, 0xa5, 0xb8, 0xd5, 0x2e, 0x5b, 0xa2, - 0xf7, 0x10, 0x26, 0x19, 0xf9, 0x1a, 0x88, 0x2c, 0x64, 0x04, 0x1f, 0x94, 0x11, 0x4a, 0xa3, 0xa5, - 0xc6, 0xe5, 0x30, 0x36, 0xf6, 0x86, 0xf1, 0x16, 0xc6, 0x1e, 0x88, 0x0c, 0xf0, 0x80, 0x02, 0x5c, - 0xaa, 0x06, 0xb8, 0xa6, 0xf7, 0xd9, 0x05, 0x1b, 0xe4, 0x04, 0x3e, 0xb4, 0xe1, 0x43, 0xd0, 0xe5, - 0x2a, 0x26, 0x47, 0xec, 0x74, 0x46, 0x3f, 0x43, 0xf8, 0x89, 0x0c, 0xb9, 0xed, 0x73, 0x51, 0x2d, - 0xcd, 0x1d, 0x7c, 0x34, 0xf0, 0xb9, 0x06, 0x4c, 0x32, 0xdd, 0xaa, 0x06, 0xd8, 0xce, 0x37, 0xda, - 0x45, 0x2b, 0xd4, 0xc3, 0x4f, 0xeb, 0xb4, 0x03, 0xef, 0xaf, 0xf7, 0xfc, 0x1a, 0x11, 0x34, 0xf0, - 0x54, 0x0f, 0x7a, 0xcc, 0xff, 0x10, 0xba, 0x2a, 0x7e, 0x53, 0xb6, 0x9e, 0xd3, 0x1f, 0x11, 0x7e, - 0x32, 0xf7, 0x24, 0xe2, 0xe1, 0xfe, 0xdd, 0x5c, 0xc4, 0xc7, 0x63, 0xe0, 0xc2, 0x89, 0x45, 0xa7, - 0xef, 0xba, 0xc0, 0xf9, 0x46, 0x3f, 0x48, 0xfd, 0x8d, 0x2e, 0xc8, 0xb7, 0x43, 0xd6, 0x85, 0xd7, - 0x64, 0xe8, 0x3b, 0x10, 0x80, 0x2b, 0x58, 0x9c, 0xe6, 0x63, 0x74, 0x81, 0x6e, 0xe7, 0x25, 0x28, - 0xe3, 0xd1, 0x83, 0x5a, 0x98, 0xa3, 0x8e, 0x0f, 0x3c, 0xc8, 0x71, 0x1b, 0x37, 0x33, 0xc7, 0xef, - 0x40, 0xdc, 0xf3, 0xc3, 0x42, 0xf9, 0xff, 0x6b, 0xdf, 0xf4, 0xcb, 0xc2, 0x0d, 0xeb, 0x08, 0x16, - 0xfd, 0x47, 0xa7, 0x20, 0x4d, 0x7c, 0xb8, 0x07, 0x9c, 0x3b, 0x1e, 0xa4, 0x21, 0xce, 0xa6, 0xf4, - 0x0d, 0x7c, 0x42, 0x03, 0xf5, 0x79, 0x04, 0x61, 0x77, 0xff, 0xa7, 0xfb, 0xa1, 0x50, 0xf2, 0x6d, - 0xe6, 0xed, 0xff, 0x70, 0x4d, 0x7c, 0x38, 0x62, 0xdd, 0xb7, 0xe4, 0xa6, 0xe4, 0x48, 0xd9, 0x94, - 0x5c, 0xc7, 0x38, 0x60, 0x5e, 0x56, 0x6b, 0x07, 0x55, 0xad, 0x9d, 0x29, 0xd4, 0x9a, 0x29, 0x9b, - 0xb8, 0xac, 0xac, 0x5b, 0xac, 0xdb, 0xd6, 0x2f, 0xda, 0x85, 0x4d, 0xf2, 0xc6, 0xeb, 0xbb, 0xb4, - 0x0a, 0x01, 0xd4, 0xc8, 0xa7, 0xec, 0x9f, 0x5d, 0x65, 0xa2, 0xdc, 0x9e, 0x2a, 0xf6, 0xcf, 0xd5, - 0xe2, 0x56, 0xbb, 0x6c, 0x89, 0x36, 0xf3, 0xc4, 0x64, 0x94, 0x3c, 0x62, 0x21, 0x07, 0xfa, 0xb9, - 0x3c, 0x80, 0x23, 0xdc, 0xcd, 0x6c, 0x9d, 0x3f, 0xc6, 0x46, 0xf5, 0x71, 0x9e, 0x72, 0xc5, 0x74, - 0x73, 0x00, 0xa1, 0x8a, 0xa4, 0x18, 0x46, 0x3a, 0x92, 0x72, 0x4c, 0xde, 0xc5, 0x87, 0xd8, 0xfa, - 0x1d, 0x70, 0xc5, 0xa3, 0xf9, 0x18, 0xa6, 0xc6, 0xe8, 0x2b, 0x78, 0xaa, 0xcd, 0xbc, 0x9b, 0xa1, - 0x88, 0x87, 0xf2, 0xde, 0xb8, 0x2c, 0x14, 0x10, 0x8a, 0xd4, 0x73, 0x36, 0x2d, 0xde, 0xa8, 0x46, - 0xe9, 0x46, 0xd1, 0x2f, 0x4a, 0x4d, 0x3f, 0x14, 0x8f, 0xfb, 0xdb, 0x4e, 0xef, 0x17, 0xee, 0x67, - 0xa7, 0xd4, 0xf9, 0x27, 0x23, 0x51, 0x3c, 0x1d, 0x03, 0x67, 0xfd, 0xd8, 0x85, 0x37, 0xfd, 0xb0, - 0x9b, 0x9e, 0xb3, 0xf4, 0xac, 0xf8, 0x4e, 0xa1, 0xba, 0x4a, 0xcf, 0x08, 0xe0, 0x99, 0xe4, 0x83, - 0x53, 0xae, 0xb2, 0x57, 0xf7, 0x75, 0xbe, 0x4e, 0x66, 0x89, 0xdb, 0x65, 0xab, 0xcb, 0xf7, 0x8e, - 0xe3, 0x63, 0xfa, 0x98, 0x10, 0x0f, 0x7c, 0x17, 0xc8, 0x37, 0x08, 0xcf, 0x26, 0xa2, 0x22, 0x5b, - 0x21, 0xa7, 0x73, 0xa3, 0x63, 0x35, 0x98, 0x51, 0x2f, 0xee, 0x74, 0xe1, 0xd3, 0xbf, 0xee, 0x7f, - 0xd5, 0xa0, 0xf4, 0x94, 0x92, 0x80, 0x83, 0x96, 0xd6, 0x8c, 0xdc, 0xba, 0xab, 0x63, 0xbb, 0x73, - 0x15, 0x9d, 0x27, 0x5f, 0x23, 0x7c, 0x74, 0x0d, 0x84, 0x26, 0x3b, 0x39, 0x4a, 0x96, 0xeb, 0x9c, - 0xba, 0x58, 0x17, 0x15, 0xd6, 0x73, 0xe4, 0xd9, 0x89, 0x58, 0xc9, 0x78, 0x47, 0xa2, 0xcd, 0xc8, - 0x0a, 0xd5, 0x0d, 0x81, 0x9c, 0x1a, 0x85, 0x2b, 0x28, 0x1a, 0xe3, 0x7a, 0x2d, 0x3a, 0x69, 0x89, - 0x9e, 0x55, 0x84, 0xa7, 0xc9, 0xe4, 0xc0, 0x91, 0x8f, 0xf0, 0x6c, 0xb9, 0x57, 0x95, 0x32, 0x3a, - 0xae, 0x8b, 0x19, 0x63, 0x02, 0x9b, 0xb7, 0x16, 0x7a, 0x41, 0xf9, 0x3d, 0x4b, 0x9e, 0xd9, 0xeb, - 0x77, 0x11, 0xe4, 0x7a, 0xc9, 0xfb, 0x12, 0x22, 0x9f, 0x20, 0x3c, 0x9b, 0xf4, 0xcf, 0x49, 0x57, - 0xaa, 0xf4, 0x1d, 0x30, 0xe6, 0x1f, 0xfc, 0x42, 0xda, 0x82, 0xd3, 0xf4, 0x9c, 0xaf, 0x96, 0x9e, - 0x9f, 0x10, 0x9e, 0x51, 0xda, 0x4a, 0x23, 0xcc, 0x8d, 0x7a, 0x28, 0x8a, 0xaf, 0xba, 0xb7, 0xe7, - 0x05, 0x85, 0x67, 0x19, 0xe7, 0xab, 0xe0, 0x59, 0xb1, 0xf4, 0x2c, 0x6f, 0xf8, 0xaf, 0x08, 0xff, - 0x3f, 0x53, 0x9b, 0x1a, 0xf5, 0xcc, 0x38, 0xd4, 0x92, 0x22, 0xad, 0x4b, 0x7b, 0x45, 0xd1, 0x2e, - 0x1b, 0x8b, 0x15, 0x69, 0x13, 0xe7, 0x12, 0xf8, 0x67, 0x84, 0x67, 0x13, 0x39, 0x38, 0x29, 0xb9, - 0x25, 0xc1, 0x58, 0x17, 0xf6, 0x45, 0x05, 0xbb, 0x64, 0x5c, 0xa8, 0x0c, 0xdb, 0x03, 0x89, 0xfa, - 0x0b, 0xc2, 0xc7, 0x52, 0x81, 0xa5, 0x59, 0xc7, 0xdc, 0xb3, 0xb2, 0x06, 0xab, 0x0b, 0xfb, 0x92, - 0x82, 0x6d, 0x19, 0x17, 0x2b, 0xc1, 0xf2, 0xc4, 0xb7, 0xa4, 0xfd, 0x0d, 0xe1, 0xe3, 0x5a, 0xee, - 0x6a, 0x5e, 0x3a, 0xca, 0xbb, 0x57, 0x13, 0xd7, 0x25, 0x7e, 0x59, 0x11, 0x5f, 0x32, 0xcc, 0x4a, - 0xc4, 0x22, 0xf3, 0x2e, 0x99, 0xbf, 0x47, 0x78, 0x5a, 0x6a, 0x6a, 0x8d, 0x3b, 0xa6, 0x07, 0x16, - 0x34, 0x77, 0x5d, 0xd2, 0xcb, 0x8a, 0xd4, 0x34, 0xce, 0x55, 0x8b, 0xad, 0x60, 0x91, 0x84, 0xfc, - 0x16, 0xe1, 0x69, 0xa9, 0x32, 0x26, 0x41, 0x16, 0x54, 0x48, 0x5d, 0xc8, 0x45, 0x05, 0xf9, 0x3c, - 0xa5, 0x93, 0x21, 0x03, 0x3f, 0x54, 0xf5, 0x34, 0xc4, 0x87, 0x13, 0xdd, 0xcc, 0xc7, 0x7d, 0xdd, - 0x72, 0x49, 0x6f, 0x90, 0x7c, 0x35, 0x13, 0x5f, 0xf4, 0xaa, 0xf2, 0x75, 0x99, 0x2c, 0x57, 0x0a, - 0xc8, 0xdd, 0x54, 0x7f, 0xed, 0x58, 0x01, 0xf3, 0x96, 0x10, 0xf9, 0x0e, 0xe1, 0xd9, 0x4e, 0xb9, - 0xf3, 0x9c, 0x1e, 0x57, 0x1e, 0x8f, 0xb0, 0xef, 0x58, 0x0a, 0xf8, 0x1c, 0x7d, 0x48, 0x13, 0xd7, - 0xed, 0xe6, 0xc6, 0xb5, 0x3f, 0x76, 0xe7, 0xd0, 0x9f, 0xbb, 0x73, 0xe8, 0xef, 0xdd, 0x39, 0xf4, - 0xbe, 0xf5, 0xb0, 0xff, 0x4f, 0x7b, 0x7e, 0xa6, 0xad, 0x1f, 0x52, 0xbf, 0x93, 0x2e, 0xfd, 0x13, - 0x00, 0x00, 0xff, 0xff, 0x61, 0xda, 0xb2, 0x9b, 0x6d, 0x13, 0x00, 0x00, + 0x10, 0x5c, 0x72, 0x01, 0x17, 0xdc, 0x20, 0xb8, 0xe1, 0x55, 0x42, 0x42, 0x42, 0x45, 0x7c, 0x09, + 0x2e, 0x91, 0xf8, 0x02, 0x28, 0xea, 0x07, 0x41, 0x33, 0xb6, 0xc7, 0x76, 0x76, 0xbb, 0x35, 0x71, + 0x45, 0xef, 0x66, 0x3c, 0x9e, 0x73, 0x7e, 0x73, 0xce, 0x99, 0xe3, 0xbf, 0x8c, 0xcf, 0x44, 0x5b, + 0x9e, 0xe5, 0x44, 0xbe, 0x1b, 0xf8, 0x10, 0x0a, 0x6b, 0x9b, 0xc5, 0x5b, 0x1b, 0x01, 0xdb, 0xd6, + 0x03, 0x33, 0x8a, 0x99, 0x60, 0x64, 0x3a, 0x9b, 0x1b, 0x4b, 0x9e, 0x2f, 0x36, 0xfb, 0xeb, 0xa6, + 0xcb, 0x7a, 0x96, 0xc7, 0x3c, 0x66, 0xa9, 0x17, 0xd6, 0xfb, 0x1b, 0x6a, 0xa6, 0x26, 0x6a, 0x94, + 0x6c, 0x34, 0x4e, 0x78, 0x8c, 0x79, 0x01, 0x48, 0x17, 0x96, 0x13, 0x86, 0x4c, 0x38, 0xc2, 0x67, + 0x21, 0x4f, 0x57, 0x2f, 0x6d, 0x5d, 0xe6, 0xa6, 0xcf, 0xe4, 0x6a, 0xcf, 0x71, 0x37, 0xfd, 0x10, + 0xe2, 0xa1, 0x95, 0x12, 0x71, 0xab, 0x07, 0xc2, 0xb1, 0x06, 0x2d, 0xcb, 0x83, 0x10, 0x62, 0x47, + 0x40, 0x37, 0xdd, 0x75, 0xa3, 0x80, 0xe0, 0xc4, 0xca, 0xe9, 0x1d, 0x35, 0xc8, 0xb7, 0xea, 0x73, + 0x0c, 0x5a, 0x4e, 0x10, 0x6d, 0x3a, 0xa3, 0x46, 0x68, 0xee, 0xda, 0x72, 0x59, 0x0c, 0x63, 0x1c, + 0xd1, 0xdf, 0x1b, 0xf8, 0xa9, 0xf7, 0x52, 0x4b, 0x37, 0x62, 0x70, 0x04, 0xd8, 0xf0, 0x41, 0x1f, + 0xb8, 0x20, 0x27, 0xf0, 0xe1, 0xd0, 0xe9, 0x01, 0x8f, 0x1c, 0x17, 0x9a, 0x68, 0x01, 0x2d, 0x1e, + 0xb6, 0xf3, 0x07, 0xe4, 0x36, 0xd6, 0xf1, 0x6a, 0x36, 0x16, 0xd0, 0xe2, 0x91, 0x95, 0xab, 0x66, + 0xce, 0x6c, 0x66, 0xcc, 0x6a, 0x60, 0x46, 0x5b, 0x9e, 0x29, 0x99, 0x4d, 0x1d, 0xf2, 0x8c, 0xd9, + 0xcc, 0x7c, 0xdb, 0xda, 0x1c, 0xa1, 0x18, 0xfb, 0x21, 0x17, 0x4e, 0xe8, 0xc2, 0xeb, 0xab, 0xcd, + 0x29, 0xe9, 0xf9, 0x7a, 0xa3, 0x89, 0xec, 0xc2, 0x53, 0x42, 0xf1, 0x0c, 0x87, 0x78, 0x00, 0xf1, + 0x6a, 0x3c, 0xb4, 0xfb, 0x61, 0xf3, 0xc0, 0x02, 0x5a, 0x9c, 0xb6, 0x4b, 0xcf, 0xc8, 0x6d, 0x3c, + 0xeb, 0xaa, 0x13, 0xbd, 0x1d, 0xa9, 0x84, 0x34, 0xff, 0xa7, 0x38, 0x2f, 0x9a, 0x49, 0x58, 0xcc, + 0x62, 0x46, 0x72, 0x44, 0x99, 0x11, 0x73, 0xd0, 0x32, 0x6f, 0x14, 0xb7, 0xda, 0x65, 0x4b, 0xf4, + 0x1e, 0xc2, 0x24, 0x23, 0x5f, 0x03, 0x91, 0x85, 0x8c, 0xe0, 0x03, 0x32, 0x42, 0x69, 0xb4, 0xd4, + 0xb8, 0x1c, 0xc6, 0xc6, 0xde, 0x30, 0xde, 0xc2, 0xd8, 0x03, 0x91, 0x01, 0x4e, 0x29, 0xc0, 0xe5, + 0x6a, 0x80, 0x6b, 0x7a, 0x9f, 0x5d, 0xb0, 0x41, 0x8e, 0xe3, 0x83, 0x1b, 0x3e, 0x04, 0x5d, 0xae, + 0x62, 0x72, 0xd8, 0x4e, 0x67, 0xf4, 0x5b, 0x84, 0x9f, 0xc8, 0x90, 0xdb, 0x3e, 0x17, 0xd5, 0xd2, + 0xdc, 0xc1, 0x47, 0x02, 0x9f, 0x6b, 0xc0, 0x24, 0xd3, 0xad, 0x6a, 0x80, 0xed, 0x7c, 0xa3, 0x5d, + 0xb4, 0x52, 0x40, 0x9c, 0x2a, 0x21, 0x7a, 0xf8, 0x69, 0x5d, 0x0e, 0xc0, 0xfb, 0xeb, 0x3d, 0xbf, + 0x46, 0x64, 0x0d, 0x3c, 0xdd, 0x83, 0x1e, 0xf3, 0x3f, 0x84, 0xae, 0x72, 0x33, 0x6d, 0xeb, 0x39, + 0xfd, 0x11, 0xe1, 0x27, 0x73, 0x4f, 0x22, 0x1e, 0xee, 0xdf, 0xcd, 0x05, 0x7c, 0x2c, 0x06, 0x2e, + 0x9c, 0x58, 0x74, 0xfa, 0xae, 0x0b, 0x9c, 0x6f, 0xf4, 0x83, 0xd4, 0xdf, 0xe8, 0x82, 0x7c, 0x3b, + 0x64, 0x5d, 0x78, 0x4d, 0x9e, 0xb7, 0x03, 0x01, 0xb8, 0x82, 0xc5, 0x69, 0x9e, 0x46, 0x17, 0xe8, + 0x76, 0x7e, 0x35, 0x65, 0x3c, 0x7a, 0x50, 0x0b, 0x73, 0xd4, 0xf1, 0xd4, 0x83, 0x1c, 0xb7, 0x71, + 0x33, 0x73, 0xfc, 0x0e, 0xc4, 0x3d, 0x3f, 0x2c, 0xb4, 0x85, 0x7f, 0xed, 0x9b, 0x7e, 0x51, 0xa8, + 0xbc, 0x8e, 0x60, 0xd1, 0x7f, 0x74, 0x0a, 0xd2, 0xc4, 0x87, 0x7a, 0xc0, 0xb9, 0xe3, 0x41, 0x1a, + 0xe2, 0x6c, 0x4a, 0xdf, 0xc0, 0xc7, 0x35, 0x50, 0x9f, 0x47, 0x10, 0x76, 0xf7, 0x7f, 0xba, 0x1f, + 0x0a, 0xad, 0xa0, 0xcd, 0xbc, 0xfd, 0x1f, 0xae, 0x89, 0x0f, 0x45, 0xac, 0xfb, 0x96, 0xdc, 0x94, + 0x1c, 0x29, 0x9b, 0x92, 0x6b, 0x18, 0x07, 0xcc, 0xcb, 0xee, 0xe0, 0x01, 0x75, 0x07, 0x4f, 0x17, + 0xee, 0xa0, 0x29, 0x9b, 0xbb, 0xbc, 0x71, 0xb7, 0x58, 0xb7, 0xad, 0x5f, 0xb4, 0x0b, 0x9b, 0x64, + 0xc5, 0xeb, 0x5a, 0x5a, 0x85, 0x00, 0x6a, 0xe4, 0x53, 0xf6, 0xd5, 0xae, 0x32, 0x51, 0x6e, 0x5b, + 0x15, 0xfb, 0xea, 0x6a, 0x71, 0xab, 0x5d, 0xb6, 0x44, 0x9b, 0x79, 0x62, 0x32, 0x4a, 0x1e, 0xb1, + 0x90, 0x03, 0xfd, 0x4c, 0x1e, 0xc0, 0x11, 0xee, 0x66, 0xb6, 0xce, 0x1f, 0x5f, 0x03, 0xa3, 0x1f, + 0xe7, 0x29, 0x57, 0x4c, 0x37, 0x07, 0x10, 0xaa, 0x48, 0x8a, 0x61, 0xa4, 0x23, 0x29, 0xc7, 0xe4, + 0x5d, 0x7c, 0x90, 0xad, 0xdf, 0x01, 0x57, 0x3c, 0x9a, 0x8f, 0x64, 0x6a, 0x8c, 0xbe, 0x82, 0xa7, + 0xdb, 0xcc, 0xbb, 0x19, 0x8a, 0x78, 0x28, 0xeb, 0xc6, 0x65, 0xa1, 0x80, 0x50, 0xa4, 0x9e, 0xb3, + 0x69, 0xb1, 0xa2, 0x1a, 0xa5, 0x8a, 0xa2, 0x9f, 0x97, 0x3e, 0x06, 0xa1, 0x78, 0xdc, 0xdf, 0x7c, + 0x7a, 0xbf, 0x50, 0x9f, 0x9d, 0x52, 0xe7, 0x9f, 0x8c, 0x44, 0xf1, 0x4c, 0x0c, 0x9c, 0xf5, 0x63, + 0x17, 0xde, 0xf4, 0xc3, 0x6e, 0x7a, 0xce, 0xd2, 0xb3, 0xe2, 0x3b, 0x85, 0xdb, 0x55, 0x7a, 0x46, + 0x00, 0xcf, 0x26, 0x1f, 0x9c, 0xf2, 0x2d, 0x7b, 0x75, 0x5f, 0xe7, 0xeb, 0x64, 0x96, 0xb8, 0x5d, + 0xb6, 0xba, 0x72, 0xef, 0x18, 0x3e, 0xaa, 0x8f, 0x09, 0xf1, 0xc0, 0x77, 0x81, 0x7c, 0x8d, 0xf0, + 0x5c, 0x22, 0x36, 0xb2, 0x15, 0x72, 0x2a, 0x37, 0x3a, 0x56, 0x9b, 0x19, 0xf5, 0xe2, 0x4e, 0x17, + 0x3f, 0xfd, 0xeb, 0xfe, 0x97, 0x0d, 0x4a, 0x4f, 0x2a, 0x69, 0x38, 0x68, 0x69, 0x2d, 0xc9, 0xad, + 0xbb, 0x3a, 0xb6, 0x3b, 0x57, 0xd0, 0x39, 0xf2, 0x15, 0xc2, 0x47, 0xd6, 0x40, 0x68, 0xb2, 0x13, + 0xa3, 0x64, 0xb9, 0xfe, 0xa9, 0x8b, 0x75, 0x41, 0x61, 0x3d, 0x47, 0x9e, 0x9d, 0x88, 0x95, 0x8c, + 0x77, 0x24, 0xda, 0xac, 0xbc, 0xa1, 0xba, 0x21, 0x90, 0x93, 0xa3, 0x70, 0x05, 0xa5, 0x63, 0x5c, + 0xab, 0x45, 0x27, 0x2d, 0xd1, 0x33, 0x8a, 0xf0, 0x14, 0x99, 0x1c, 0x38, 0xf2, 0x11, 0x9e, 0x2b, + 0xf7, 0xaa, 0x52, 0x46, 0xc7, 0x75, 0x31, 0x63, 0x4c, 0x60, 0xf3, 0xd6, 0x42, 0xcf, 0x2b, 0xbf, + 0x67, 0xc8, 0x33, 0x7b, 0xfd, 0x2e, 0x81, 0x5c, 0x2f, 0x79, 0x5f, 0x46, 0xe4, 0x13, 0x84, 0xe7, + 0x92, 0xfe, 0x39, 0xa9, 0xa4, 0x4a, 0xdf, 0x01, 0x63, 0xe1, 0xc1, 0x2f, 0xa4, 0x2d, 0x38, 0x4d, + 0xcf, 0xb9, 0x6a, 0xe9, 0xf9, 0x09, 0xe1, 0x59, 0xa5, 0xad, 0x34, 0xc2, 0xfc, 0xa8, 0x87, 0xa2, + 0xf8, 0xaa, 0x5b, 0x3d, 0x2f, 0x28, 0x3c, 0xcb, 0x38, 0x57, 0x05, 0xcf, 0x8a, 0xa5, 0x67, 0x59, + 0xe1, 0xbf, 0x22, 0xfc, 0xff, 0x4c, 0x6d, 0x6a, 0xd4, 0xd3, 0xe3, 0x50, 0x4b, 0x8a, 0xb4, 0x2e, + 0xed, 0x65, 0x45, 0xbb, 0x62, 0x2c, 0x55, 0xa4, 0x4d, 0x9c, 0x4b, 0xe0, 0x9f, 0x11, 0x9e, 0x4b, + 0xe4, 0xe0, 0xa4, 0xe4, 0x96, 0x04, 0x63, 0x5d, 0xd8, 0x17, 0x15, 0xec, 0xb2, 0x71, 0xbe, 0x32, + 0x6c, 0x0f, 0x24, 0xea, 0x2f, 0x08, 0x1f, 0x4d, 0x05, 0x96, 0x66, 0x1d, 0x53, 0x67, 0x65, 0x0d, + 0x56, 0x17, 0xf6, 0x25, 0x05, 0xdb, 0x32, 0x2e, 0x54, 0x82, 0xe5, 0x89, 0x6f, 0x49, 0xfb, 0x1b, + 0xc2, 0xc7, 0xb4, 0xdc, 0xd5, 0xbc, 0x74, 0x94, 0x77, 0xaf, 0x26, 0xae, 0x4b, 0xfc, 0xb2, 0x22, + 0xbe, 0x68, 0x98, 0x95, 0x88, 0x45, 0xe6, 0x5d, 0x32, 0x7f, 0x8f, 0xf0, 0x8c, 0xd4, 0xd4, 0x1a, + 0x77, 0x4c, 0x0f, 0x2c, 0x68, 0xee, 0xba, 0xa4, 0x97, 0x14, 0xa9, 0x69, 0x9c, 0xad, 0x16, 0x5b, + 0xc1, 0x22, 0x09, 0xf9, 0x0d, 0xc2, 0x33, 0x52, 0x65, 0x4c, 0x82, 0x2c, 0xa8, 0x90, 0xba, 0x90, + 0x4b, 0x0a, 0xf2, 0x79, 0x4a, 0x27, 0x43, 0x06, 0x7e, 0xa8, 0xee, 0xd3, 0x10, 0x1f, 0x4a, 0x74, + 0x33, 0x1f, 0xf7, 0x75, 0xcb, 0x25, 0xbd, 0x41, 0xf2, 0xd5, 0x4c, 0x7c, 0xd1, 0x2b, 0xca, 0xd7, + 0x25, 0xb2, 0x52, 0x29, 0x20, 0x77, 0x53, 0xfd, 0xb5, 0x63, 0x05, 0xcc, 0x5b, 0x46, 0xe4, 0x3b, + 0x84, 0xe7, 0x3a, 0xe5, 0xce, 0x73, 0x6a, 0xdc, 0xf5, 0x78, 0x84, 0x7d, 0xc7, 0x52, 0xc0, 0x67, + 0xe9, 0x43, 0x9a, 0xb8, 0x6e, 0x37, 0xd7, 0xaf, 0xfe, 0xb1, 0x3b, 0x8f, 0xfe, 0xdc, 0x9d, 0x47, + 0x7f, 0xef, 0xce, 0xa3, 0xf7, 0xad, 0x87, 0xfd, 0x97, 0xda, 0xf3, 0x93, 0x6d, 0xfd, 0xa0, 0xfa, + 0xcd, 0x74, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xa5, 0x06, 0x11, 0x85, 0x13, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1956,6 +1966,13 @@ func (m *WorkflowListRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if len(m.Fields) > 0 { + i -= len(m.Fields) + copy(dAtA[i:], m.Fields) + i = encodeVarintWorkflow(dAtA, i, uint64(len(m.Fields))) + i-- + dAtA[i] = 0x1a + } if m.ListOptions != nil { { size, err := m.ListOptions.MarshalToSizedBuffer(dAtA[:i]) @@ -2735,6 +2752,10 @@ func (m *WorkflowListRequest) Size() (n int) { l = m.ListOptions.Size() n += 1 + l + sovWorkflow(uint64(l)) } + l = len(m.Fields) + if l > 0 { + n += 1 + l + sovWorkflow(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3554,6 +3575,38 @@ func (m *WorkflowListRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWorkflow + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthWorkflow + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthWorkflow + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Fields = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipWorkflow(dAtA[iNdEx:]) diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json index e7ae1f756cea..7772b7003bc6 100644 --- a/pkg/apiclient/workflow/workflow.swagger.json +++ b/pkg/apiclient/workflow/workflow.swagger.json @@ -182,6 +182,13 @@ "in": "query", "required": false, "type": "string" + }, + { + "name": "fields", + "description": "Fields to be included or excluded in the response. e.g. \"items.spec,items.status.phase\", \"-items.status.nodes\".", + "in": "query", + "required": false, + "type": "string" } ], "tags": [