From 3483c2064a006a31ea082aa9976493e3c98b28a7 Mon Sep 17 00:00:00 2001
From: Tanyi Chen <tanchen@microsoft.com>
Date: Mon, 17 Aug 2020 16:58:21 +0800
Subject: [PATCH] expose subscriptions and tenants (#14174)

* expose subscriptions and tenants

* refresh authorization manager when parameter update
---
 .../resources/ResourceManager.java            | 33 +++++++++++++---
 .../java/com/azure/resourcemanager/Azure.java | 39 +++++++++++++------
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java
index d0954d9a37048..43b8cab8a817e 100644
--- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java
+++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java
@@ -41,7 +41,7 @@ public final class ResourceManager extends ManagerBase implements HasInner<Resou
     // The sdk clients
     private final ResourceManagementClient resourceManagementClient;
     private final FeatureClient featureClient;
-//    private final SubscriptionClientImpl subscriptionClientClient;
+    private final SubscriptionClient subscriptionClient;
     private final PolicyClient policyClient;
     // The collections
     private ResourceGroups resourceGroups;
@@ -51,6 +51,8 @@ public final class ResourceManager extends ManagerBase implements HasInner<Resou
     private Providers providers;
     private PolicyDefinitions policyDefinitions;
     private PolicyAssignments policyAssignments;
+    private Subscriptions subscriptions;
+    private Tenants tenants;
 
     /**
      * Creates an instance of ResourceManager that exposes resource management API entry points.
@@ -220,11 +222,10 @@ private ResourceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCont
                 .subscriptionId(profile.subscriptionId())
                 .buildClient();
 
-        // Unread in spot bugs
-//        this.subscriptionClientClient = new SubscriptionClientBuilder()
-//                .pipeline(restClient.getHttpPipeline())
-//                .host(restClient.getBaseUrl().toString())
-//                .buildClient();
+        this.subscriptionClient = new SubscriptionClientBuilder()
+                .pipeline(httpPipeline)
+                .endpoint(profile.environment().getResourceManagerEndpoint())
+                .buildClient();
 
         this.policyClient = new PolicyClientBuilder()
                 .pipeline(httpPipeline)
@@ -303,6 +304,26 @@ public PolicyAssignments policyAssignments() {
         return policyAssignments;
     }
 
+    /**
+     * @return the subscription management API entry point
+     */
+    public Subscriptions subscriptions() {
+        if (subscriptions == null) {
+            subscriptions = new SubscriptionsImpl(subscriptionClient.getSubscriptions());
+        }
+        return subscriptions;
+    }
+
+    /**
+     * @return the tenant management API entry point
+     */
+    public Tenants tenants() {
+        if (tenants == null) {
+            tenants = new TenantsImpl(subscriptionClient.getTenants());
+        }
+        return tenants;
+    }
+
     @Override
     public ResourceManagementClient inner() {
         return this.resourceManagementClient;
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java
index 32c6a157a5eea..3a2304e5065b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java
@@ -88,6 +88,7 @@
 import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext;
 import com.azure.resourcemanager.resources.fluentcore.utils.Utils;
 import com.azure.resourcemanager.resources.models.Deployments;
+import com.azure.resourcemanager.resources.models.Features;
 import com.azure.resourcemanager.resources.models.GenericResources;
 import com.azure.resourcemanager.resources.models.PolicyAssignments;
 import com.azure.resourcemanager.resources.models.PolicyDefinitions;
@@ -134,8 +135,9 @@ public final class Azure {
     //    private final EventHubManager eventHubManager;
     private final AppPlatformManager appPlatformManager;
     private final PrivateDnsZoneManager privateDnsZoneManager;
-    private final String subscriptionId;
     private final Authenticated authenticated;
+    private final String subscriptionId;
+    private final String tenantId;
     private final SdkContext sdkContext;
 
     /**
@@ -258,7 +260,7 @@ public interface Authenticated extends AccessManagement {
     private static final class AuthenticatedImpl implements Authenticated {
         private final HttpPipeline httpPipeline;
         private final ResourceManager.Authenticated resourceManagerAuthenticated;
-        private final AuthorizationManager authorizationManager;
+        private AuthorizationManager authorizationManager;
         private SdkContext sdkContext;
         private String tenantId;
         private String subscriptionId;
@@ -322,6 +324,8 @@ public RoleAssignments roleAssignments() {
         @Override
         public Authenticated withSdkContext(SdkContext sdkContext) {
             this.sdkContext = sdkContext;
+            this.authorizationManager = AuthorizationManager.authenticate(
+                httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), sdkContext);
             return this;
         }
 
@@ -334,6 +338,8 @@ public SdkContext sdkContext() {
         public Authenticated withTenantId(String tenantId) {
             Objects.requireNonNull(tenantId);
             this.tenantId = tenantId;
+            this.authorizationManager = AuthorizationManager.authenticate(
+                httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), sdkContext);
             return this;
         }
 
@@ -378,8 +384,9 @@ private Azure(HttpPipeline httpPipeline, AzureProfile profile, Authenticated aut
         //        this.eventHubManager = EventHubManager.authenticate(restClient, subscriptionId, sdkContext);
         this.appPlatformManager = AppPlatformManager.authenticate(httpPipeline, profile, sdkContext);
         this.privateDnsZoneManager = PrivateDnsZoneManager.authenticate(httpPipeline, profile, sdkContext);
-        this.subscriptionId = profile.subscriptionId();
         this.authenticated = authenticated;
+        this.subscriptionId = profile.subscriptionId();
+        this.tenantId = profile.tenantId();
     }
 
     /** @return the currently selected subscription ID this client is authenticated to work with */
@@ -392,14 +399,24 @@ public String subscriptionId() {
         return this.subscriptionId;
     }
 
+    /** @return the currently selected tenant ID this client is authenticated to work with */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
     /** @return the currently selected subscription this client is authenticated to work with */
     public Subscription getCurrentSubscription() {
         return this.subscriptions().getById(this.subscriptionId());
     }
 
-    /** @return subscriptions that this authenticated client has access to */
+    /** @return entry point to managing subscriptions */
     public Subscriptions subscriptions() {
-        return this.authenticated.subscriptions();
+        return this.resourceManager.subscriptions();
+    }
+
+    /** @return entry point to managing tenants */
+    public Tenants tenants() {
+        return this.resourceManager.tenants();
     }
 
     /** @return entry point to managing resource groups */
@@ -423,13 +440,11 @@ public GenericResources genericResources() {
     //    public ManagementLocks managementLocks() {
     //        return this.authorizationManager.managementLocks();
     //    }
-    //
-    //    /**
-    //     * @return entry point to managing features
-    //     */
-    //    public Features features() {
-    //        return resourceManager.features();
-    //    }
+
+    /** @return entry point to managing features */
+    public Features features() {
+        return resourceManager.features();
+    }
 
     /** @return entry point to managing resource providers */
     public Providers providers() {