Skip to content

Commit 4ccec7c

Browse files
Explicitly adds enabled setting in integtests
Signed-off-by: Darshit Chanpura <[email protected]>
1 parent f9ce77a commit 4ccec7c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

sample-resource-plugin/src/integrationTest/java/org/opensearch/sample/SampleResourcePluginLimitedPermissionsTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static org.hamcrest.Matchers.equalTo;
2929
import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
3030
import static org.opensearch.security.common.resources.ResourceSharingConstants.OPENSEARCH_RESOURCE_SHARING_INDEX;
31+
import static org.opensearch.security.support.ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED;
3132
import static org.opensearch.security.support.ConfigConstants.SECURITY_SYSTEM_INDICES_ENABLED_KEY;
3233
import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
3334
import static org.opensearch.test.framework.TestSecurityConfig.User.USER_ADMIN;
@@ -43,7 +44,7 @@ public class SampleResourcePluginLimitedPermissionsTests extends AbstractSampleR
4344
.anonymousAuth(true)
4445
.authc(AUTHC_HTTPBASIC_INTERNAL)
4546
.users(USER_ADMIN, SHARED_WITH_USER_LIMITED_PERMISSIONS)
46-
.nodeSettings(Map.of(SECURITY_SYSTEM_INDICES_ENABLED_KEY, true))
47+
.nodeSettings(Map.of(SECURITY_SYSTEM_INDICES_ENABLED_KEY, true, OPENSEARCH_RESOURCE_SHARING_ENABLED, true))
4748
.build();
4849

4950
@Override

sample-resource-plugin/src/integrationTest/java/org/opensearch/sample/SampleResourcePluginSystemIndexDisabledTests.java

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
package org.opensearch.sample;
1010

11+
import java.util.Map;
12+
1113
import org.apache.http.HttpStatus;
1214
import org.junit.ClassRule;
1315
import org.junit.Test;
@@ -26,6 +28,7 @@
2628
import static org.hamcrest.Matchers.equalTo;
2729
import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
2830
import static org.opensearch.security.common.resources.ResourceSharingConstants.OPENSEARCH_RESOURCE_SHARING_INDEX;
31+
import static org.opensearch.security.support.ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED;
2932
import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
3033
import static org.opensearch.test.framework.TestSecurityConfig.User.USER_ADMIN;
3134

@@ -40,6 +43,7 @@ public class SampleResourcePluginSystemIndexDisabledTests extends AbstractSample
4043
.anonymousAuth(true)
4144
.authc(AUTHC_HTTPBASIC_INTERNAL)
4245
.users(USER_ADMIN, SHARED_WITH_USER)
46+
.nodeSettings(Map.of(OPENSEARCH_RESOURCE_SHARING_ENABLED, true))
4347
.build();
4448

4549
@Override

sample-resource-plugin/src/integrationTest/java/org/opensearch/sample/SampleResourcePluginTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static org.hamcrest.Matchers.equalTo;
2929
import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
3030
import static org.opensearch.security.common.resources.ResourceSharingConstants.OPENSEARCH_RESOURCE_SHARING_INDEX;
31+
import static org.opensearch.security.support.ConfigConstants.OPENSEARCH_RESOURCE_SHARING_ENABLED;
3132
import static org.opensearch.security.support.ConfigConstants.SECURITY_SYSTEM_INDICES_ENABLED_KEY;
3233
import static org.opensearch.test.framework.TestSecurityConfig.AuthcDomain.AUTHC_HTTPBASIC_INTERNAL;
3334
import static org.opensearch.test.framework.TestSecurityConfig.User.USER_ADMIN;
@@ -43,7 +44,7 @@ public class SampleResourcePluginTests extends AbstractSampleResourcePluginFeatu
4344
.anonymousAuth(true)
4445
.authc(AUTHC_HTTPBASIC_INTERNAL)
4546
.users(USER_ADMIN, SHARED_WITH_USER)
46-
.nodeSettings(Map.of(SECURITY_SYSTEM_INDICES_ENABLED_KEY, true))
47+
.nodeSettings(Map.of(SECURITY_SYSTEM_INDICES_ENABLED_KEY, true, OPENSEARCH_RESOURCE_SHARING_ENABLED, true))
4748
.build();
4849

4950
@Override

0 commit comments

Comments
 (0)