Skip to content

Commit

Permalink
Mgmt refactor (#11969)
Browse files Browse the repository at this point in the history
* move class from resourcemanager to fluentcore

* rename CosmosDBManager to CosmosManager

* rename GraphRbacManager to AuthorizationManager

* rbacManager to authorizationManager
  • Loading branch information
ChenTanyi authored Jun 9, 2020
1 parent c382b9a commit b702365
Show file tree
Hide file tree
Showing 64 changed files with 329 additions and 389 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.azure.resourcemanager.appservice.models.AppServicePlans;
import com.azure.resourcemanager.appservice.models.FunctionApps;
import com.azure.resourcemanager.appservice.models.WebApps;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.keyvault.KeyVaultManager;
import com.azure.resourcemanager.resources.fluentcore.arm.AzureConfigurable;
import com.azure.resourcemanager.resources.fluentcore.arm.implementation.AzureConfigurableImpl;
Expand All @@ -30,7 +30,7 @@
/** Entry point to Azure storage resource management. */
public final class AppServiceManager extends Manager<AppServiceManager, WebSiteManagementClient> {
// Managers
private GraphRbacManager rbacManager;
private AuthorizationManager authorizationManager;
private KeyVaultManager keyVaultManager;
private StorageManager storageManager;
// Collections
Expand Down Expand Up @@ -116,12 +116,12 @@ private AppServiceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCo
sdkContext);
keyVaultManager = KeyVaultManager.authenticate(httpPipeline, profile, sdkContext);
storageManager = StorageManager.authenticate(httpPipeline, profile, sdkContext);
rbacManager = GraphRbacManager.authenticate(httpPipeline, profile, sdkContext);
authorizationManager = AuthorizationManager.authenticate(httpPipeline, profile, sdkContext);
}

/** @return the Graph RBAC manager instance. */
public GraphRbacManager rbacManager() {
return rbacManager;
public AuthorizationManager authorizationManager() {
return authorizationManager;
}

/** @return the key vault manager instance. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ abstract class WebAppBaseImpl<FluentT extends WebAppBase, FluentImplT extends We
this.diagnosticLogs = new WebAppDiagnosticLogsImpl<>(logConfig, this);
}

webAppMsiHandler = new WebAppMsiHandler(manager.rbacManager(), this);
webAppMsiHandler = new WebAppMsiHandler(manager.authorizationManager(), this);
normalizeProperties();
isInCreateMode = inner() == null || inner().id() == null;
if (!isInCreateMode) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.azure.resourcemanager.appservice.models.ManagedServiceIdentityUserAssignedIdentities;
import com.azure.resourcemanager.appservice.fluent.inner.SiteInner;
import com.azure.resourcemanager.appservice.fluent.inner.SitePatchResourceInner;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper;
import com.azure.resourcemanager.msi.models.Identity;
import com.azure.resourcemanager.resources.fluentcore.dag.TaskGroup;
Expand Down Expand Up @@ -39,12 +39,12 @@ public class WebAppMsiHandler extends RoleAssignmentHelper {
/**
* Creates VirtualMachineMsiHandler.
*
* @param rbacManager the graph rbac manager
* @param authorizationManager the graph rbac manager
* @param webAppBase the web app to which MSI extension needs to be installed and for which role assignments needs
* to be created
*/
WebAppMsiHandler(final GraphRbacManager rbacManager, WebAppBaseImpl webAppBase) {
super(rbacManager, webAppBase.taskGroup(), webAppBase.idProvider());
WebAppMsiHandler(final AuthorizationManager authorizationManager, WebAppBaseImpl webAppBase) {
super(authorizationManager, webAppBase.taskGroup(), webAppBase.idProvider());
this.webAppBase = webAppBase;
this.creatableIdentityKeys = new ArrayList<>();
this.userAssignedIdentities = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext;

/** Entry point to Azure Graph RBAC management. */
public final class GraphRbacManager implements HasInner<GraphRbacManagementClient> {
public final class AuthorizationManager implements HasInner<GraphRbacManagementClient> {
private final String tenantId;
private final SdkContext sdkContext;
// The sdk clients
Expand All @@ -46,7 +46,7 @@ public final class GraphRbacManager implements HasInner<GraphRbacManagementClien
* @param profile the profile to use
* @return the GraphRbacManager instance
*/
public static GraphRbacManager authenticate(TokenCredential credential, AzureProfile profile) {
public static AuthorizationManager authenticate(TokenCredential credential, AzureProfile profile) {
return authenticate(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile);
}

Expand All @@ -57,7 +57,7 @@ public static GraphRbacManager authenticate(TokenCredential credential, AzurePro
* @param profile the profile used in Active Directory
* @return the interface exposing Graph RBAC management API entry points that work across subscriptions
*/
public static GraphRbacManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
public static AuthorizationManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
return authenticate(httpPipeline, profile, new SdkContext());
}

Expand All @@ -69,9 +69,9 @@ public static GraphRbacManager authenticate(HttpPipeline httpPipeline, AzureProf
* @param sdkContext the sdk context
* @return the interface exposing Graph RBAC management API entry points that work across subscriptions
*/
public static GraphRbacManager authenticate(
public static AuthorizationManager authenticate(
HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) {
return new GraphRbacManager(httpPipeline, profile, sdkContext);
return new AuthorizationManager(httpPipeline, profile, sdkContext);
}

/**
Expand All @@ -80,7 +80,7 @@ public static GraphRbacManager authenticate(
* @return the instance allowing configurations
*/
public static Configurable configure() {
return new GraphRbacManager.ConfigurableImpl();
return new AuthorizationManager.ConfigurableImpl();
}

@Override
Expand All @@ -97,18 +97,18 @@ public interface Configurable extends AzureConfigurable<Configurable> {
* @param profile the profile to use
* @return the interface exposing resource management API entry points that work across subscriptions
*/
GraphRbacManager authenticate(TokenCredential credential, AzureProfile profile);
AuthorizationManager authenticate(TokenCredential credential, AzureProfile profile);
}

/** The implementation for Configurable interface. */
private static class ConfigurableImpl extends AzureConfigurableImpl<Configurable> implements Configurable {
public GraphRbacManager authenticate(TokenCredential credential, AzureProfile profile) {
return GraphRbacManager
public AuthorizationManager authenticate(TokenCredential credential, AzureProfile profile) {
return AuthorizationManager
.authenticate(HttpPipelineProvider.buildHttpPipeline(credential, profile), profile);
}
}

private GraphRbacManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) {
private AuthorizationManager(HttpPipeline httpPipeline, AzureProfile profile, SdkContext sdkContext) {
this.graphRbacManagementClient =
new GraphRbacManagementClientBuilder()
.pipeline(httpPipeline)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.resourcemanager.authorization.implementation;

import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryApplication;
import com.azure.resourcemanager.authorization.models.ApplicationCreateParameters;
import com.azure.resourcemanager.authorization.models.ApplicationUpdateParameters;
Expand Down Expand Up @@ -31,13 +31,13 @@ class ActiveDirectoryApplicationImpl
ActiveDirectoryApplication.Definition,
ActiveDirectoryApplication.Update,
HasCredential<ActiveDirectoryApplicationImpl> {
private GraphRbacManager manager;
private AuthorizationManager manager;
private ApplicationCreateParameters createParameters;
private ApplicationUpdateParameters updateParameters;
private Map<String, PasswordCredential> cachedPasswordCredentials;
private Map<String, CertificateCredential> cachedCertificateCredentials;

ActiveDirectoryApplicationImpl(ApplicationInner innerObject, GraphRbacManager manager) {
ActiveDirectoryApplicationImpl(ApplicationInner innerObject, AuthorizationManager manager) {
super(innerObject.displayName(), innerObject);
this.manager = manager;
this.createParameters = new ApplicationCreateParameters().withDisplayName(innerObject.displayName());
Expand Down Expand Up @@ -312,7 +312,7 @@ public String id() {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.core.http.rest.PagedFlux;
import com.azure.core.http.rest.PagedIterable;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryApplication;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryApplications;
import com.azure.resourcemanager.authorization.models.GraphErrorException;
Expand All @@ -20,13 +20,13 @@
/** The implementation of Applications and its parent interfaces. */
public class ActiveDirectoryApplicationsImpl
extends CreatableResourcesImpl<ActiveDirectoryApplication, ActiveDirectoryApplicationImpl, ApplicationInner>
implements ActiveDirectoryApplications, HasManager<GraphRbacManager>, HasInner<ApplicationsClient> {
implements ActiveDirectoryApplications, HasManager<AuthorizationManager>, HasInner<ApplicationsClient> {
private ApplicationsClient innerCollection;
private GraphRbacManager manager;
private AuthorizationManager manager;

public ActiveDirectoryApplicationsImpl(final ApplicationsClient client, final GraphRbacManager graphRbacManager) {
public ActiveDirectoryApplicationsImpl(final ApplicationsClient client, final AuthorizationManager authorizationManager) {
this.innerCollection = client;
this.manager = graphRbacManager;
this.manager = authorizationManager;
}

@Override
Expand Down Expand Up @@ -116,7 +116,7 @@ public ActiveDirectoryApplicationImpl define(String name) {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.resourcemanager.authorization.implementation;

import com.azure.core.http.rest.PagedFlux;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroup;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryObject;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryUser;
Expand All @@ -28,12 +28,12 @@ class ActiveDirectoryGroupImpl
extends CreatableUpdatableImpl<ActiveDirectoryGroup, ADGroupInner, ActiveDirectoryGroupImpl>
implements ActiveDirectoryGroup, ActiveDirectoryGroup.Definition, ActiveDirectoryGroup.Update {

private final GraphRbacManager manager;
private final AuthorizationManager manager;
private GroupCreateParameters createParameters;
private Set<String> membersToAdd;
private Set<String> membersToRemove;

ActiveDirectoryGroupImpl(ADGroupInner innerModel, GraphRbacManager manager) {
ActiveDirectoryGroupImpl(ADGroupInner innerModel, AuthorizationManager manager) {
super(innerModel.displayName(), innerModel);
this.manager = manager;
this.createParameters =
Expand Down Expand Up @@ -188,7 +188,7 @@ public String id() {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.core.http.rest.PagedFlux;
import com.azure.core.http.rest.PagedIterable;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroup;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroups;
import com.azure.resourcemanager.authorization.models.GraphErrorException;
Expand All @@ -18,9 +18,9 @@
public class ActiveDirectoryGroupsImpl
extends CreatableWrappersImpl<ActiveDirectoryGroup, ActiveDirectoryGroupImpl, ADGroupInner>
implements ActiveDirectoryGroups {
private final GraphRbacManager manager;
private final AuthorizationManager manager;

public ActiveDirectoryGroupsImpl(final GraphRbacManager manager) {
public ActiveDirectoryGroupsImpl(final AuthorizationManager manager) {
this.manager = manager;
}

Expand Down Expand Up @@ -88,7 +88,7 @@ public Mono<Void> deleteByIdAsync(String id) {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.resourcemanager.authorization.implementation;

import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryUser;
import com.azure.resourcemanager.authorization.models.PasswordProfile;
import com.azure.resourcemanager.authorization.models.UserCreateParameters;
Expand All @@ -17,12 +17,12 @@
class ActiveDirectoryUserImpl extends CreatableUpdatableImpl<ActiveDirectoryUser, UserInner, ActiveDirectoryUserImpl>
implements ActiveDirectoryUser, ActiveDirectoryUser.Definition, ActiveDirectoryUser.Update {

private final GraphRbacManager manager;
private final AuthorizationManager manager;
private UserCreateParameters createParameters;
private UserUpdateParameters updateParameters;
private String emailAlias;

ActiveDirectoryUserImpl(UserInner innerObject, GraphRbacManager manager) {
ActiveDirectoryUserImpl(UserInner innerObject, AuthorizationManager manager) {
super(innerObject.displayName(), innerObject);
this.manager = manager;
this.createParameters = new UserCreateParameters().withDisplayName(name()).withAccountEnabled(true);
Expand Down Expand Up @@ -163,7 +163,7 @@ public String id() {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.core.http.rest.PagedFlux;
import com.azure.core.http.rest.PagedIterable;
import com.azure.resourcemanager.authorization.GraphRbacManager;
import com.azure.resourcemanager.authorization.AuthorizationManager;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryUser;
import com.azure.resourcemanager.authorization.models.ActiveDirectoryUsers;
import com.azure.resourcemanager.authorization.models.GraphErrorException;
Expand All @@ -19,9 +19,9 @@
public class ActiveDirectoryUsersImpl
extends CreatableWrappersImpl<ActiveDirectoryUser, ActiveDirectoryUserImpl, UserInner>
implements ActiveDirectoryUsers, HasInner<UsersClient> {
private final GraphRbacManager manager;
private final AuthorizationManager manager;

public ActiveDirectoryUsersImpl(final GraphRbacManager manager) {
public ActiveDirectoryUsersImpl(final AuthorizationManager manager) {
this.manager = manager;
}

Expand Down Expand Up @@ -108,7 +108,7 @@ public Mono<Void> deleteByIdAsync(String id) {
}

@Override
public GraphRbacManager manager() {
public AuthorizationManager manager() {
return this.manager;
}

Expand Down
Loading

0 comments on commit b702365

Please sign in to comment.