Skip to content

Commit 71a3ccc

Browse files
committed
limited security test workflows to run only security tests; moved security tests into security package
Signed-off-by: Petar Dzepina <[email protected]>
1 parent 7a5bc2d commit 71a3ccc

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

.github/workflows/docker-security-test-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
if [ $security -gt 0 ]
7474
then
7575
echo "Security plugin is available"
76-
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin -Dtests.class='*SecurityBehaviorIT'
76+
./gradlew integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin
7777
else
7878
echo "Security plugin is NOT available skipping this run as tests without security have already been run"
7979
fi

src/test/kotlin/org/opensearch/indexmanagement/security/ExplainSecurityBehaviorIT.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,23 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.indexmanagement.security
6+
package org.opensearch.indexmanagement
77

88
import org.junit.After
99
import org.junit.Before
1010
import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest
1111
import org.opensearch.client.ResponseException
1212
import org.opensearch.client.RestClient
1313
import org.opensearch.commons.rest.SecureRestClientBuilder
14+
import org.opensearch.indexmanagement.BULK_WRITE_INDEX
15+
import org.opensearch.indexmanagement.CREATE_INDEX
16+
import org.opensearch.indexmanagement.GET_INDEX_MAPPING
17+
import org.opensearch.indexmanagement.IndexManagementPlugin
18+
import org.opensearch.indexmanagement.MANAGED_INDEX
19+
import org.opensearch.indexmanagement.PUT_INDEX_MAPPING
20+
import org.opensearch.indexmanagement.SEARCH_INDEX
21+
import org.opensearch.indexmanagement.SecurityRestTestCase
22+
import org.opensearch.indexmanagement.WRITE_INDEX
1423
import org.opensearch.indexmanagement.IndexManagementPlugin
1524
import org.opensearch.indexmanagement.SecurityRestTestCase
1625
import org.opensearch.indexmanagement.indexstatemanagement.action.AliasAction

src/test/kotlin/org/opensearch/indexmanagement/security/SecurityBehaviorIT.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
/*
2-
* Copyright OpenSearch Contributors
32
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
410
*/
511

612
package org.opensearch.indexmanagement.security
@@ -9,6 +15,18 @@ import org.junit.After
915
import org.junit.Before
1016
import org.opensearch.client.RestClient
1117
import org.opensearch.commons.rest.SecureRestClientBuilder
18+
import org.opensearch.indexmanagement.BULK_WRITE_INDEX
19+
import org.opensearch.indexmanagement.CREATE_INDEX
20+
import org.opensearch.indexmanagement.EXPLAIN_INDEX
21+
import org.opensearch.indexmanagement.GET_INDEX_MAPPING
22+
import org.opensearch.indexmanagement.GET_POLICIES
23+
import org.opensearch.indexmanagement.GET_POLICY
24+
import org.opensearch.indexmanagement.MANAGED_INDEX
25+
import org.opensearch.indexmanagement.PUT_INDEX_MAPPING
26+
import org.opensearch.indexmanagement.SEARCH_INDEX
27+
import org.opensearch.indexmanagement.SecurityRestTestCase
28+
import org.opensearch.indexmanagement.WRITE_INDEX
29+
import org.opensearch.indexmanagement.WRITE_POLICY
1230
import org.opensearch.indexmanagement.SecurityRestTestCase
1331
import org.opensearch.indexmanagement.indexstatemanagement.settings.ManagedIndexSettings
1432
import org.opensearch.indexmanagement.makeRequest

0 commit comments

Comments
 (0)