From 88842f33190ab940149464729400980b0ab20a41 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Tue, 4 Aug 2015 15:55:00 +0200
Subject: [PATCH] PluginManager: Fix elastic.co download URLs, add snapshot
 ones

The URL to download the main elasticsearch plugins did not match
what the S3 wageon is supposed to write to.

In addition this PR adds support for snapshots to access the
snapshot S3 bucket, so we can possibly download snapshot versions
of plugins.

The format of the URLs stems from #12270

Closes #12632
---
 .../elasticsearch/plugins/PluginManager.java  |  5 ++-
 .../plugins/PluginManagerUnitTests.java       | 43 ++++++++++++++-----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java
index 7c0f2bfcc8c..5a03dcc61cc 100644
--- a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java
+++ b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java
@@ -425,7 +425,10 @@ public class PluginManager {
                 // Elasticsearch new download service uses groupId org.elasticsearch.plugins from 2.0.0
                 if (user == null) {
                     // TODO Update to https
-                    addUrl(urls, String.format(Locale.ROOT, "http://download.elastic.co/org.elasticsearch.plugins/%1$s/%1$s-%2$s.zip", repo, version));
+                    if (Version.CURRENT.snapshot()) {
+                        addUrl(urls, String.format(Locale.ROOT, "http://download.elastic.co/elasticsearch/snapshot/org/elasticsearch/plugin/%s/%s-SNAPSHOT/%s-%s-SNAPSHOT.zip", repo, version, repo, version));
+                    }
+                    addUrl(urls, String.format(Locale.ROOT, "http://download.elastic.co/elasticsearch/release/org/elasticsearch/plugin/%s/%s/%s-%s.zip", repo, version, repo, version));
                 } else {
                     // Elasticsearch old download service
                     // TODO Update to https
diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
index 75d680c1abd..519c003ac69 100644
--- a/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
+++ b/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java
@@ -29,8 +29,11 @@ import org.junit.Test;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Locale;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 
@@ -62,22 +65,40 @@ public class PluginManagerUnitTests extends ESTestCase {
     public void testSimplifiedNaming() throws IOException {
         String pluginName = randomAsciiOfLength(10);
         PluginManager.PluginHandle handle = PluginManager.PluginHandle.parse(pluginName);
-        assertThat(handle.urls(), hasSize(1));
-        URL expected = new URL("http", "download.elastic.co", "/org.elasticsearch.plugins/" + pluginName + "/" +
+
+        assertThat(handle.urls(), hasSize(Version.CURRENT.snapshot() ? 2 : 1));
+
+        Iterator<URL> iterator = handle.urls().iterator();
+
+        if (Version.CURRENT.snapshot()) {
+            String expectedSnapshotUrl = String.format(Locale.ROOT, "http://download.elastic.co/elasticsearch/snapshot/org/elasticsearch/plugin/%s/%s-SNAPSHOT/%s-%s-SNAPSHOT.zip",
+                    pluginName, Version.CURRENT.number(), pluginName, Version.CURRENT.number());
+            assertThat(iterator.next(), is(new URL(expectedSnapshotUrl)));
+        }
+
+        URL expected = new URL("http", "download.elastic.co", "/elasticsearch/release/org/elasticsearch/plugin/" + pluginName + "/" + Version.CURRENT.number() + "/" +
             pluginName + "-" + Version.CURRENT.number() + ".zip");
-        assertThat(handle.urls().get(0), is(expected));
+        assertThat(iterator.next(), is(expected));
     }
 
     @Test
     public void testTrimmingElasticsearchFromOfficialPluginName() throws IOException {
-        String randomName = randomAsciiOfLength(10);
-        String pluginName = randomFrom("elasticsearch-", "es-") + randomName;
-        PluginManager.PluginHandle handle = PluginManager.PluginHandle.parse(pluginName);
-        assertThat(handle.name, is(randomName));
-        assertThat(handle.urls(), hasSize(1));
-        URL expected = new URL("http", "download.elastic.co", "/org.elasticsearch.plugins/" + pluginName + "/" +
-                pluginName + "-" + Version.CURRENT.number() + ".zip");
-        assertThat(handle.urls().get(0), is(expected));
+        String randomPluginName = randomFrom(PluginManager.OFFICIAL_PLUGINS.asList());
+        PluginManager.PluginHandle handle = PluginManager.PluginHandle.parse(randomPluginName);
+        assertThat(handle.name, is(randomPluginName.replaceAll("^elasticsearch-", "")));
+
+        assertThat(handle.urls(), hasSize(Version.CURRENT.snapshot() ? 2 : 1));
+        Iterator<URL> iterator = handle.urls().iterator();
+
+        if (Version.CURRENT.snapshot()) {
+            String expectedSnapshotUrl = String.format(Locale.ROOT, "http://download.elastic.co/elasticsearch/snapshot/org/elasticsearch/plugin/%s/%s-SNAPSHOT/%s-%s-SNAPSHOT.zip",
+                    randomPluginName, Version.CURRENT.number(), randomPluginName, Version.CURRENT.number());
+            assertThat(iterator.next(), is(new URL(expectedSnapshotUrl)));
+        }
+
+        String releaseUrl = String.format(Locale.ROOT, "http://download.elastic.co/elasticsearch/release/org/elasticsearch/plugin/%s/%s/%s-%s.zip",
+                randomPluginName, Version.CURRENT.number(), randomPluginName, Version.CURRENT.number());
+        assertThat(iterator.next(), is(new URL(releaseUrl)));
     }
 
     @Test