Use Azure Java Management SDK 0.7.0

This first version adds `azure-management` 0.7.0 instead of using our own XML implementation.
We can now have more control and give more options to the users.

We now support different keystore types using `cloud.azure.management.keystore.type`:

* `pkcs12`
* `jceks`
* `jks`

Closes elastic#38

Author: dadoonet

README.md

@@ -302,12 +302,15 @@ And add the following lines:
 # If you don't remember your account id, you may get it with `azure account list`
 cloud:
     azure:
-        keystore: /home/elasticsearch/azurekeystore.pkcs12
-        password: your_password_for_keystore
-        subscription_id: your_azure_subscription_id
-        service_name: your_azure_cloud_service_name
+        management:
+             subscription.id: your_azure_subscription_id
+             cloud.service.name: your_azure_cloud_service_name
+             keystore:
+                   path: /home/elasticsearch/azurekeystore.pkcs12
+                   password: your_password_for_keystore
+
 discovery:
-        type: azure
+    type: azure
 
 # Recommended (warning: non durable disk)
 # path.data: /mnt/resource/elasticsearch/data

pom.xml

@@ -91,6 +91,17 @@ governing permissions and limitations under the License. -->
             <version>2.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-management-compute</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-management</artifactId>
+            <version>0.7.0</version>
+        </dependency>
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

src/main/assemblies/plugin.xml

@@ -31,6 +31,8 @@ governing permissions and limitations under the License. -->
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
                 <include>com.microsoft.azure:azure-storage</include>
+                <include>com.microsoft.azure:azure-management</include>
+                <include>com.microsoft.azure:azure-management-compute</include>
             </includes>
         </dependencySet>
     </dependencySets>

src/main/java/org/elasticsearch/cloud/azure/AzureServiceDisableException.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cloud.azure;
+
+import org.elasticsearch.ElasticsearchIllegalStateException;
+
+public class AzureServiceDisableException extends ElasticsearchIllegalStateException {
+    public AzureServiceDisableException() {
+        super(null);
+    }
+
+    public AzureServiceDisableException(String msg) {
+        super(msg);
+    }
+
+    public AzureServiceDisableException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

src/main/java/org/elasticsearch/cloud/azure/AzureServiceRemoteException.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.cloud.azure;
+
+import org.elasticsearch.ElasticsearchIllegalStateException;
+
+public class AzureServiceRemoteException extends ElasticsearchIllegalStateException {
+    public AzureServiceRemoteException() {
+        super(null);
+    }
+
+    public AzureServiceRemoteException(String msg) {
+        super(msg);
+    }
+
+    public AzureServiceRemoteException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}

src/main/java/org/elasticsearch/cloud/azure/AzureSettingsFilter.java

@@ -31,9 +31,13 @@ public class AzureSettingsFilter implements SettingsFilter.Filter {
 
     @Override
     public void filter(ImmutableSettings.Builder settings) {
+        // Cloud global settings
+        settings.remove("cloud.azure." + AzureComputeService.Fields.REFRESH);
+
         // Cloud management API settings
         settings.remove("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_PATH);
         settings.remove("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_PASSWORD);
+        settings.remove("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_TYPE);
         settings.remove("cloud.azure.management." + AzureComputeService.Fields.SUBSCRIPTION_ID);
         settings.remove("cloud.azure.management." + AzureComputeService.Fields.SERVICE_NAME);
 

src/main/java/org/elasticsearch/cloud/azure/Instance.java

@@ -19,9 +19,7 @@
 
 package org.elasticsearch.cloud.azure.management;
 
-import org.elasticsearch.cloud.azure.Instance;
-
-import java.util.Set;
+import com.microsoft.windowsazure.management.compute.models.HostedServiceGetDetailedResponse;
 
 /**
  *
@@ -49,12 +47,13 @@ static public final class Fields {
         // Keystore settings
         public static final String KEYSTORE_PATH = "keystore.path";
         public static final String KEYSTORE_PASSWORD = "keystore.password";
+        public static final String KEYSTORE_TYPE = "keystore.type";
 
         public static final String REFRESH = "refresh_interval";
 
         public static final String HOST_TYPE = "host.type";
         public static final String ENDPOINT_NAME = "endpoint.name";
     }
 
-    public Set<Instance> instances();
+    public HostedServiceGetDetailedResponse getServiceDetails();
 }