Skip to content

[8.4](backport #32921) Refactor endpoint resolver for AWS services#33014

Merged
paolafrancesca merged 2 commits into8.4from
mergify/bp/8.4/pr-32921
Sep 8, 2022
Merged

[8.4](backport #32921) Refactor endpoint resolver for AWS services#33014
paolafrancesca merged 2 commits into8.4from
mergify/bp/8.4/pr-32921

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 8, 2022

This is an automatic backport of pull request #32921 done by Mergify.
Cherry-pick of d0bc413 has failed:

On branch mergify/bp/8.4/pr-32921
Your branch is up to date with 'origin/8.4'.

You are currently cherry-picking commit d0bc413a50.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
	modified:   x-pack/filebeat/input/awscloudwatch/input.go
	modified:   x-pack/filebeat/input/awss3/input.go
	modified:   x-pack/filebeat/input/awss3/input_integration_test.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/elb/provider.go
	modified:   x-pack/libbeat/docs/aws-credentials-config.asciidoc
	modified:   x-pack/metricbeat/module/aws/aws.go
	modified:   x-pack/metricbeat/module/aws/billing/billing.go
	modified:   x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go
	modified:   x-pack/metricbeat/module/aws/cloudwatch/metadata.go
	modified:   x-pack/metricbeat/module/aws/cloudwatch/metadata/ec2/ec2.go
	modified:   x-pack/metricbeat/module/aws/cloudwatch/metadata/rds/rds.go
	modified:   x-pack/metricbeat/module/aws/cloudwatch/metadata/sqs/sqs.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/libbeat/common/aws/credentials.go
	both modified:   x-pack/libbeat/common/aws/credentials_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Add signing region

* Add changelog entry

* remove awscommon.EnrichAWSConfigWithEndpoint

* add nonAWSBucketResolver when recreating the s3 client for new region

* remove unused functions

* changelog

* fix changelog

* fix docs

Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>
(cherry picked from commit d0bc413)

# Conflicts:
#	x-pack/libbeat/common/aws/credentials.go
#	x-pack/libbeat/common/aws/credentials_test.go
@mergify mergify bot requested review from a team as code owners September 8, 2022 03:11
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 8, 2022
@mergify mergify bot requested review from fearful-symmetry and rdner and removed request for a team September 8, 2022 03:11
@mergify mergify bot assigned sayden Sep 8, 2022
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label labels Sep 8, 2022
@paolafrancesca paolafrancesca added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Sep 8, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2022
@paolafrancesca paolafrancesca added needs_team Indicates that the issue/PR needs a Team:* label and removed conflicts There is a conflict in the backported pull request labels Sep 8, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2022
@paolafrancesca
Copy link

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 8, 2022

refresh

✅ Pull request refreshed

@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 8, 2022

💚 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: 2022-09-08T03:31:10.038+0000

  • Duration: 133 min 55 sec

Test stats 🧪

Test Results
Failed 0
Passed 8598
Skipped 503
Total 9101

💚 Flaky test report

Tests succeeded.

🤖 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!)

@paolafrancesca paolafrancesca merged commit 4d8b390 into 8.4 Sep 8, 2022
@paolafrancesca paolafrancesca deleted the mergify/bp/8.4/pr-32921 branch September 8, 2022 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants