Rename cloud-gce plugin to discovery-gce plugin

Follow up azure and aws splits, we need to be consistent and rename `cloud-gce` to `discovery-gce`.

core/src/main/java/org/elasticsearch/bootstrap/Security.java

@@ -165,7 +165,7 @@ final class Security {
         Map<String,String> m = new HashMap<>();
         m.put("repository-s3",       "org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin");
         m.put("discovery-ec2",       "org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin");
-        m.put("cloud-gce",           "org.elasticsearch.plugin.cloud.gce.CloudGcePlugin");
+        m.put("discovery-gce",       "org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin");
         m.put("lang-expression",     "org.elasticsearch.script.expression.ExpressionPlugin");
         m.put("lang-groovy",         "org.elasticsearch.script.groovy.GroovyPlugin");
         m.put("lang-javascript",     "org.elasticsearch.plugin.javascript.JavaScriptPlugin");

core/src/main/java/org/elasticsearch/plugins/PluginManager.java

@@ -90,10 +90,10 @@ public class PluginManager {
             "analysis-phonetic",
             "analysis-smartcn",
             "analysis-stempel",
-            "cloud-gce",
             "delete-by-query",
             "discovery-azure",
             "discovery-ec2",
+            "discovery-gce",
             "discovery-multicast",
             "lang-expression",
             "lang-groovy",

core/src/main/resources/org/elasticsearch/bootstrap/security.policy

@@ -52,8 +52,8 @@ grant codeBase "${es.security.plugin.discovery-ec2}" {
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
-grant codeBase "${es.security.plugin.cloud-gce}" {
-  // needed because of problems in cloud-gce
+grant codeBase "${es.security.plugin.discovery-gce}" {
+  // needed because of problems in discovery-gce
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 

core/src/main/resources/org/elasticsearch/plugins/plugin-install.help

@@ -38,10 +38,10 @@ OFFICIAL PLUGINS
     - analysis-phonetic
     - analysis-smartcn
     - analysis-stempel
-    - cloud-gce
     - delete-by-query
     - discovery-azure
     - discovery-ec2
+    - discovery-gce
     - discovery-multicast
     - lang-expression
     - lang-groovy

core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java

@@ -18,6 +18,7 @@
  */
 package org.elasticsearch.plugins;
 
+import com.google.common.hash.Hashing;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.Version;
@@ -587,7 +588,6 @@ public class PluginManagerIT extends ESIntegTestCase {
         PluginManager.checkForOfficialPlugins("analysis-phonetic");
         PluginManager.checkForOfficialPlugins("analysis-smartcn");
         PluginManager.checkForOfficialPlugins("analysis-stempel");
-        PluginManager.checkForOfficialPlugins("cloud-gce");
         PluginManager.checkForOfficialPlugins("delete-by-query");
         PluginManager.checkForOfficialPlugins("lang-expression");
         PluginManager.checkForOfficialPlugins("lang-groovy");
@@ -598,6 +598,7 @@ public class PluginManagerIT extends ESIntegTestCase {
         PluginManager.checkForOfficialPlugins("discovery-multicast");
         PluginManager.checkForOfficialPlugins("discovery-azure");
         PluginManager.checkForOfficialPlugins("discovery-ec2");
+        PluginManager.checkForOfficialPlugins("discovery-gce");
         PluginManager.checkForOfficialPlugins("repository-azure");
         PluginManager.checkForOfficialPlugins("repository-s3");
         PluginManager.checkForOfficialPlugins("store-smb");

dev-tools/smoke_test_rc.py

@@ -62,10 +62,10 @@ DEFAULT_PLUGINS = ["analysis-icu",
                    "analysis-phonetic",
                    "analysis-smartcn",
                    "analysis-stempel",
-                   "cloud-gce",
                    "delete-by-query",
                    "discovery-azure",
                    "discovery-ec2",
+                   "discovery-gce",
                    "discovery-multicast",
                    "lang-expression",
                    "lang-groovy",

docs/plugins/discovery-gce.asciidoc

@@ -1,9 +1,9 @@
-[[cloud-gce]]
-=== GCE Cloud Plugin
+[[discovery-gce]]
+=== GCE Discovery Plugin
 
-The Google Compute Engine Cloud plugin uses the GCE API for unicast discovery.
+The Google Compute Engine Discovery plugin uses the GCE API for unicast discovery.
 
-[[cloud-gce-install]]
+[[discovery-gce-install]]
 [float]
 ==== Installation
 
@@ -11,13 +11,13 @@ This plugin can be installed using the plugin manager:
 
 [source,sh]
 ----------------------------------------------------------------
-sudo bin/plugin install cloud-gce
+sudo bin/plugin install discovery-gce
 ----------------------------------------------------------------
 
 The plugin must be installed on every node in the cluster, and each node must
 be restarted after installation.
 
-[[cloud-gce-remove]]
+[[discovery-gce-remove]]
 [float]
 ==== Removal
 
@@ -25,12 +25,12 @@ The plugin can be removed with the following command:
 
 [source,sh]
 ----------------------------------------------------------------
-sudo bin/plugin remove cloud-gce
+sudo bin/plugin remove discovery-gce
 ----------------------------------------------------------------
 
 The node must be stopped before removing the plugin.
 
-[[cloud-gce-usage-discovery]]
+[[discovery-gce-usage]]
 ==== GCE Virtual Machine Discovery
 
 Google Compute Engine VM discovery allows to use the google APIs to perform automatic discovery (similar to multicast
@@ -84,7 +84,7 @@ network.host: _gce_
 network.host: _gce:hostname_
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-short]]
+[[discovery-gce-usage-short]]
 ===== How to start (short story)
 
 * Create Google Compute Engine instance (with compute rw permissions)
@@ -93,11 +93,11 @@ network.host: _gce:hostname_
 * Modify `elasticsearch.yml` file
 * Start Elasticsearch
 
-[[cloud-gce-usage-discovery-long]]
+[[discovery-gce-usage-long]]
 ==== Setting up GCE Discovery
 
 
-[[cloud-gce-usage-discovery-long-prerequisites]]
+[[discovery-gce-usage-long-prerequisites]]
 ===== Prerequisites
 
 Before starting, you need:
@@ -112,7 +112,8 @@ If you did not set it yet, you can define your default project you will work on:
 gcloud config set project es-cloud
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-long-login]]
+[[discovery-gce-usage-long-login]]
+===== Login to Google Cloud
 
 If you haven't already, login to Google Cloud
 
@@ -124,7 +125,7 @@ gcloud auth login
 This will open your browser. You will be asked to sign-in to a Google account and
 authorize access to the Google Cloud SDK.
 
-[[cloud-gce-usage-discovery-long-first-instance]]
+[[discovery-gce-usage-long-first-instance]]
 ===== Creating your first instance
 
 
@@ -194,15 +195,15 @@ sudo apt-get install oracle-java8-installer
 sudo dpkg -i elasticsearch-2.0.0.deb
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-long-install-plugin]]
-===== Install elasticsearch cloud gce plugin
+[[discovery-gce-usage-long-install-plugin]]
+===== Install elasticsearch discovery gce plugin
 
 Install the plugin:
 
 [source,sh]
 --------------------------------------------------
 # Use Plugin Manager to install it
-sudo bin/plugin install cloud-gce
+sudo bin/plugin install discovery-gce
 --------------------------------------------------
 
 Open the `elasticsearch.yml` file:
@@ -256,7 +257,7 @@ discovery.gce: TRACE
 
 
 
-[[cloud-gce-usage-discovery-cloning]]
+[[discovery-gce-usage-cloning]]
 ==== Cloning your existing machine
 
 In order to build a cluster on many nodes, you can clone your configured instance to new nodes.
@@ -287,7 +288,7 @@ gcloud compute images create elasticsearch-2-0-0 --source-uri gs://esimage/e4686
 # and launch the same command from your local machine.
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-start-new-instances]]
+[[discovery-gce-usage-start-new-instances]]
 ===== Start new instances
 
 As you have now an image, you can create as many instances as you need:
@@ -302,7 +303,7 @@ gcloud compute instances create myesnode2 --image=elasticsearch-2-0-0 \
        --zone europe-west1-a --machine-type f1-micro --scopes=compute-rw
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-remove-instance]]
+[[discovery-gce-usage-remove-instance]]
 ===== Remove an instance (aka shut it down)
 
 You can use https://cloud.google.com/console[Google Cloud Console] or CLI to manage your instances:
@@ -318,7 +319,7 @@ gcloud compute disks deleted boot-myesnode1 boot-myesnode2  \
        --zone=europe-west1-a
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-zones]]
+[[discovery-gce-usage-zones]]
 ==== Using GCE zones
 
 `cloud.gce.zone` helps to retrieve instances running in a given zone. It should be one of the
@@ -339,7 +340,7 @@ discovery:
 
 
 
-[[cloud-gce-usage-discovery-tags]]
+[[discovery-gce-usage-tags]]
 ==== Filtering by tags
 
 The GCE discovery can also filter machines to include in the cluster based on tags using `discovery.gce.tags` settings.
@@ -375,13 +376,13 @@ discovery:
             tags: elasticsearch, dev
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-port]]
+[[discovery-gce-usage-port]]
 ==== Changing default transport port
 
 By default, elasticsearch GCE plugin assumes that you run elasticsearch on 9300 default port.
 But you can specify the port value elasticsearch is meant to use using google compute engine metadata `es_port`:
 
-[[cloud-gce-usage-discovery-port-create]]
+[[discovery-gce-usage-port-create]]
 ===== When creating instance
 
 Add `--metadata es_port=9301` option:
@@ -399,7 +400,7 @@ gcloud compute instances create myesnode2 --image=elasticsearch-1-0-0-RC1 \
        --metadata es_port=9301
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-port-run]]
+[[discovery-gce-usage-port-run]]
 ===== On a running instance
 
 [source,sh]
@@ -410,10 +411,10 @@ gcloud compute instances add-metadata myesnode1 \
 --------------------------------------------------
 
 
-[[cloud-gce-usage-discovery-tips]]
+[[discovery-gce-usage-tips]]
 ==== GCE Tips
 
-[[cloud-gce-usage-discovery-tips-projectid]]
+[[discovery-gce-usage-tips-projectid]]
 ===== Store project id locally
 
 If you don't want to repeat the project id each time, you can save it in the local gcloud config
@@ -423,7 +424,7 @@ If you don't want to repeat the project id each time, you can save it in the loc
 gcloud config set project es-cloud
 --------------------------------------------------
 
-[[cloud-gce-usage-discovery-tips-permissions]]
+[[discovery-gce-usage-tips-permissions]]
 ===== Machine Permissions
 
 If you have created a machine without the correct permissions, you will see `403 unauthorized` error messages. The only
@@ -472,7 +473,7 @@ Or, you may use the alias:
 --------------------------------------------------
 --
 
-[[cloud-gce-usage-discovery-testing]]
+[[discovery-gce-usage-testing]]
 ==== Testing GCE
 
 Integrations tests in this plugin require working GCE configuration and

docs/plugins/discovery.asciidoc

@@ -17,9 +17,9 @@ The EC2 discovery plugin uses the https://github.com/aws/aws-sdk-java[AWS API] f
 
 The Azure discovery plugin uses the Azure API for unicast discovery.
 
-<<cloud-gce,GCE Cloud>>::
+<<discovery-gce,GCE discovery>>::
 
-The Google Compute Engine Cloud plugin uses the GCE API for unicast discovery.
+The Google Compute Engine discovery plugin uses the GCE API for unicast discovery.
 
 <<discovery-multicast,Multicast>>::
 
@@ -38,7 +38,7 @@ include::discovery-ec2.asciidoc[]
 
 include::discovery-azure.asciidoc[]
 
-include::cloud-gce.asciidoc[]
+include::discovery-gce.asciidoc[]
 
 include::discovery-multicast.asciidoc[]
 

docs/reference/migration/migrate_3_0.asciidoc

@@ -121,6 +121,10 @@ function that it supports and it's able to parse. The function object can then t
 function through the new `toFunction(QueryShardContext)` method, which returns a lucene function to be executed
 on the data node.
 
+==== Cloud GCE plugin
+
+Cloud GCE plugin has been renamed to {plugins}/discovery-gce.html[Discovery GCE plugin].
+
 === Java-API
 
 ==== BoostingQueryBuilder

docs/reference/modules/discovery/gce.asciidoc

@@ -2,5 +2,5 @@
 === Google Compute Engine Discovery
 
 Google Compute Engine (GCE) discovery allows to use the GCE APIs to perform automatic discovery (similar to multicast).
-Please check the https://github.com/elasticsearch/elasticsearch-cloud-gce[plugin website]
-to find the full documentation.
+It is available as a plugin. See {plugins}/discovery-gce.html[discovery-gce] for more information.
+

plugins/discovery-gce/pom.xml

@@ -21,15 +21,15 @@ governing permissions and limitations under the License. -->
         <version>3.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>cloud-gce</artifactId>
-    <name>Plugin: Cloud: Google Compute Engine</name>
-    <description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description>
+    <artifactId>discovery-gce</artifactId>
+    <name>Plugin: Discovery: Google Compute Engine</name>
+    <description>The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.</description>
 
     <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.cloud.gce.CloudGcePlugin</elasticsearch.plugin.classname>
+        <elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin</elasticsearch.plugin.classname>
         <google.gce.version>v1-rev71-1.20.0</google.gce.version>
         <!-- currently has no unit tests -->
-        <tests.rest.suite>cloud_gce</tests.rest.suite>
+        <tests.rest.suite>discovery_gce</tests.rest.suite>
         <tests.rest.load_packaged>false</tests.rest.load_packaged>
         <xlint.options>-Xlint:-rawtypes,-unchecked</xlint.options>
     </properties>

plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java

@@ -25,9 +25,6 @@ import org.elasticsearch.common.component.LifecycleComponent;
 import java.io.IOException;
 import java.util.Collection;
 
-/**
- *
- */
 public interface GceComputeService extends LifecycleComponent<GceComputeService> {
     final class Fields {
         public static final String PROJECT = "cloud.gce.project_id";

plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java

@@ -48,9 +48,6 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.*;
 
-/**
- *
- */
 public class GceComputeServiceImpl extends AbstractLifecycleComponent<GceComputeService>
     implements GceComputeService {
 

plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java

@@ -20,8 +20,6 @@
 package org.elasticsearch.cloud.gce;
 
 import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.settings.Settings;
 
 public class GceModule extends AbstractModule {
     // pkg private so tests can override with mock

plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.plugin.cloud.gce;
+package org.elasticsearch.plugin.discovery.gce;
 
 import org.elasticsearch.cloud.gce.GceComputeService;
 import org.elasticsearch.cloud.gce.GceModule;
@@ -36,26 +36,23 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-/**
- *
- */
-public class CloudGcePlugin extends Plugin {
+public class GceDiscoveryPlugin extends Plugin {
 
     private final Settings settings;
-    protected final ESLogger logger = Loggers.getLogger(CloudGcePlugin.class);
+    protected final ESLogger logger = Loggers.getLogger(GceDiscoveryPlugin.class);
 
-    public CloudGcePlugin(Settings settings) {
+    public GceDiscoveryPlugin(Settings settings) {
         this.settings = settings;
     }
 
     @Override
     public String name() {
-        return "cloud-gce";
+        return "discovery-gce";
     }
 
     @Override
     public String description() {
-        return "Cloud Google Compute Engine Plugin";
+        return "Cloud Google Compute Engine Discovery Plugin";
     }
 
     @Override

plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/DiscoveryGCERestIT.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.cloud.gce;
+package org.elasticsearch.discovery.gce;
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-import org.elasticsearch.plugin.cloud.gce.CloudGcePlugin;
+import org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.test.rest.RestTestCandidate;
@@ -30,14 +30,14 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
 import java.io.IOException;
 import java.util.Collection;
 
-public class CloudGCERestIT extends ESRestTestCase {
+public class DiscoveryGCERestIT extends ESRestTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return pluginList(CloudGcePlugin.class);
+        return pluginList(GceDiscoveryPlugin.class);
     }
 
-    public CloudGCERestIT(@Name("yaml") RestTestCandidate testCandidate) {
+    public DiscoveryGCERestIT(@Name("yaml") RestTestCandidate testCandidate) {
         super(testCandidate);
     }
 

plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java

@@ -19,9 +19,8 @@
 
 package org.elasticsearch.discovery.gce;
 
-import org.elasticsearch.cloud.gce.GceModule;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.plugin.cloud.gce.CloudGcePlugin;
+import org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin;
 import org.elasticsearch.test.ESTestCase;
 
 import static org.hamcrest.Matchers.is;
@@ -34,20 +33,20 @@ public class GceDiscoverySettingsTests extends ESTestCase {
                 .putArray("cloud.gce.zone", "gce_zones_1", "gce_zones_2")
                 .build();
 
-        boolean discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        boolean discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(true));
     }
 
     public void testDiscoveryNotReady() {
         Settings settings = Settings.EMPTY;
-        boolean discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        boolean discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(false));
 
         settings = Settings.builder()
                 .put("discovery.type", "gce")
                 .build();
 
-        discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(false));
 
         settings = Settings.builder()
@@ -55,7 +54,7 @@ public class GceDiscoverySettingsTests extends ESTestCase {
                 .put("cloud.gce.project_id", "gce_id")
                 .build();
 
-        discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(false));
 
 
@@ -64,7 +63,7 @@ public class GceDiscoverySettingsTests extends ESTestCase {
                 .putArray("cloud.gce.zone", "gce_zones_1", "gce_zones_2")
                 .build();
 
-        discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(false));
 
         settings = Settings.builder()
@@ -72,7 +71,7 @@ public class GceDiscoverySettingsTests extends ESTestCase {
                 .putArray("cloud.gce.zone", "gce_zones_1", "gce_zones_2")
                 .build();
 
-        discoveryReady = CloudGcePlugin.isDiscoveryAlive(settings, logger);
+        discoveryReady = GceDiscoveryPlugin.isDiscoveryAlive(settings, logger);
         assertThat(discoveryReady, is(false));
     }
 }

plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yaml

@@ -1,6 +1,6 @@
-# Integration tests for Cloud GCE components
+# Integration tests for Discovery GCE components
 #
-"Cloud GCE loaded":
+"Discovery GCE loaded":
     - do:
         cluster.state: {}
 
@@ -10,5 +10,5 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: cloud-gce  }
+    - match:  { nodes.$master.plugins.0.name: discovery-gce  }
     - match:  { nodes.$master.plugins.0.jvm: true  }

plugins/pom.xml

@@ -388,10 +388,10 @@
         <module>analysis-phonetic</module>
         <module>analysis-smartcn</module>
         <module>analysis-stempel</module>
-        <module>cloud-gce</module>
         <module>delete-by-query</module>
         <module>discovery-azure</module>
         <module>discovery-ec2</module>
+        <module>discovery-gce</module>
         <module>discovery-multicast</module>
         <module>lang-expression</module>
         <module>lang-groovy</module>

qa/smoke-test-plugins/pom.xml

@@ -271,7 +271,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>cloud-gce</artifactId>
+                   <artifactId>discovery-gce</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>

qa/vagrant/pom.xml

@@ -143,7 +143,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.elasticsearch.plugin</groupId>
-                                    <artifactId>cloud-gce</artifactId>
+                                    <artifactId>discovery-gce</artifactId>
                                     <version>${elasticsearch.version}</version>
                                     <type>zip</type>
                                 </artifactItem>

qa/vagrant/src/test/resources/packaging/scripts/plugin_test_cases.bash

@@ -204,7 +204,7 @@ fi
 }
 
 @test "[$GROUP] install gce plugin" {
-    install_and_check_plugin cloud gce google-api-client-*.jar
+    install_and_check_plugin discovery gce google-api-client-*.jar
 }
 
 @test "[$GROUP] install delete by query plugin" {
@@ -308,7 +308,7 @@ fi
 }
 
 @test "[$GROUP] remove gce plugin" {
-    remove_plugin cloud-gce
+    remove_plugin discovery-gce
 }
 
 @test "[$GROUP] remove delete by query plugin" {