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

adding hostname support for notifications deny list #858

Merged
merged 2 commits into from
Feb 15, 2024

Conversation

toepkerd
Copy link
Contributor

@toepkerd toepkerd commented Feb 13, 2024

Description

Adds support for checking hostnames in a customer's deny list, in addition to the existing functionality of checking IP addresses.

Issues Resolved

Check List

  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
@toepkerd
Copy link
Contributor Author

In regards to the failing CIs, when built locally, the repo with my changes stashed away failed on the same BWC task for the same reasons:

:notifications:notificationsBwcCluster#mixedClusterTask
Caused by: org.opensearch.gradle.testclusters.TestClustersException: `cluster{:notifications:notificationsBwcCluster0}` failed to wait for cluster health yellow after 40 SECONDS
  IO error while waiting cluster
  503 Service Unavailable

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
}
}

@Test
fun `test url in denylist`() {
val urls = listOf("https://www.amazon.com", "https://mytest.com", "https://mytest.com")
fun `test hosts not in denylist`() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we add a test case which demonstrates the additional checks hostname.equals is doing other than normal string.equals?

@sbcd90 sbcd90 merged commit 39bd3bf into opensearch-project:main Feb 15, 2024
17 of 20 checks passed
@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/notifications/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/notifications/backport-2.x
# Create a new branch
git switch --create backport/backport-858-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 39bd3bf824573ad730345f0f2cc9a3cda5be32a4
# Push it to GitHub
git push --set-upstream origin backport/backport-858-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/notifications/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

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

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/notifications/backport-2.12 2.12
# Navigate to the new working tree
pushd ../.worktrees/notifications/backport-2.12
# Create a new branch
git switch --create backport/backport-858-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 39bd3bf824573ad730345f0f2cc9a3cda5be32a4
# Push it to GitHub
git push --set-upstream origin backport/backport-858-to-2.12
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/notifications/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-858-to-2.12.

toepkerd added a commit to toepkerd/notifications that referenced this pull request Feb 15, 2024
…ct#858)

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit 39bd3bf)
toepkerd added a commit to toepkerd/notifications that referenced this pull request Feb 15, 2024
…ct#858)

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit 39bd3bf)
amsiglan pushed a commit that referenced this pull request Feb 15, 2024
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit 39bd3bf)
amsiglan pushed a commit that referenced this pull request Feb 15, 2024
Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit 39bd3bf)
riysaxen-amzn pushed a commit to riysaxen-amzn/notifications that referenced this pull request Apr 30, 2024
…ct#858)

Signed-off-by: Dennis Toepker <toepkerd@amazon.com>
(cherry picked from commit 39bd3bf)
riysaxen-amzn pushed a commit to riysaxen-amzn/notifications that referenced this pull request Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants