[Backport 2.x] Add CI for Windows and MacOS platforms (#2190) #2205
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -366,7 +366,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
|
|
||
| // Significant Text Aggregation is not impacted. | ||
| // Non-admin user with setting "min_doc_count=0". Expected to only have access to buckets for dept_manager". | ||
| String query3 = "{\"size\":100,\"aggregations\":{\"significant_termX\":{\"significant_terms\":{\"field\":\"termX.keyword\",\"min_doc_count\":0}}}}"; | ||
|
There was a problem hiding this comment. What was the reason for swapping to a hard coded implementation? There was a problem hiding this comment.
Originally posted by @peternied in #2190 (comment) |
||
| HttpResponse response5 = rh.executePostRequest("logs*/_search", query3, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
| Assert.assertEquals(HttpStatus.SC_OK, response5.getStatusCode()); | ||
|
|
@@ -377,7 +377,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
| Assert.assertFalse(response5.getBody(), response5.getBody().contains("\"termX\":\"E\"")); | ||
|
|
||
| // Non-admin user without setting "min_doc_count". Expected to only have access to buckets for dept_manager". | ||
| String query4 = "{\"size\":100,\"aggregations\":{\"significant_termX\":{\"significant_terms\":{\"field\":\"termX.keyword\"}}}}"; | ||
|
|
||
| HttpResponse response6 = rh.executePostRequest("logs*/_search", query4, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
|
|
@@ -410,7 +410,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
|
|
||
| // Histogram Aggregation is not impacted. | ||
| // Non-admin user with setting "min_doc_count=0". Expected to only have access to buckets for dept_manager". | ||
| String query5 = "{\"size\":100,\"aggs\":{\"amount\":{\"histogram\":{\"field\":\"amount\",\"interval\":1,\"min_doc_count\":0}}}}"; | ||
|
|
||
| HttpResponse response9 = rh.executePostRequest("logs*/_search", query5, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
|
|
@@ -422,7 +422,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
| Assert.assertFalse(response9.getBody(), response9.getBody().contains("\"termX\":\"E\"")); | ||
|
|
||
| // Non-admin user without setting "min_doc_count". Expected to only have access to buckets for dept_manager". | ||
| String query6 = "{\"size\":100,\"aggs\":{\"amount\":{\"histogram\":{\"field\":\"amount\",\"interval\":1}}}}"; | ||
|
|
||
| HttpResponse response10 = rh.executePostRequest("logs*/_search", query6, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
|
|
@@ -456,7 +456,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
|
|
||
| // Date Histogram Aggregation is not impacted. | ||
| // Non-admin user with setting "min_doc_count=0". Expected to only have access to buckets for dept_manager". | ||
| String query7 = "{\"size\":100,\"aggs\":{\"timestamp\":{\"date_histogram\":{\"field\":\"timestamp\",\"calendar_interval\":\"month\",\"min_doc_count\":0}}}}"; | ||
|
|
||
| HttpResponse response13 = rh.executePostRequest("logs*/_search", query7, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
|
|
@@ -468,7 +468,7 @@ public void testDlsWithMinDocCountZeroAggregations() throws Exception { | |
| Assert.assertFalse(response13.getBody(), response13.getBody().contains("\"termX\":\"E\"")); | ||
|
|
||
| // Non-admin user without setting "min_doc_count". Expected to only have access to buckets for dept_manager". | ||
| String query8 = "{\"size\":100,\"aggs\":{\"timestamp\":{\"date_histogram\":{\"field\":\"timestamp\",\"calendar_interval\":\"month\"}}}}"; | ||
|
|
||
| HttpResponse response14 = rh.executePostRequest("logs*/_search", query8, encodeBasicHeader("dept_manager", "password")); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
| package org.opensearch.security.support; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.function.Predicate; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.opensearch.security.support.SecurityUtils.ENVBASE64_PATTERN; | ||
| import static org.opensearch.security.support.SecurityUtils.ENVBC_PATTERN; | ||
| import static org.opensearch.security.support.SecurityUtils.ENV_PATTERN; | ||
|
|
||
| public class SecurityUtilsTest { | ||
|
|
||
| private final Collection<String> interestingEnvKeyNames = List.of( | ||
| "=ExitCode", | ||
| "=C:", | ||
| "ProgramFiles(x86)", | ||
| "INPUT_GRADLE-HOME-CACHE-CLEANUP", | ||
| "MYENV", | ||
| "MYENV:", | ||
| "MYENV::" | ||
| ); | ||
| private final Collection<String> namesFromThisRuntimeEnvironment = System.getenv().keySet(); | ||
|
|
||
| @Test | ||
| public void checkInterestingNamesForEnvPattern() { | ||
| checkKeysWithPredicate(interestingEnvKeyNames, "env", ENV_PATTERN.asMatchPredicate()); | ||
| } | ||
|
|
||
| @Test | ||
| public void checkRuntimeKeyNamesForEnvPattern() { | ||
| checkKeysWithPredicate(namesFromThisRuntimeEnvironment, "env", ENV_PATTERN.asMatchPredicate()); | ||
| } | ||
|
|
||
| @Test | ||
| public void checkInterestingNamesForEnvbcPattern() { | ||
| checkKeysWithPredicate(interestingEnvKeyNames, "envbc", ENVBC_PATTERN.asMatchPredicate()); | ||
| } | ||
|
|
||
| @Test | ||
| public void checkInterestingNamesForEnvBase64Pattern() { | ||
| checkKeysWithPredicate(interestingEnvKeyNames, "envbase64", ENVBASE64_PATTERN.asMatchPredicate()); | ||
| } | ||
|
|
||
| private void checkKeysWithPredicate(Collection<String> keys, String predicateName, Predicate<String> predicate) { | ||
| keys.forEach(envKeyName -> { | ||
| final String prefixWithKeyName = "${" + predicateName + "." + envKeyName; | ||
|
|
||
| final String baseKeyName = prefixWithKeyName + "}"; | ||
| assertThat("Testing " + envKeyName + ", " + baseKeyName, | ||
| predicate.test(baseKeyName), | ||
| equalTo(true)); | ||
|
|
||
| final String baseKeyNameWithDefault = prefixWithKeyName + ":-tTt}"; | ||
| assertThat("Testing " + envKeyName + " with defaultValue, " + baseKeyNameWithDefault, | ||
| predicate.test(baseKeyNameWithDefault), | ||
| equalTo(true)); | ||
| }); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we not want to fail-fast anymore? I believe this will now let the whole matrix operate even if one of the builds fails for a specific OS.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fast failing helps free resources faster, but you build less confidence per build iteration. By forcing all builds to keep running we are sure that all integration test runs are completed and you can compare different results between different platforms. If we were optimizing for cost we might stick to the fast failures
With the platform differences, bugs can be introduced into two platforms at once impacting different tests, IMO its more useful for troubleshooting to be able to see if only one workflow was impacted (indicating a random failure) vs many workflows (indicating a new bug was caught).