Skip to content

Commit 9e36031

Browse files
Fixes version matcher string in demo config installer (#5157)
1 parent 8803690 commit 9e36031

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/main/java/org/opensearch/security/tools/democonfig/Installer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -330,19 +330,21 @@ void setSecurityVariables() {
330330

331331
// Extract OpenSearch version and Security version
332332
File[] opensearchLibFiles = new File(OPENSEARCH_LIB_PATH).listFiles(
333-
pathname -> pathname.getName().matches("opensearch-core-(.*).jar")
333+
pathname -> pathname.getName().matches("opensearch-core-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar")
334334
);
335335

336336
if (opensearchLibFiles != null && opensearchLibFiles.length > 0) {
337-
OPENSEARCH_VERSION = opensearchLibFiles[0].getName().replaceAll("opensearch-core-(.*).jar", "$1");
337+
OPENSEARCH_VERSION = opensearchLibFiles[0].getName()
338+
.replaceAll("opensearch-core-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar", "$1");
338339
}
339340

340341
File[] securityFiles = new File(OPENSEARCH_PLUGINS_DIR + "opensearch-security").listFiles(
341-
pathname -> pathname.getName().startsWith("opensearch-security-") && pathname.getName().endsWith(".jar")
342+
pathname -> pathname.getName().matches("opensearch-security-\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?.jar")
342343
);
343344

344345
if (securityFiles != null && securityFiles.length > 0) {
345-
SECURITY_VERSION = securityFiles[0].getName().replaceAll("opensearch-security-(.*).jar", "$1");
346+
SECURITY_VERSION = securityFiles[0].getName()
347+
.replaceAll("opensearch-security-(\\d+(\\.\\d+)*(-[a-zA-Z0-9]+)?(-SNAPSHOT)?).jar", "$1");
346348
}
347349
}
348350

src/test/java/org/opensearch/security/tools/democonfig/InstallerTests.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
118118

119119
// set initsecurity and cluster_mode to no
120120
readInputStream("y" + System.lineSeparator() + "n" + System.lineSeparator() + "n" + System.lineSeparator()); // pass all 3 inputs as
121-
// y
121+
// y
122122
installer.gatherUserInputs();
123123

124124
verifyStdOutContainsString("Install demo certificates?");
@@ -134,7 +134,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
134134

135135
// set initsecurity and cluster_mode to no
136136
readInputStream("y" + System.lineSeparator() + "y" + System.lineSeparator() + "y" + System.lineSeparator()); // pass all 3 inputs as
137-
// y
137+
// y
138138
installer.gatherUserInputs();
139139

140140
verifyStdOutContainsString("Install demo certificates?");
@@ -175,7 +175,7 @@ public void testGatherUserInputs_withoutAssumeYes() {
175175
assertThat(installer.cluster_mode, is(true));
176176

177177
readInputStream("y" + System.lineSeparator() + "y" + System.lineSeparator() + "y" + System.lineSeparator()); // pass all 3 inputs as
178-
// y
178+
// y
179179
installer.gatherUserInputs();
180180

181181
verifyStdOutContainsString("Install demo certificates?");
@@ -307,8 +307,8 @@ public void testSetSecurityVariables() {
307307
setUpSecurityDirectories();
308308
installer.setSecurityVariables();
309309

310-
assertThat(installer.OPENSEARCH_VERSION, is(equalTo("osVersion")));
311-
assertThat(installer.SECURITY_VERSION, is(equalTo("version")));
310+
assertThat(installer.OPENSEARCH_VERSION, is(equalTo("3.0.0-Version")));
311+
assertThat(installer.SECURITY_VERSION, is(equalTo("3.0.0.0-version")));
312312
tearDownSecurityDirectories();
313313
}
314314

@@ -481,8 +481,11 @@ public void setUpSecurityDirectories() {
481481
createDirectory(installer.OPENSEARCH_LIB_PATH);
482482
createDirectory(installer.OPENSEARCH_CONF_DIR);
483483
createDirectory(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security");
484-
createFile(installer.OPENSEARCH_LIB_PATH + "opensearch-core-osVersion.jar");
485-
createFile(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-version.jar");
484+
createFile(installer.OPENSEARCH_LIB_PATH + "opensearch-core-3.0.0-Version.jar");
485+
createFile(
486+
installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-common-3.0.0.0-version.jar"
487+
);
488+
createFile(installer.OPENSEARCH_PLUGINS_DIR + "opensearch-security" + File.separator + "opensearch-security-3.0.0.0-version.jar");
486489
createFile(installer.OPENSEARCH_CONF_DIR + File.separator + "securityadmin_demo.sh");
487490
}
488491

0 commit comments

Comments
 (0)