Skip to content

Commit d7c6b1c

Browse files
derek-hoderek-ho
committed
Support port
Signed-off-by: Derek Ho <[email protected]>
1 parent 66f8d26 commit d7c6b1c

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

‎action.yml

+23-21
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,27 @@ runs:
5959
- name: Extract downloaded tar
6060
if: ${{ runner.os == 'Linux' }}
6161
run: |
62-
tar -xzf opensearch-*.tar.gz
62+
tar -xzf opensearch-*.tar.gz && mv opensearch-${{ inputs.opensearch-version }}-SNAPSHOT opensearch-${{inputs.opensearch-version}}-SNAPSHOT${{ inputs.port }}
6363
rm -f opensearch-*.tar.gz
6464
shell: bash
6565

6666
- name: Extract downloaded zip
6767
if: ${{ runner.os == 'Windows' }}
6868
run: |
69-
tar -xzf opensearch-min-${{ inputs.opensearch-version }}-SNAPSHOT-windows-x64-latest.zip
70-
del opensearch-min-${{ inputs.opensearch-version }}-SNAPSHOT-windows-x64-latest.zip
69+
Expand-Archive -Path "opensearch-min-${{ inputs.opensearch-version }}-SNAPSHOT-windows-x64-latest.zip" -DestinationPath "temp"
70+
Move-Item -Path "temp/*" -Destination "opensearch-3.0.0-SNAPSHOT${{ inputs.port }}"
71+
Remove-Item -Path "temp" -Recurse
72+
Remove-Item -Path "opensearch-min-${{ inputs.opensearch-version }}-SNAPSHOT-windows-x64-latest.zip"
7173
shell: pwsh
7274

7375
- name: Install plugin(s) into OpenSearch for Linux
7476
if: ${{ runner.os == 'Linux'}}
7577
run: |
76-
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/bin/opensearch-plugin
78+
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/bin/opensearch-plugin
7779
plugins="${{ inputs.plugins }}"
7880
if [ -n "$plugins" ]; then
7981
echo "$plugins" | tr ',' '\n' | while read -r plugin; do
80-
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/bin/opensearch-plugin install ${plugin}"
82+
/bin/bash -c "yes | ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/bin/opensearch-plugin install ${plugin}"
8183
done
8284
fi
8385
shell: bash
@@ -88,15 +90,15 @@ runs:
8890
$pluginNames = "${{ inputs.plugins }}" -split ','
8991
if ($pluginNames.Length -gt 0) {
9092
foreach ($plugin in $pluginNames) {
91-
'y' | .\opensearch-${{ inputs.opensearch-version }}-SNAPSHOT\bin\opensearch-plugin.bat install ${plugin}
93+
'y' | .\opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}\bin\opensearch-plugin.bat install ${plugin}
9294
}
9395
}
9496
shell: pwsh
9597

9698
- name: Replace security configuration file if applicable
9799
if: ${{ inputs.security_config_file != '' }}
98100
run: |
99-
mv ${{ inputs.security_config_file }} ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch-security/config.yml
101+
mv ${{ inputs.security_config_file }} ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch-security/config.yml
100102
shell: bash
101103

102104
# Setup security if it's enabled
@@ -105,60 +107,60 @@ runs:
105107
run: |
106108
echo "running linux security demo configuration setup"
107109
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
108-
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.sh
110+
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.sh
109111
opensearch_version="${{ inputs.opensearch-version }}"
110112
opensearch_major_version=$(echo "$opensearch_version" | awk -F'.' '{print $1}')
111113
opensearch_minor_version=$(echo "$opensearch_version" | awk -F'.' '{print $2}')
112114
if [ "$opensearch_major_version" -lt 2 ] || ([ "$opensearch_major_version" -eq 2 ] && [ "$opensearch_minor_version" -lt 12 ]); then
113115
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"
116+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.sh"
115117
else
116118
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"
119+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.sh -t"
118120
fi
119-
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
121+
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
120122
shell: bash
121123

122124
- name: Setup security demo configuration for Windows
123125
if: ${{ runner.os == 'Windows' && inputs.security-enabled == 'true' }}
124126
run: |
125127
echo "running windows security demo configuration setup"
126128
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=${{ inputs.admin-password }}
127-
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/plugins/opensearch-security/tools/install_demo_configuration.bat
129+
chmod +x ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.bat
128130
opensearch_version="${{ inputs.opensearch-version }}"
129131
opensearch_major_version=$(echo "$opensearch_version" | cut -d'.' -f1)
130132
opensearch_minor_version=$(echo "$opensearch_version" | cut -d'.' -f2)
131133
if [ "$opensearch_major_version" -lt 2 ] || ([ "$opensearch_major_version" -eq 2 ] && [ "$opensearch_minor_version" -lt 12 ]); then
132134
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 -y -i -s"
135+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.bat -y -i -s"
134136
else
135137
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 -y -i -s"
138+
/bin/bash -c "yes | ./opensearch-${opensearch_version}-SNAPSHOT${{ inputs.port }}/plugins/opensearch-security/tools/install_demo_configuration.bat -t -y -i -s"
137139
fi
138-
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
140+
echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
139141
shell: bash
140142

141143
- name: Use more space
142144
run: |
143-
echo '' >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
144-
echo "cluster.routing.allocation.disk.threshold_enabled: false" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
145+
echo '' >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
146+
echo "cluster.routing.allocation.disk.threshold_enabled: false" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
145147
shell: bash
146148

147149
- name: Replace opensearch.yml file if applicable
148150
if: ${{ inputs.port != '' }}
149151
run: |
150-
echo -e "\nhttp.port: ${{ inputs.port }}" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/config/opensearch.yml
152+
echo -e "\nhttp.port: ${{ inputs.port }}" >> ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/config/opensearch.yml
151153
shell: bash
152154

153155
# Run OpenSearch
154156
- name: Run OpenSearch with plugin on Linux
155157
if: ${{ runner.os == 'Linux'}}
156-
run: /bin/bash -c "./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/bin/opensearch &"
158+
run: /bin/bash -c "./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/bin/opensearch &"
157159
shell: bash
158160

159161
- name: Run OpenSearch with plugin on Windows
160162
if: ${{ runner.os == 'Windows'}}
161-
run: start .\opensearch-${{ inputs.opensearch-version }}-SNAPSHOT\bin\opensearch.bat
163+
run: start .\opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}\bin\opensearch.bat
162164
shell: pwsh
163165

164166
# Give the OpenSearch process some time to boot up before sending any requires, might need to increase the default time!
@@ -195,5 +197,5 @@ runs:
195197
shell: pwsh
196198

197199
- if: always()
198-
run: cat ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT/logs/opensearch.log
200+
run: cat ./opensearch-${{ inputs.opensearch-version }}-SNAPSHOT${{ inputs.port }}/logs/opensearch.log
199201
shell: bash

0 commit comments

Comments
 (0)