Skip to content

[httpjson] Remove conditional rendering based on oauth_id of auth options #3518

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
marc-gr merged 3 commits into from
Jun 20, 2022
Merged

[httpjson] Remove conditional rendering based on oauth_id of auth options #3518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78d88ac
Remove conditional rendering based on oauth_id of auth options
marc-gr Jun 16, 2022
4b561e4
Add PR to changelog
marc-gr Jun 16, 2022
a1e8abc
Only render oauth if basic auth is not set
marc-gr Jun 16, 2022
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
5 changes: 5 additions & 0 deletions packages/httpjson/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.2.3"
changes:
- description: Fixes oauth2 config rendering
type: bugfix
link: https://github.com/elastic/integrations/pull/3518
- version: "1.2.2"
changes:
- description: Fixes rendering issue for custom oauth2 scopes
Expand Down
11 changes: 7 additions & 4 deletions packages/httpjson/data_stream/generic/agent/stream/httpjson.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ config_version: 2
data_stream:
dataset: {{data_stream.dataset}}
interval: {{request_interval}}
{{#unless oauth_id}}

{{#if username}}
auth.basic.user: {{username}}
{{/if}}
{{#if password}}
auth.basic.password: {{password}}
{{/if}}
{{/unless}}

{{#if pipeline}}
pipeline: {{pipeline}}
{{/if}}
{{#if oauth_id}}

{{#unless username}}
{{#unless password}}
{{#if oauth_id}}
auth.oauth2.client.id: {{oauth_id}}
{{/if}}
Expand Down Expand Up @@ -54,7 +56,8 @@ auth.oauth2.azure.resource: {{oauth_azure_resource}}
auth.oauth2.endpoint_params:
{{oauth_endpoint_params}}
{{/if}}
{{/if}}
{{/unless}}
{{/unless}}

request.url: {{request_url}}
request.method: {{request_method}}
Expand Down
2 changes: 1 addition & 1 deletion packages/httpjson/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: httpjson
title: Custom HTTPJSON Input
description: Collect custom data from REST API's with Elastic Agent.
type: integration
version: 1.2.2
version: 1.2.3
release: ga
conditions:
kibana.version: "^7.16.0 || ^8.0.0"
Expand Down