Skip to content

Commit a1be099

Browse files
committed
Handle by version
Signed-off-by: Derek Ho <[email protected]>
1 parent 49802d3 commit a1be099

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

action.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,15 @@ runs:
106106
echo "running linux security demo configuration setup"
107107
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
108108
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh
109-
if /bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh -t"; then
110-
echo "Command executed successfully."
109+
opensearch_version="${{ inputs.opensearch-version }}"
110+
opensearch_major_version=$(echo "$opensearch_version" | awk -F'.' '{print $1}')
111+
opensearch_minor_version=$(echo "$opensearch_version" | awk -F'.' '{print $2}')
112+
if [ "$opensearch_major_version" -lt 2 ] || ([ "$opensearch_major_version" -eq 2 ] && [ "$opensearch_minor_version" -lt 12 ]); then
113+
echo "Running the command without -t option (OpenSearch version is $opensearch_version)"
114+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh"
111115
else
112-
echo "Command failed. Retrying without the -t option."
113-
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh"
116+
echo "Running the command with -t option (OpenSearch version is $opensearch_version)"
117+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh -t"
114118
fi
115119
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
116120
shell: bash
@@ -121,11 +125,15 @@ runs:
121125
echo "running windows security demo configuration setup"
122126
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
123127
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat
124-
if /bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat -t"; then
125-
echo "Command executed successfully."
128+
opensearch_version="${{ inputs.opensearch-version }}"
129+
opensearch_major_version=$(echo "$opensearch_version" | cut -d'.' -f1)
130+
opensearch_minor_version=$(echo "$opensearch_version" | cut -d'.' -f2)
131+
if [ "$opensearch_major_version" -lt 2 ] || ([ "$opensearch_major_version" -eq 2 ] && [ "$opensearch_minor_version" -lt 12 ]); then
132+
echo "Running the command without -t option (OpenSearch version is $opensearch_version)"
133+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat"
126134
else
127-
echo "Command failed. Retrying without the -t option."
128-
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat"
135+
echo "Running the command with -t option (OpenSearch version is $opensearch_version)"
136+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat -t"
129137
fi
130138
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
131139
shell: bash

0 commit comments

Comments
 (0)