Azure · jianghaolu · Nov 10, 2018 · Nov 9, 2018
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
     <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
     <testMode>playback</testMode>
     <playbackServerPort>11080</playbackServerPort>
-    <runtime.version>1.6.1</runtime.version>
+    <runtime.version>1.6.3</runtime.version>
     <fluentsdk.version>1.14.0</fluentsdk.version>
   </properties>
 
@@ -57,17 +57,17 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.7.2</version>
+        <version>2.9.4</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.7.2</version>
+        <version>2.9.4</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.7.0</version>
+        <version>2.9.0</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>

diff --git a/profiles/2018-03-01-hybrid/azure/pom.xml b/profiles/2018-03-01-hybrid/azure/pom.xml
@@ -69,6 +69,11 @@
             <artifactId>azure-mgmt-dns</artifactId>
             <version>1.0.0-beta-1</version>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure.resources.v2016_06_01</groupId>
+            <artifactId>azure-mgmt-subscriptions</artifactId>
+            <version>1.0.0-beta</version>
+        </dependency>
         <dependency>
             <groupId>com.microsoft.azure.resources.v2018_02_01</groupId>
             <artifactId>azure-mgmt-resources</artifactId>

diff --git a/...d/azure/src/main/java/com/microsoft/azure/management/profile_2018_03_01_hybrid/Azure.java b/...d/azure/src/main/java/com/microsoft/azure/management/profile_2018_03_01_hybrid/Azure.java
@@ -8,10 +8,10 @@
 
 import com.microsoft.azure.AzureEnvironment;
 import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.CloudException;
+import com.microsoft.azure.PagedList;
 import com.microsoft.azure.arm.resources.AzureConfigurable;
 import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
-import com.microsoft.azure.arm.utils.ResourceManagerThrottlingInterceptor;
-import com.microsoft.azure.credentials.ApplicationTokenCredentials;
 import com.microsoft.azure.credentials.AzureTokenCredentials;
 import com.microsoft.azure.management.appservice.v2016_03_01.BillingMeters;
 import com.microsoft.azure.management.appservice.v2016_03_01.Certificates;
@@ -22,8 +22,8 @@
 import com.microsoft.azure.management.appservice.v2016_08_01.WebApps;
 import com.microsoft.azure.management.appservice.v2016_09_01.AppServiceEnvironments;
 import com.microsoft.azure.management.appservice.v2016_09_01.AppServicePlans;
-import com.microsoft.azure.management.policy.v2016_12_01.PolicyAssignments;
-import com.microsoft.azure.management.policy.v2016_12_01.PolicyDefinitions;
+import com.microsoft.azure.management.authorization.v2015_07_01.RoleAssignments;
+import com.microsoft.azure.management.authorization.v2015_07_01.RoleDefinitions;
 import com.microsoft.azure.management.compute.v2017_03_30.AvailabilitySets;
 import com.microsoft.azure.management.compute.v2017_03_30.Disks;
 import com.microsoft.azure.management.compute.v2017_03_30.Images;
@@ -42,6 +42,7 @@
 import com.microsoft.azure.management.compute.v2017_03_30.VirtualMachines;
 import com.microsoft.azure.management.dns.v2016_04_01.RecordSets;
 import com.microsoft.azure.management.dns.v2016_04_01.Zones;
+import com.microsoft.azure.management.keyvault.v2016_10_01.Vaults;
 import com.microsoft.azure.management.network.v2017_10_01.ApplicationGateways;
 import com.microsoft.azure.management.network.v2017_10_01.ApplicationSecurityGroups;
 import com.microsoft.azure.management.network.v2017_10_01.AvailableEndpointServices;
@@ -78,7 +79,11 @@
 import com.microsoft.azure.management.network.v2017_10_01.VirtualNetworkGateways;
 import com.microsoft.azure.management.network.v2017_10_01.VirtualNetworkPeerings;
 import com.microsoft.azure.management.network.v2017_10_01.VirtualNetworks;
-import com.microsoft.azure.management.resources.fluentcore.utils.ProviderRegistrationInterceptor;
+import com.microsoft.azure.management.policy.v2016_12_01.PolicyAssignments;
+import com.microsoft.azure.management.policy.v2016_12_01.PolicyDefinitions;
+import com.microsoft.azure.management.resources.v2016_06_01.Subscription;
+import com.microsoft.azure.management.resources.v2016_06_01.Subscriptions;
+import com.microsoft.azure.management.resources.v2016_06_01.Tenants;
 import com.microsoft.azure.management.resources.v2018_02_01.DeploymentOperations;
 import com.microsoft.azure.management.resources.v2018_02_01.Deployments;
 import com.microsoft.azure.management.resources.v2018_02_01.Providers;
@@ -89,6 +94,8 @@
 import com.microsoft.azure.serializer.AzureJacksonAdapter;
 import com.microsoft.rest.RestClient;
 
+import java.io.IOException;
+
 /**
  * Entry point to Azure ContainerService resource management.
  */
@@ -99,9 +106,12 @@ public final class Azure {
     private com.microsoft.azure.management.network.v2017_10_01.implementation.NetworkManager networkManager20171001;
     private com.microsoft.azure.management.dns.v2016_04_01.implementation.NetworkManager dnsManager20160401;
     private com.microsoft.azure.management.storage.v2016_01_01.implementation.StorageManager storageManager20160101;
+    private com.microsoft.azure.management.keyvault.v2016_10_01.implementation.KeyVaultManager keyVaultManager20161001;
     private com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager appServiceManager20160301;
     private com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager appServiceManager20160801;
     private com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager appServiceManager20160901;
+    private final String subscriptionId;
+    private final Authenticated authenticated;
 
     /**
      * Get a Configurable instance that can be used to create Azure with optional configuration.
@@ -111,43 +121,32 @@ public final class Azure {
     public static Configurable configure() {
         return new Azure.ConfigurableImpl();
     }
+
     /**
-     * Creates an instance of Azure that exposes ContainerService resource management API entry points.
+     * Creates an instance of Azure.Authenticated that exposes subscription, tenant, and authorization API entry points.
      *
      * @param credentials the credentials to use
-     * @param subscriptionId the subscription UUID
-     * @return the Azure
+     * @return the Azure.Authenticated
      */
-    public static Azure authenticate(AzureTokenCredentials credentials, String subscriptionId) {
-        return new Azure(new RestClient.Builder()
-                .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
-                .withCredentials(credentials)
-                .withSerializerAdapter(new AzureJacksonAdapter())
-                .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
-                .build(), subscriptionId);
-    }
-
-    public static Azure authenticate(ApplicationTokenCredentials credentials, String subscriptionId) {
-        return new Azure(new RestClient.Builder()
+    public static Authenticated authenticate(AzureTokenCredentials credentials) {
+        return new AuthenticatedImpl(new RestClient.Builder()
                 .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
                 .withCredentials(credentials)
                 .withSerializerAdapter(new AzureJacksonAdapter())
                 .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
-                .withInterceptor(new ProviderRegistrationInterceptor(credentials))
-                .withInterceptor(new ResourceManagerThrottlingInterceptor())
-                .build(), subscriptionId);
+                .build());
     }
 
     /**
      * Creates an instance of Azure that exposes ContainerService resource management API entry points.
      *
      * @param restClient the RestClient to be used for API calls.
-     * @param subscriptionId the subscription UUID
-     * @return the Azure
+     * @return the Azure.Authenticated
      */
-    public static Azure authenticate(RestClient restClient, String subscriptionId) {
-        return new Azure(restClient, subscriptionId);
+    public static Authenticated authenticate(RestClient restClient) {
+        return new AuthenticatedImpl(restClient);
     }
+
     /**
      * The interface allowing configurations to be set.
      */
@@ -162,6 +161,124 @@ public interface Configurable extends AzureConfigurable<Configurable> {
         Azure authenticate(AzureTokenCredentials credentials, String subscriptionId);
     }
 
+    /**
+     * Provides authenticated access to a subset of Azure APIs that do not require a specific subscription.
+     * <p>
+     * To access the subscription-specific APIs, use {@link Authenticated#withSubscription(String)},
+     * or withDefaultSubscription() if a default subscription has already been previously specified
+     * (for example, in a previously specified authentication file).
+     */
+    public interface Authenticated {
+        /**
+         * Entry point to subscription management APIs.
+         *
+         * @return Subscriptions interface providing access to subscription management
+         */
+        Subscriptions subscriptions();
+
+        /**
+         * Entry point to tenant management APIs.
+         *
+         * @return Tenants interface providing access to tenant management
+         */
+        Tenants tenants();
+
+        /**
+         * Selects a specific subscription for the APIs to work with.
+         * <p>
+         * Most Azure APIs require a specific subscription to be selected.
+         * @param subscriptionId the ID of the subscription
+         * @return an authenticated Azure client configured to work with the specified subscription
+         */
+        Azure withSubscription(String subscriptionId);
+
+        /**
+         * Selects the default subscription as the subscription for the APIs to work with.
+         * <p>
+         * The default subscription can be specified inside the authentication file using {@link Azure#authenticate(AzureTokenCredentials)}.
+         * If no default subscription has been previously provided, the first subscription as
+         * returned by {@link Authenticated#subscriptions()} will be selected.
+         * @return an authenticated Azure client configured to work with the default subscription
+         * @throws CloudException exception thrown from Azure
+         * @throws IOException exception thrown from serialization/deserialization
+         */
+        Azure withDefaultSubscription() throws CloudException, IOException;
+
+        /**
+         * Entry point to role definition management APIs.
+         *
+         * @return RoleDefinitions interface providing access to tenant management
+         */
+        RoleDefinitions roleDefinitions();
+
+        /**
+         * Entry point to role assignment management APIs.
+         *
+         * @return RoleAssignments interface providing access to tenant management
+         */
+        RoleAssignments roleAssignments();
+    }
+
+    /**
+     * The implementation for the Authenticated interface.
+     */
+    private static final class AuthenticatedImpl implements Authenticated {
+        private final RestClient restClient;
+        private final com.microsoft.azure.management.resources.v2016_06_01.implementation.Manager subscriptionManager20160601;
+        private final com.microsoft.azure.management.authorization.v2015_07_01.implementation.AuthorizationManager authorizationManager20150701;
+        private String defaultSubscription;
+
+        private AuthenticatedImpl(RestClient restClient) {
+            this.subscriptionManager20160601 = com.microsoft.azure.management.resources.v2016_06_01.implementation.Manager.authenticate(restClient);
+            this.authorizationManager20150701 = com.microsoft.azure.management.authorization.v2015_07_01.implementation.AuthorizationManager.authenticate(restClient, null);
+            this.restClient = restClient;
+        }
+
+        private AuthenticatedImpl withDefaultSubscription(String subscriptionId) {
+            this.defaultSubscription = subscriptionId;
+            return this;
+        }
+
+        @Override
+        public Subscriptions subscriptions() {
+            return subscriptionManager20160601.subscriptions();
+        }
+
+        @Override
+        public Tenants tenants() {
+            return subscriptionManager20160601.tenants();
+        }
+
+        @Override
+        public RoleDefinitions roleDefinitions() {
+            return authorizationManager20150701.roleDefinitions();
+        }
+
+        @Override
+        public RoleAssignments roleAssignments() {
+            return authorizationManager20150701.roleAssignments();
+        }
+
+        @Override
+        public Azure withSubscription(String subscriptionId) {
+            return new Azure(restClient, subscriptionId, this);
+        }
+
+        @Override
+        public Azure withDefaultSubscription() throws CloudException, IOException {
+            if (this.defaultSubscription != null) {
+                return withSubscription(this.defaultSubscription);
+            } else {
+                PagedList<Subscription> subs = this.subscriptions().list();
+                if (!subs.isEmpty()) {
+                    return withSubscription(subs.get(0).subscriptionId());
+                } else {
+                    return withSubscription(null);
+                }
+            }
+        }
+    }
+
     /**
      * @return Entry point to manage PolicyDefinitions.
      */
@@ -617,6 +734,13 @@ public com.microsoft.azure.management.storage.v2016_01_01.Usages storageUsages()
         return this.storageManager20160101.usages();
     }
 
+    /**
+     * @return Entry point to manage key vaults.
+     */
+    public Vaults keyVaults() {
+        return this.keyVaultManager20161001.vaults();
+    }
+
     /**
      * @return Entry point to manage Certificates.
      */
@@ -692,11 +816,11 @@ public AppServicePlans appServicePlans() {
      */
     private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
         public Azure authenticate(AzureTokenCredentials credentials, String subscriptionId) {
-            return Azure.authenticate(buildRestClient(credentials), subscriptionId);
+            return Azure.authenticate(buildRestClient(credentials)).withSubscription(subscriptionId);
         }
     }
 
-    private Azure(RestClient restClient, String subscriptionId) {
+    private Azure(RestClient restClient, String subscriptionId, Authenticated authenticated) {
         this.computeManager20170330 = com.microsoft.azure.management.compute.v2017_03_30.implementation.ComputeManager.authenticate(restClient, subscriptionId);
         this.resourceManager20180201 = com.microsoft.azure.management.resources.v2018_02_01.implementation.ResourcesManager.authenticate(restClient, subscriptionId);
         this.authorizationManager20161201 = com.microsoft.azure.management.policy.v2016_12_01.implementation.PolicyManager.authenticate(restClient, subscriptionId);
@@ -706,5 +830,8 @@ private Azure(RestClient restClient, String subscriptionId) {
         this.appServiceManager20160301 = com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager.authenticate(restClient, subscriptionId);
         this.appServiceManager20160801 = com.microsoft.azure.management.appservice.v2016_08_01.implementation.AppServiceManager.authenticate(restClient, subscriptionId);
         this.appServiceManager20160901 = com.microsoft.azure.management.appservice.v2016_09_01.implementation.AppServiceManager.authenticate(restClient, subscriptionId);
+        this.keyVaultManager20161001 = com.microsoft.azure.management.keyvault.v2016_10_01.implementation.KeyVaultManager.authenticate(restClient, subscriptionId);
+        this.subscriptionId = subscriptionId;
+        this.authenticated = authenticated;
     }
 }
diff --git a/...re/src/test/java/com/microsoft/azure/management/profile_2018_03_01_hybrid/AzureTests.java b/...re/src/test/java/com/microsoft/azure/management/profile_2018_03_01_hybrid/AzureTests.java
@@ -11,6 +11,7 @@
 import com.microsoft.azure.arm.core.TestBase;
 import com.microsoft.azure.arm.resources.Region;
 import com.microsoft.azure.arm.utils.SdkContext;
+import com.microsoft.azure.management.resources.v2016_06_01.Subscription;
 import com.microsoft.azure.management.resources.v2018_02_01.ResourceGroup;
 import com.microsoft.azure.management.storage.v2016_01_01.Kind;
 import com.microsoft.azure.management.storage.v2016_01_01.Sku;
@@ -20,24 +21,30 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 public class AzureTests extends TestBase {
-    protected static Azure azure;
+    protected static Azure.Authenticated authenticated;
     private static String rgName;
 
     @Override
     protected void initializeClients(RestClient restClient, String defaultSubscription, String domain) {
-        azure = Azure.authenticate(restClient, defaultSubscription);
+        authenticated = Azure.authenticate(restClient);
     }
 
     @Override
     protected void cleanUpResources() {
-        azure.resourceGroups().deleteAsync(rgName).await();
     }
 
     @Test
-    public void firstTest() {
-        ResourceGroup rg = azure.resourceGroups().listAsync()
-                .toBlocking().last();
+    public void firstTest() throws Exception {
+        List<Subscription> subscriptions = authenticated.subscriptions().list();
+
+        if (subscriptions == null || subscriptions.size() == 0) {
+            Assert.fail("Credential isn't assigned to any subscription");
+        }
+
+        Azure azure = authenticated.withSubscription(subscriptions.get(0).subscriptionId());
 
         rgName = SdkContext.randomResourceName("rg", 20);
         String saName = SdkContext.randomResourceName("sa", 20);

diff --git a/profiles/2018-03-01-hybrid/pom.xml b/profiles/2018-03-01-hybrid/pom.xml
@@ -110,6 +110,7 @@
     <!-- roll up pakcages -->
     <module>./azure</module>
     <!-- multi api -->
+    <module>../../resources/resource-manager/v2016_06_01</module>
     <module>../../resources/resource-manager/v2018_02_01</module>
     <module>../../authorization/resource-manager/v2015_07_01</module>
     <module>../../policy/resource-manager/v2016_12_01</module>

diff --git a/resources/resource-manager/v2016_06_01/pom.xml b/resources/resource-manager/v2016_06_01/pom.xml
@@ -14,7 +14,7 @@
         <version>0.0.3-beta</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-</artifactId>
+    <artifactId>azure-mgmt-subscriptions</artifactId>
     <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for  Management</name>