From c73ab50df16b9198db6ce33e17997d129ad3b6f7 Mon Sep 17 00:00:00 2001 From: David Pilato Date: Sat, 26 Sep 2015 11:53:21 +0200 Subject: [PATCH] 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`. --- .../org/elasticsearch/bootstrap/Security.java | 2 +- .../elasticsearch/plugins/PluginManager.java | 2 +- .../elasticsearch/bootstrap/security.policy | 4 +- .../elasticsearch/plugins/plugin-install.help | 2 +- .../plugins/PluginManagerIT.java | 3 +- dev-tools/smoke_test_rc.py | 2 +- ...ud-gce.asciidoc => discovery-gce.asciidoc} | 57 ++++++++++--------- docs/plugins/discovery.asciidoc | 6 +- docs/reference/migration/migrate_3_0.asciidoc | 4 ++ docs/reference/modules/discovery/gce.asciidoc | 4 +- .../licenses/commons-codec-1.6.jar.sha1 | 0 .../licenses/commons-codec-LICENSE.txt | 0 .../licenses/commons-codec-NOTICE.txt | 0 .../licenses/commons-logging-1.1.3.jar.sha1 | 0 .../licenses/commons-logging-LICENSE.txt | 0 .../licenses/commons-logging-NOTICE.txt | 0 .../licenses/google-LICENSE.txt | 0 .../licenses/google-NOTICE.txt | 0 .../google-api-client-1.20.0.jar.sha1 | 0 ...-services-compute-v1-rev71-1.20.0.jar.sha1 | 0 .../google-http-client-1.20.0.jar.sha1 | 0 ...oogle-http-client-jackson2-1.20.0.jar.sha1 | 0 .../google-oauth-client-1.20.0.jar.sha1 | 0 .../licenses/httpclient-4.3.6.jar.sha1 | 0 .../licenses/httpclient-LICENSE.txt | 0 .../licenses/httpclient-NOTICE.txt | 0 .../licenses/httpcore-4.3.3.jar.sha1 | 0 .../licenses/httpcore-LICENSE.txt | 0 .../licenses/httpcore-NOTICE.txt | 0 .../licenses/jsr305-1.3.9.jar.sha1 | 0 .../licenses/jsr305-LICENSE.txt | 0 .../licenses/jsr305-NOTICE.txt | 0 plugins/{cloud-gce => discovery-gce}/pom.xml | 10 ++-- .../cloud/gce/GceComputeService.java | 3 - .../cloud/gce/GceComputeServiceImpl.java | 3 - .../elasticsearch/cloud/gce/GceModule.java | 2 - .../cloud/gce/network/GceNameResolver.java | 0 .../discovery/gce/GceDiscovery.java | 0 .../gce/GceUnicastHostsProvider.java | 0 .../discovery/gce/GceDiscoveryPlugin.java} | 15 ++--- .../discovery/gce/DiscoveryGCERestIT.java} | 10 ++-- .../discovery/gce/GceComputeServiceMock.java | 0 .../gce/GceDiscoverySettingsTests.java | 15 +++-- .../discovery/gce/GceDiscoveryTests.java | 0 .../discovery/gce/GceNetworkTests.java | 0 .../zones/europe-west1-b/instances | 0 .../zones/us-central1-a/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/us-central1-a/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/europe-west1-b/instances | 0 .../zones/europe-west1-b/instances | 0 .../zeronode43/zones/us-central1-a/instances | 0 .../zeronode43/zones/us-central1-b/instances | 0 .../gce/computeMetadata/v1/instance/hostname | 0 .../v1/instance/network-interfaces/0/ip | 0 .../v1/instance/network-interfaces/1/ip | 0 .../instance/service-accounts/default/token | 0 .../test/discovery_gce}/10_basic.yaml | 6 +- plugins/pom.xml | 2 +- qa/smoke-test-plugins/pom.xml | 2 +- qa/vagrant/pom.xml | 2 +- .../packaging/scripts/plugin_test_cases.bash | 4 +- 66 files changed, 77 insertions(+), 83 deletions(-) rename docs/plugins/{cloud-gce.asciidoc => discovery-gce.asciidoc} (93%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-codec-1.6.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-codec-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-codec-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-logging-1.1.3.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-logging-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/commons-logging-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-api-client-1.20.0.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-http-client-1.20.0.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-http-client-jackson2-1.20.0.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/google-oauth-client-1.20.0.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpclient-4.3.6.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpclient-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpclient-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpcore-4.3.3.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpcore-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/httpcore-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/jsr305-1.3.9.jar.sha1 (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/jsr305-LICENSE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/licenses/jsr305-NOTICE.txt (100%) rename plugins/{cloud-gce => discovery-gce}/pom.xml (87%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java (99%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java (99%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/cloud/gce/GceModule.java (93%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/cloud/gce/network/GceNameResolver.java (100%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java (100%) rename plugins/{cloud-gce => discovery-gce}/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java (100%) rename plugins/{cloud-gce/src/main/java/org/elasticsearch/plugin/cloud/gce/CloudGcePlugin.java => discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java} (92%) rename plugins/{cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java => discovery-gce/src/test/java/org/elasticsearch/discovery/gce/DiscoveryGCERestIT.java} (83%) rename plugins/{cloud-gce => discovery-gce}/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceMock.java (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java (80%) rename plugins/{cloud-gce => discovery-gce}/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/java/org/elasticsearch/discovery/gce/GceNetworkTests.java (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/us-central1-a/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/us-central1-a/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandnotagset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandonetagset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandtwotagset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandnotagset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandonetagset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandtwotagsset/zones/europe-west1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-a/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-b/instances (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/hostname (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/0/ip (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/1/ip (100%) rename plugins/{cloud-gce => discovery-gce}/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/service-accounts/default/token (100%) rename plugins/{cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce => discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce}/10_basic.yaml (57%) diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java index b27048d22bd..66dda6ee774 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/Security.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/Security.java @@ -165,7 +165,7 @@ final class Security { Map 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"); diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java index 01e8e9200e9..1d399dc850f 100644 --- a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java +++ b/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", diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy index 11268245670..76b5a584226 100644 --- a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy +++ b/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"; }; diff --git a/core/src/main/resources/org/elasticsearch/plugins/plugin-install.help b/core/src/main/resources/org/elasticsearch/plugins/plugin-install.help index 0811ec7ccf2..35772158153 100644 --- a/core/src/main/resources/org/elasticsearch/plugins/plugin-install.help +++ b/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 diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java index 1ffce8d71c2..f62470071c2 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java +++ b/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"); diff --git a/dev-tools/smoke_test_rc.py b/dev-tools/smoke_test_rc.py index 3bb11ca7d67..b7bc00df0ab 100644 --- a/dev-tools/smoke_test_rc.py +++ b/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", diff --git a/docs/plugins/cloud-gce.asciidoc b/docs/plugins/discovery-gce.asciidoc similarity index 93% rename from docs/plugins/cloud-gce.asciidoc rename to docs/plugins/discovery-gce.asciidoc index 5cb241ed505..19f4903c7e8 100644 --- a/docs/plugins/cloud-gce.asciidoc +++ b/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 diff --git a/docs/plugins/discovery.asciidoc b/docs/plugins/discovery.asciidoc index 289a0204e2f..1fab9427d1a 100644 --- a/docs/plugins/discovery.asciidoc +++ b/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. -<>:: +<>:: -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. <>:: @@ -38,7 +38,7 @@ include::discovery-ec2.asciidoc[] include::discovery-azure.asciidoc[] -include::cloud-gce.asciidoc[] +include::discovery-gce.asciidoc[] include::discovery-multicast.asciidoc[] diff --git a/docs/reference/migration/migrate_3_0.asciidoc b/docs/reference/migration/migrate_3_0.asciidoc index db61b30b310..a1c55c22626 100644 --- a/docs/reference/migration/migrate_3_0.asciidoc +++ b/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 diff --git a/docs/reference/modules/discovery/gce.asciidoc b/docs/reference/modules/discovery/gce.asciidoc index bb9c89f6130..ea367d52ceb 100644 --- a/docs/reference/modules/discovery/gce.asciidoc +++ b/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. + diff --git a/plugins/cloud-gce/licenses/commons-codec-1.6.jar.sha1 b/plugins/discovery-gce/licenses/commons-codec-1.6.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/commons-codec-1.6.jar.sha1 rename to plugins/discovery-gce/licenses/commons-codec-1.6.jar.sha1 diff --git a/plugins/cloud-gce/licenses/commons-codec-LICENSE.txt b/plugins/discovery-gce/licenses/commons-codec-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/commons-codec-LICENSE.txt rename to plugins/discovery-gce/licenses/commons-codec-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/commons-codec-NOTICE.txt b/plugins/discovery-gce/licenses/commons-codec-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/commons-codec-NOTICE.txt rename to plugins/discovery-gce/licenses/commons-codec-NOTICE.txt diff --git a/plugins/cloud-gce/licenses/commons-logging-1.1.3.jar.sha1 b/plugins/discovery-gce/licenses/commons-logging-1.1.3.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/commons-logging-1.1.3.jar.sha1 rename to plugins/discovery-gce/licenses/commons-logging-1.1.3.jar.sha1 diff --git a/plugins/cloud-gce/licenses/commons-logging-LICENSE.txt b/plugins/discovery-gce/licenses/commons-logging-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/commons-logging-LICENSE.txt rename to plugins/discovery-gce/licenses/commons-logging-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/commons-logging-NOTICE.txt b/plugins/discovery-gce/licenses/commons-logging-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/commons-logging-NOTICE.txt rename to plugins/discovery-gce/licenses/commons-logging-NOTICE.txt diff --git a/plugins/cloud-gce/licenses/google-LICENSE.txt b/plugins/discovery-gce/licenses/google-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/google-LICENSE.txt rename to plugins/discovery-gce/licenses/google-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/google-NOTICE.txt b/plugins/discovery-gce/licenses/google-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/google-NOTICE.txt rename to plugins/discovery-gce/licenses/google-NOTICE.txt diff --git a/plugins/cloud-gce/licenses/google-api-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/google-api-client-1.20.0.jar.sha1 rename to plugins/discovery-gce/licenses/google-api-client-1.20.0.jar.sha1 diff --git a/plugins/cloud-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 rename to plugins/discovery-gce/licenses/google-api-services-compute-v1-rev71-1.20.0.jar.sha1 diff --git a/plugins/cloud-gce/licenses/google-http-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/google-http-client-1.20.0.jar.sha1 rename to plugins/discovery-gce/licenses/google-http-client-1.20.0.jar.sha1 diff --git a/plugins/cloud-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 rename to plugins/discovery-gce/licenses/google-http-client-jackson2-1.20.0.jar.sha1 diff --git a/plugins/cloud-gce/licenses/google-oauth-client-1.20.0.jar.sha1 b/plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/google-oauth-client-1.20.0.jar.sha1 rename to plugins/discovery-gce/licenses/google-oauth-client-1.20.0.jar.sha1 diff --git a/plugins/cloud-gce/licenses/httpclient-4.3.6.jar.sha1 b/plugins/discovery-gce/licenses/httpclient-4.3.6.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/httpclient-4.3.6.jar.sha1 rename to plugins/discovery-gce/licenses/httpclient-4.3.6.jar.sha1 diff --git a/plugins/cloud-gce/licenses/httpclient-LICENSE.txt b/plugins/discovery-gce/licenses/httpclient-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/httpclient-LICENSE.txt rename to plugins/discovery-gce/licenses/httpclient-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/httpclient-NOTICE.txt b/plugins/discovery-gce/licenses/httpclient-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/httpclient-NOTICE.txt rename to plugins/discovery-gce/licenses/httpclient-NOTICE.txt diff --git a/plugins/cloud-gce/licenses/httpcore-4.3.3.jar.sha1 b/plugins/discovery-gce/licenses/httpcore-4.3.3.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/httpcore-4.3.3.jar.sha1 rename to plugins/discovery-gce/licenses/httpcore-4.3.3.jar.sha1 diff --git a/plugins/cloud-gce/licenses/httpcore-LICENSE.txt b/plugins/discovery-gce/licenses/httpcore-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/httpcore-LICENSE.txt rename to plugins/discovery-gce/licenses/httpcore-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/httpcore-NOTICE.txt b/plugins/discovery-gce/licenses/httpcore-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/httpcore-NOTICE.txt rename to plugins/discovery-gce/licenses/httpcore-NOTICE.txt diff --git a/plugins/cloud-gce/licenses/jsr305-1.3.9.jar.sha1 b/plugins/discovery-gce/licenses/jsr305-1.3.9.jar.sha1 similarity index 100% rename from plugins/cloud-gce/licenses/jsr305-1.3.9.jar.sha1 rename to plugins/discovery-gce/licenses/jsr305-1.3.9.jar.sha1 diff --git a/plugins/cloud-gce/licenses/jsr305-LICENSE.txt b/plugins/discovery-gce/licenses/jsr305-LICENSE.txt similarity index 100% rename from plugins/cloud-gce/licenses/jsr305-LICENSE.txt rename to plugins/discovery-gce/licenses/jsr305-LICENSE.txt diff --git a/plugins/cloud-gce/licenses/jsr305-NOTICE.txt b/plugins/discovery-gce/licenses/jsr305-NOTICE.txt similarity index 100% rename from plugins/cloud-gce/licenses/jsr305-NOTICE.txt rename to plugins/discovery-gce/licenses/jsr305-NOTICE.txt diff --git a/plugins/cloud-gce/pom.xml b/plugins/discovery-gce/pom.xml similarity index 87% rename from plugins/cloud-gce/pom.xml rename to plugins/discovery-gce/pom.xml index da987f8d45b..b7c1c0a7a61 100644 --- a/plugins/cloud-gce/pom.xml +++ b/plugins/discovery-gce/pom.xml @@ -21,15 +21,15 @@ governing permissions and limitations under the License. --> 3.0.0-SNAPSHOT - cloud-gce - Plugin: Cloud: Google Compute Engine - The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism. + discovery-gce + Plugin: Discovery: Google Compute Engine + The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism. - org.elasticsearch.plugin.cloud.gce.CloudGcePlugin + org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin v1-rev71-1.20.0 - cloud_gce + discovery_gce false -Xlint:-rawtypes,-unchecked diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java similarity index 99% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java index ccb1eda3cc5..c7f45980b9b 100644 --- a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeService.java +++ b/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 { final class Fields { public static final String PROJECT = "cloud.gce.project_id"; diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java similarity index 99% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java index b205322c38c..a29c21ec526 100644 --- a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceComputeServiceImpl.java +++ b/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 implements GceComputeService { diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java similarity index 93% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java index 8db0dec3e7e..e1b8d6cf02f 100644 --- a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/GceModule.java +++ b/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 diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/network/GceNameResolver.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/network/GceNameResolver.java similarity index 100% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/cloud/gce/network/GceNameResolver.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/cloud/gce/network/GceNameResolver.java diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java similarity index 100% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceDiscovery.java diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java similarity index 100% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/discovery/gce/GceUnicastHostsProvider.java diff --git a/plugins/cloud-gce/src/main/java/org/elasticsearch/plugin/cloud/gce/CloudGcePlugin.java b/plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java similarity index 92% rename from plugins/cloud-gce/src/main/java/org/elasticsearch/plugin/cloud/gce/CloudGcePlugin.java rename to plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java index 0ff8d4ef6b7..a17c3962797 100644 --- a/plugins/cloud-gce/src/main/java/org/elasticsearch/plugin/cloud/gce/CloudGcePlugin.java +++ b/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 diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/DiscoveryGCERestIT.java similarity index 83% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java rename to plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/DiscoveryGCERestIT.java index e20965565f9..1a218394b7d 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java +++ b/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> nodePlugins() { - return pluginList(CloudGcePlugin.class); + return pluginList(GceDiscoveryPlugin.class); } - public CloudGCERestIT(@Name("yaml") RestTestCandidate testCandidate) { + public DiscoveryGCERestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceMock.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceMock.java similarity index 100% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceMock.java rename to plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeServiceMock.java diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java similarity index 80% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java rename to plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java index 90b331dd8dc..334c685aa36 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverySettingsTests.java +++ b/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)); } } diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java similarity index 100% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java rename to plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceNetworkTests.java b/plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceNetworkTests.java similarity index 100% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceNetworkTests.java rename to plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceNetworkTests.java diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/us-central1-a/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/us-central1-a/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/us-central1-a/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesindifferentzones/zones/us-central1-a/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/us-central1-a/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/us-central1-a/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/us-central1-a/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/multiplezonesandtwonodesinsamezone/zones/us-central1-a/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandnotagset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandnotagset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandnotagset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandnotagset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandonetagset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandonetagset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandonetagset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandonetagset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandtwotagset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandtwotagset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandtwotagset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithdifferenttagsandtwotagset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandnotagset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandnotagset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandnotagset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandnotagset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandonetagset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandonetagset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandonetagset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandonetagset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandtwotagsset/zones/europe-west1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandtwotagsset/zones/europe-west1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandtwotagsset/zones/europe-west1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/nodeswithsametagsandtwotagsset/zones/europe-west1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-a/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-a/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-a/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-a/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-b/instances b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-b/instances similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-b/instances rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/compute/v1/projects/zeronode43/zones/us-central1-b/instances diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/hostname b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/hostname similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/hostname rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/hostname diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/0/ip b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/0/ip similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/0/ip rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/0/ip diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/1/ip b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/1/ip similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/1/ip rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/network-interfaces/1/ip diff --git a/plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/service-accounts/default/token b/plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/service-accounts/default/token similarity index 100% rename from plugins/cloud-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/service-accounts/default/token rename to plugins/discovery-gce/src/test/resources/org/elasticsearch/discovery/gce/computeMetadata/v1/instance/service-accounts/default/token diff --git a/plugins/cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce/10_basic.yaml b/plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yaml similarity index 57% rename from plugins/cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce/10_basic.yaml rename to plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yaml index 9cff52e6ca3..8f5fbdc4ab4 100644 --- a/plugins/cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce/10_basic.yaml +++ b/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 } diff --git a/plugins/pom.xml b/plugins/pom.xml index d248c7f6fa0..d080a55e82f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -388,10 +388,10 @@ analysis-phonetic analysis-smartcn analysis-stempel - cloud-gce delete-by-query discovery-azure discovery-ec2 + discovery-gce discovery-multicast lang-expression lang-groovy diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml index 238ea9c7f6b..f9d4b79080a 100644 --- a/qa/smoke-test-plugins/pom.xml +++ b/qa/smoke-test-plugins/pom.xml @@ -271,7 +271,7 @@ org.elasticsearch.plugin - cloud-gce + discovery-gce ${elasticsearch.version} zip true diff --git a/qa/vagrant/pom.xml b/qa/vagrant/pom.xml index c0f75356113..e303da5b6a2 100644 --- a/qa/vagrant/pom.xml +++ b/qa/vagrant/pom.xml @@ -143,7 +143,7 @@ org.elasticsearch.plugin - cloud-gce + discovery-gce ${elasticsearch.version} zip diff --git a/qa/vagrant/src/test/resources/packaging/scripts/plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/scripts/plugin_test_cases.bash index eac395c99a4..bd9e28e3f09 100644 --- a/qa/vagrant/src/test/resources/packaging/scripts/plugin_test_cases.bash +++ b/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" {