Skip to content

Commit

Permalink
fix to support https as param for security integ tests (#156)
Browse files Browse the repository at this point in the history
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
(cherry picked from commit 7d07189)
  • Loading branch information
sbcd90 authored and github-actions[bot] committed Nov 14, 2022
1 parent 1c343ce commit 1371f47
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/security-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
if [ $security -gt 0 ]
then
echo "Security plugin is available"
./gradlew :integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin
./gradlew :integTest -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dhttps=true -Duser=admin -Dpassword=admin
else
echo "Security plugin is NOT available skipping this run as tests without security have already been run"
fi
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ integTest {
systemProperty 'java.io.tmpdir', es_tmp_dir.absolutePath

systemProperty "https", System.getProperty("https")
systemProperty "security", System.getProperty("security")
systemProperty "user", System.getProperty("user")
systemProperty "password", System.getProperty("password")

Expand Down Expand Up @@ -309,7 +308,6 @@ task integTestRemote(type: RestIntegTestTask) {
systemProperty 'java.io.tmpdir', opensearch_tmp_dir.absolutePath

systemProperty "https", System.getProperty("https")
systemProperty "security", System.getProperty("security")
systemProperty "user", System.getProperty("user")
systemProperty "password", System.getProperty("password")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ protected boolean isHttps() {
}

protected boolean securityEnabled() {
return Boolean.parseBoolean(System.getProperty("security", "false"));
return Boolean.parseBoolean(System.getProperty("https", "false"));
}

@Override
Expand Down

0 comments on commit 1371f47

Please sign in to comment.