From f409d9c6dd979bdeeee8a938c2de4841a37d8d49 Mon Sep 17 00:00:00 2001 From: Zelin Hao Date: Wed, 8 Jun 2022 17:08:31 -0700 Subject: [PATCH 1/2] Incremented version to 2.0.1 Signed-off-by: Zelin Hao --- build.gradle | 2 +- bwc-test/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8b34e7d597..586c0b643a 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ repositories { ext { isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.0.1-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 42be2c9478..5bf877bd3a 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -47,7 +47,7 @@ ext { buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.0.1-SNAPSHOT") opensearch_group = "org.opensearch" } repositories { @@ -76,13 +76,13 @@ dependencies { String bwcVersion = "1.3.0.0"; String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" -String projectVersion = "2.0.0.0" +String projectVersion = "2.0.1.0" 2.times {i -> testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["1.3.0","2.0.0"] + versions = ["1.3.0","2.0.1"] numberOfNodes = 3 plugin(provider(new Callable() { @Override From ae036fcddccaa6e7fc355c2f2e7b7832dd3f7014 Mon Sep 17 00:00:00 2001 From: cliu123 Date: Fri, 10 Jun 2022 10:58:34 -0700 Subject: [PATCH 2/2] Fix RolesMappingApiTest.testRolesMappingApi Signed-off-by: cliu123 --- .../security/dlic/rest/api/AbstractRestApiUnitTest.java | 4 ++-- .../security/dlic/rest/api/RolesMappingApiTest.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/opensearch/security/dlic/rest/api/AbstractRestApiUnitTest.java b/src/test/java/org/opensearch/security/dlic/rest/api/AbstractRestApiUnitTest.java index b4fa099bef..d674620c82 100644 --- a/src/test/java/org/opensearch/security/dlic/rest/api/AbstractRestApiUnitTest.java +++ b/src/test/java/org/opensearch/security/dlic/rest/api/AbstractRestApiUnitTest.java @@ -213,12 +213,12 @@ protected String checkReadAccess(int status, String username, String password, S } - protected String checkWriteAccess(int status, String username, String password, String indexName, String type, + protected String checkWriteAccess(int status, String username, String password, String indexName, String actionType, int id) throws Exception { boolean sendAdminCertificate = rh.sendAdminCertificate; rh.sendAdminCertificate = false; - String action = indexName + "/" + type + "/" + id; + String action = indexName + "/" + actionType + "/" + id; String payload = "{\"value\" : \"true\"}"; HttpResponse response = rh.executePutRequest(action, payload, encodeBasicHeader(username, password)); diff --git a/src/test/java/org/opensearch/security/dlic/rest/api/RolesMappingApiTest.java b/src/test/java/org/opensearch/security/dlic/rest/api/RolesMappingApiTest.java index 509b6e5e4f..7bb547c3f9 100644 --- a/src/test/java/org/opensearch/security/dlic/rest/api/RolesMappingApiTest.java +++ b/src/test/java/org/opensearch/security/dlic/rest/api/RolesMappingApiTest.java @@ -341,8 +341,6 @@ private void checkAllSfAllowed() throws Exception { rh.sendAdminCertificate = false; checkReadAccess(HttpStatus.SC_OK, "picard", "picard", "sf", "_doc", 1); checkWriteAccess(HttpStatus.SC_OK, "picard", "picard", "sf", "_doc", 1); - // ES7 only supports one doc type, so trying to create a second one leads to 400 BAD REQUEST - checkWriteAccess(HttpStatus.SC_BAD_REQUEST, "picard", "picard", "sf", "public", 1); } private void checkAllSfForbidden() throws Exception {