Skip to content

[Backport 2.x] Fixing plugin installation URL to consume build qualifier #3215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saratvemulapalli merged 1 commit into from
May 6, 2022
Merged

[Backport 2.x] Fixing plugin installation URL to consume build qualifier #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,12 @@ private String getOpenSearchUrl(
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,
Expand Down
20 changes: 10 additions & 10 deletions ...tion/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ public void assertInstallPluginFromUrl(

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";
Expand Down Expand Up @@ -1093,7 +1093,7 @@ public void testOfficialPluginStaging() throws Exception {

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
+ "-"
Expand Down Expand Up @@ -1159,7 +1159,7 @@ public void testMavenChecksumWithoutFilename() throws Exception {

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";
Expand All @@ -1184,7 +1184,7 @@ public void testOfficialChecksumWithoutFilename() throws Exception {

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";
Expand Down Expand Up @@ -1229,7 +1229,7 @@ public void testMavenShaMissing() throws Exception {

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";
Expand All @@ -1254,7 +1254,7 @@ public void testInvalidShaFileMissingFilename() throws Exception {

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";
Expand All @@ -1279,7 +1279,7 @@ public void testInvalidShaFileMismatchFilename() throws Exception {

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";
Expand All @@ -1304,7 +1304,7 @@ public void testInvalidShaFileContainingExtraLine() throws Exception {

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";
Expand Down Expand Up @@ -1349,7 +1349,7 @@ public void testSha1Mismatch() throws Exception {
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
+ "-"
Expand Down Expand Up @@ -1386,7 +1386,7 @@ public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception {
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
+ "-"
Expand Down