Skip to content

Do not require id & description when creating a logstash pipeline #76616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 4, 2020
Merged

Do not require id & description when creating a logstash pipeline #76616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38a7455
do not requie id & desc
mshustov Sep 3, 2020
9d61ffc
Merge branch 'master' into issue-76611-fix-logstash-validation
mshustov Sep 3, 2020
b9cb7d0
remove id validation, it's not used in logic anyway
mshustov Sep 3, 2020
19eb065
Merge branch 'master' into issue-76611-fix-logstash-validation
mshustov Sep 4, 2020
3e598fb
no id in tests
mshustov Sep 4, 2020
0c7182b
remove another wrong id usage
mshustov Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x-pack/plugins/logstash/public/application/components/pipeline_editor/pipeline_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ class PipelineEditorUi extends React.Component {

onPipelineSave = () => {
const { pipelineService, toastNotifications, intl } = this.props;
const { id } = this.state.pipeline;
const { id, ...pipelineToStore } = this.state.pipeline;
Copy link
Contributor Author

@mshustov mshustov Sep 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id is not expected in the request body

return pipelineService
.savePipeline({
id,
upstreamJSON: this.state.pipeline,
upstreamJSON: pipelineToStore,
})
.then(() => {
toastNotifications.addSuccess(
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/logstash/server/models/pipeline/pipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import { i18n } from '@kbn/i18n';

interface PipelineOptions {
id: string;
description: string;
description?: string;
pipeline: string;
username?: string;
settings?: Record<string, any>;
}

interface DownstreamPipeline {
description: string;
description?: string;
pipeline: string;
settings?: Record<string, any>;
}
Expand All @@ -27,7 +27,7 @@ interface DownstreamPipeline {
*/
export class Pipeline {
public readonly id: string;
public readonly description: string;
public readonly description?: string;
public readonly username?: string;
public readonly pipeline: string;
private readonly settings: Record<string, any>;
Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/logstash/server/routes/pipeline/save.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ export function registerPipelineSaveRoute(router: IRouter, security?: SecurityPl
id: schema.string(),
}),
body: schema.object({
id: schema.string(),
description: schema.string(),
description: schema.maybe(schema.string()),
pipeline: schema.string(),
settings: schema.maybe(schema.object({}, { unknowns: 'allow' })),
}),
Expand Down
1 change: 0 additions & 1 deletion x-pack/test/api_integration/apis/logstash/pipeline/delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default function ({ getService }: FtrProviderContext) {
.put('/api/logstash/pipeline/fast_generator')
.set('kbn-xsrf', 'xxx')
.send({
id: 'fast_generator',
description: 'foobar baz',
pipeline: 'input { generator {} }\n\n output { stdout {} }',
})
Expand Down
1 change: 0 additions & 1 deletion x-pack/test/api_integration/apis/logstash/pipeline/save.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export default function ({ getService }: FtrProviderContext) {
.put('/api/logstash/pipeline/fast_generator')
.set('kbn-xsrf', 'xxx')
.send({
id: 'fast_generator',
description: 'foobar baz',
pipeline: 'input { generator {} }\n\n output { stdout {} }',
})
Expand Down