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

Adjusted integ tests for when security is enabled. #1528

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Adjusted integ tests for when security is enabled. #1528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
755f61f
Adjusted integ tests for when security is enabled.
AWSHurneyt Apr 30, 2024
e9d89de
Adjusted integ tests for when security is enabled.
AWSHurneyt Apr 30, 2024
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
11 changes: 8 additions & 3 deletions alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() {

assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD])
val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map<String, Map<String, Any>>
assertEquals(expectedNames.size, indexes.keys.size)

// Skipping this assert when security is enabled as it doesn't consider the existence of system indexes.
if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice find. We could try to compute the correct value when security is enabled rather than skipping this assert but that could end up being a moving target if new system indices are added down the line


// Validate index-level response details
expectedNames.forEach { indexName ->
Expand Down Expand Up @@ -149,7 +151,9 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() {

assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD])
val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map<String, Map<String, Any>>
assertEquals(expectedNames.size, indexes.keys.size)

// Skipping this assert when security is enabled as it doesn't consider the existence of system indexes.
if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size)

// Validate index-level response details
expectedNames.forEach { indexName ->
Expand Down Expand Up @@ -197,7 +201,8 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() {

assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD])
val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map<String, Map<String, Any>>
assertEquals(expectedNames.size, indexes.keys.size)
// Skipping this assert when security is enabled as it doesn't consider the existence of system indexes.
if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size)

// Validate index-level response details
expectedNames.forEach { indexName ->
Expand Down
Loading