Skip to content
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

Jump to bottom

x-pack/filebeat/input/awss3: fix priority of region name configurations #36034

Merged
merged 2 commits into from
Jul 18, 2023
Merged

x-pack/filebeat/input/awss3: fix priority of region name configurations #36034

merged 2 commits into from
Jul 18, 2023

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Jul 11, 2023 •
edited
Loading

What does this PR do?

The code currently prioritises the region configuration, even when it is not provided, against the claims of the documentation. Make a check whether it is empty before claiming a conflict and using it.

Why is it important?

The behaviour disagrees with the documentation.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@efd6 efd6 self-assigned this Jul 11, 2023
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 11, 2023
@mergify

This comment was marked as outdated.

Sign in to view
@efd6 efd6 marked this pull request as ready for review July 11, 2023 08:53
@efd6 efd6 requested a review from a team as a code owner July 11, 2023 08:53
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 11, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-07-16T22:12:08.834+0000

  • Duration: 134 min 7 sec

Test stats 🧪

Test Results
Failed 0
Passed 6106
Skipped 362
Total 6468

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify

This comment was marked as outdated.

Sign in to view
@efd6
x-pack/filebeat/input/awss3: fix priority of region name configurations
468122d 
The code currently prioritises the region_name configuration, even when
it is not provided, against the claims of the documentation. Make a
check whether it is empty before claiming a conflict and using it.
zmoog
zmoog approved these changes Jul 18, 2023
View reviewed changes
Copy link
Contributor

@zmoog zmoog left a comment

Choose a reason for hiding this comment

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

LGTM

@efd6 efd6 merged commit 57d649d into elastic:main Jul 18, 2023
8 checks passed
mergify bot pushed a commit that referenced this pull request Jul 18, 2023
@efd6 @mergify
x-pack/filebeat/input/awss3: fix priority of region name configuratio…
7ab15ba 
…ns (#36034)

The code currently prioritises the region_name configuration, even when
it is not provided, against the claims of the documentation. Make a
check whether it is empty before claiming a conflict and using it.

(cherry picked from commit 57d649d)
@mergify mergify bot mentioned this pull request Jul 18, 2023
Merged
efd6 added a commit that referenced this pull request Jul 18, 2023
@mergify @efd6 @bhapas
x-pack/filebeat/input/awss3: fix priority of region name configuratio…
dd50d49 
…ns (#36034) (#36096)

The code currently prioritises the region_name configuration, even when
it is not provided, against the claims of the documentation. Make a
check whether it is empty before claiming a conflict and using it.

(cherry picked from commit 57d649d)

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
Co-authored-by: Bharat Pasupula <123897612+bhapas@users.noreply.github.com>
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
@efd6 @Scholar-Li
x-pack/filebeat/input/awss3: fix priority of region name configuratio…
bc49c24 
…ns (elastic#36034)

The code currently prioritises the region_name configuration, even when
it is not provided, against the claims of the documentation. Make a
check whether it is empty before claiming a conflict and using it.
@strawgate strawgate mentioned this pull request May 24, 2024
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zmoog zmoog zmoog approved these changes

Assignees

@efd6 efd6

Labels
8.10-candidate backport-v8.9.0 Automated backport with mergify bug Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@efd6 @elasticmachine @zmoog