honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing plugin installation URL to consume build qualifier (#3193) 

* Fixing the installation URL to consume build qualifier

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

* Fixing spotless

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>
This commit is contained in:
Sarat Vemulapalli 2022-05-05 17:34:46 -07:00 committed by GitHub
parent 7b75fb425f
commit ba6dc5d28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java
View File

@ -374,7 +374,12 @@ class InstallPluginCommand extends EnvironmentAwareCommand {
stagingHash
);
} else {
baseUrl = String.format(Locale.ROOT, "https://artifacts.opensearch.org/releases/plugins/%s/%s", pluginId, version);
baseUrl = String.format(
Locale.ROOT,
"https://artifacts.opensearch.org/releases/plugins/%s/%s",
pluginId,
Build.CURRENT.getQualifiedVersion()
);
}
final String platformUrl = String.format(
Locale.ROOT,

20
distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
View File

@ -1049,7 +1049,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testOfficialPlugin() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1093,7 +1093,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testOfficialPlatformPlugin() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Platforms.PLATFORM_NAME
+ "-"
@ -1159,7 +1159,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testOfficialChecksumWithoutFilename() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1184,7 +1184,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testOfficialShaMissing() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1229,7 +1229,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testInvalidShaFileMissingFilename() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1254,7 +1254,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testInvalidShaFileMismatchFilename() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1279,7 +1279,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testInvalidShaFileContainingExtraLine() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1304,7 +1304,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testSha512Mismatch() throws Exception {
String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/analysis-icu-"
+ Build.CURRENT.getQualifiedVersion()
+ ".zip";
@ -1349,7 +1349,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception {
final String icu = "analysis-icu";
final String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/"
+ icu
+ "-"
@ -1386,7 +1386,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
public void testFailedSignatureVerification() throws Exception {
final String icu = "analysis-icu";
final String url = "https://artifacts.opensearch.org/releases/plugins/analysis-icu/"
+ Version.CURRENT
+ Build.CURRENT.getQualifiedVersion()
+ "/"
+ icu
+ "-"