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.

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

Automatically add scheme to discovery.ec2.endpoint #11512

Merged
merged 8 commits into from
Dec 12, 2023

Conversation

heyanlong
Copy link
Contributor

@heyanlong heyanlong commented Dec 7, 2023

Description

Fix the problem that discovery.ec2.endpoint forgets to fill in the scheme
https://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region

Example

discovery.ec2.endpoint: ec2.us-east-1.amazonaws.com

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@heyanlong heyanlong marked this pull request as ready for review December 7, 2023 12:18
@heyanlong heyanlong changed the title Fix forgets to fill in the scheme Fix forgets to fill in the scheme for discovery.ec2.endpoint Dec 7, 2023
Copy link
Contributor

github-actions bot commented Dec 7, 2023

Compatibility status:

Checks if related components are compatible with change 15f4d5c

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/sql.git]

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Copy link
Contributor

github-actions bot commented Dec 8, 2023

❌ Gradle check result for 12ba28d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Copy link
Contributor

github-actions bot commented Dec 8, 2023

❌ Gradle check result for 8af6efc: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Copy link
Contributor

github-actions bot commented Dec 8, 2023

❕ Gradle check result for bbbb93f: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT.test {yaml=pit/10_basic/Delete all}
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@peternied peternied changed the title Fix forgets to fill in the scheme for discovery.ec2.endpoint Fix scheme for discovery.ec2.endpoint Dec 8, 2023
@peternied peternied changed the title Fix scheme for discovery.ec2.endpoint Automatically add scheme to discovery.ec2.endpoint Dec 8, 2023
@peternied peternied self-assigned this Dec 8, 2023
Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Copy link
Contributor

✅ Gradle check result for 401de0b: SUCCESS

Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
Copy link
Contributor

✅ Gradle check result for 15f4d5c: SUCCESS

@peternied peternied merged commit a8da66c into opensearch-project:main Dec 12, 2023
30 of 31 checks passed
@peternied peternied added the backport 2.x Backport to 2.x branch label Dec 12, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11512-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8da66caa173c27f98c2124e012d372c64183d6d
# Push it to GitHub
git push --set-upstream origin backport/backport-11512-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-11512-to-2.x.

@peternied
Copy link
Member

@heyanlong could you please manually backport this change for the 2.x release following the guide above?

heyanlong added a commit to heyanlong/OpenSearch that referenced this pull request Dec 13, 2023
…t#11512)

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
(cherry picked from commit a8da66c)
heyanlong added a commit to heyanlong/OpenSearch that referenced this pull request Dec 13, 2023
…t#11512)

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
(cherry picked from commit a8da66c)
peternied pushed a commit that referenced this pull request Dec 13, 2023
…1512) (#11603)

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
(cherry picked from commit a8da66c)
@dblock
Copy link
Member

dblock commented Dec 13, 2023

@heyanlong This won't work if my endpoint is httpserver.example.com. You need to explicitly check for http:// and https://. Please fix, and add tests? #11609

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…t#11512)

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…t#11512)

Signed-off-by: Yanlong He <hey.yanlong@gmail.com>
Signed-off-by: 何延龙 <hey.yanlong@gmail.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants