Support multiple client types for base implementations

build.gradle

@@ -70,6 +70,7 @@ dependencies {
 
     implementation enforcedPlatform('com.azure:azure-sdk-bom:1.2.25')
     implementation 'com.azure.resourcemanager:azure-resourcemanager:2.40.0'
+    implementation 'com.azure.resourcemanager:azure-resourcemanager-communication:2.1.0'
     implementation 'com.azure:azure-security-keyvault-certificates'
     implementation 'com.azure:azure-security-keyvault-keys'
     implementation 'com.azure:azure-security-keyvault-secrets'

src/main/java/gyro/azure/AbstractAzureCommand.java

@@ -97,7 +97,7 @@ public AzureResourceManager getResourceManagerClient() {
                 getCredential()));
         }
 
-        return AzureResource.createClient((AzureCredentials) credentials);
+        return AzureResource.createClient(AzureResourceManager.class, (AzureCredentials) credentials);
     }
 
     public TokenCredential getTokenCredential() {

src/main/java/gyro/azure/AzureCredentials.java

@@ -22,9 +22,11 @@
 
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.http.okhttp.OkHttpAsyncHttpClientBuilder;
+import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.identity.ClientSecretCredentialBuilder;
 import com.azure.resourcemanager.AzureResourceManager;
+import com.azure.resourcemanager.communication.CommunicationManager;
 import com.psddev.dari.util.ObjectUtils;
 import com.psddev.dari.util.StringUtils;
 import gyro.core.GyroException;
@@ -60,7 +62,7 @@ public void setLogLevel(String logLevel) {
         this.logLevel = logLevel;
     }
 
-    public AzureResourceManager createClient() {
+    public <T> T createClient(Class<T> clientClass) {
         Properties properties;
 
         try (InputStream input = openInput(getCredentialFilePath())) {
@@ -80,21 +82,52 @@ public AzureResourceManager createClient() {
 
         String subscription = ObjectUtils.to(String.class, properties.get("subscription"));
 
-        AzureProfile azureProfile = new AzureProfile(tenant, subscription, com.azure.core.management.AzureEnvironment.AZURE);
+        AzureProfile azureProfile = new AzureProfile(tenant, subscription, AzureEnvironment.AZURE);
 
-        try {
-            AzureResourceManager.Authenticated authenticated = AzureResourceManager
-                .configure()
-                .withHttpClient(new OkHttpAsyncHttpClientBuilder().build())
-                .authenticate(credential, azureProfile);
+        if (clientClass.getSimpleName().equals("CommunicationManager")) {
+            try {
+                CommunicationManager client = CommunicationManager
+                    .configure()
+                    .withHttpClient(new OkHttpAsyncHttpClientBuilder().build())
+                    .authenticate(credential, azureProfile);
 
+                if (clientClass.isInstance(client)) {
+                    return clientClass.cast(client);
+                }
 
-            return StringUtils.isBlank(subscription)
-                ? authenticated.withDefaultSubscription()
-                : authenticated.withSubscription(subscription);
+                throw new GyroException(
+                    String.format("Unable to create %s client", clientClass.getSimpleName()));
 
-        } catch (Exception error) {
-            throw new GyroException(error.getMessage(), error);
+            } catch (Exception error) {
+                throw new GyroException(error.getMessage(), error);
+            }
+
+        } else if (clientClass.getSimpleName().equals("AzureResourceManager")) {
+            try {
+                AzureResourceManager.Authenticated authenticated = AzureResourceManager
+                    .configure()
+                    .withHttpClient(new OkHttpAsyncHttpClientBuilder().build())
+                    .authenticate(credential, azureProfile);
+
+
+                AzureResourceManager client = StringUtils.isBlank(subscription)
+                    ? authenticated.withDefaultSubscription()
+                    : authenticated.withSubscription(subscription);
+
+                if (clientClass.isInstance(client)) {
+                    return clientClass.cast(client);
+                }
+
+                throw new GyroException(
+                    String.format("Unable to create %s client", clientClass.getSimpleName()));
+
+            } catch (Exception error) {
+                throw new GyroException(error.getMessage(), error);
+            }
+
+        } else {
+            throw new UnsupportedOperationException(
+                String.format("The following client type is not available: %s", clientClass.getSimpleName()));
         }
     }
 

src/main/java/gyro/azure/AzureFinder.java

@@ -22,13 +22,13 @@
 import java.util.stream.Collectors;
 
 import com.azure.core.credential.TokenCredential;
-import com.azure.resourcemanager.AzureResourceManager;
+import com.psddev.dari.util.TypeDefinition;
 import gyro.core.finder.Finder;
 
-public abstract class AzureFinder<M, R extends AzureResource> extends Finder<R> {
-    protected abstract List<M> findAllAzure(AzureResourceManager client);
+public abstract class AzureFinder<C, M, R extends AzureResource> extends Finder<R> {
+    protected abstract List<M> findAllAzure(C client);
 
-    protected abstract List<M> findAzure(AzureResourceManager client, Map<String, String> filters);
+    protected abstract List<M> findAzure(C client, Map<String, String> filters);
 
     @Override
     public List<R> find(Map<String, Object> filters) {
@@ -44,8 +44,12 @@ public List<R> findAll() {
             .collect(Collectors.toList());
     }
 
-    private AzureResourceManager newClient() {
-        return AzureResource.createClient(credentials(AzureCredentials.class));
+    private C newClient() {
+        @SuppressWarnings("unchecked")
+        Class<C> clientClass = (Class<C>) TypeDefinition.getInstance(getClass())
+            .getInferredGenericTypeArgumentClass(AzureFinder.class, 0);
+
+        return AzureResource.createClient(clientClass, credentials(AzureCredentials.class));
     }
 
     protected TokenCredential getTokenCredential() {

src/main/java/gyro/azure/AzureResource.java

@@ -18,6 +18,7 @@
 
 import com.azure.core.credential.TokenCredential;
 import com.azure.resourcemanager.AzureResourceManager;
+import com.azure.resourcemanager.communication.CommunicationManager;
 import gyro.core.resource.Resource;
 
 public abstract class AzureResource extends Resource {
@@ -26,12 +27,12 @@ protected String getRegion() {
         return credentials(AzureCredentials.class).getRegion();
     }
 
-    public static AzureResourceManager createClient(AzureCredentials credentials) {
-        return credentials.createClient();
+    public static <T> T createClient(Class<T> clientClass, AzureCredentials credentials) {
+        return credentials.createClient(clientClass);
     }
 
-    protected AzureResourceManager createClient() {
-        return AzureResource.createClient(credentials(AzureCredentials.class));
+    protected <T> T createClient(Class<T> clientClass) {
+        return AzureResource.createClient(clientClass, credentials(AzureCredentials.class));
     }
 
     public static TokenCredential getTokenCredential(AzureCredentials credentials) {

src/main/java/gyro/azure/accessmanagement/ActiveDirectoryGroupFinder.java

@@ -39,7 +39,7 @@
  */
 @Type("active-directory-group")
 public class ActiveDirectoryGroupFinder
-    extends AzureFinder<ActiveDirectoryGroup, ActiveDirectoryGroupResource> {
+    extends AzureFinder<AzureResourceManager, ActiveDirectoryGroup, ActiveDirectoryGroupResource> {
 
     private String name;
     private String id;

src/main/java/gyro/azure/accessmanagement/ActiveDirectoryGroupResource.java

@@ -95,7 +95,7 @@ public void copyFrom(ActiveDirectoryGroup group) {
 
     @Override
     public boolean refresh() {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryGroup group = client.accessManagement().activeDirectoryGroups().getById(getId());
 
@@ -110,7 +110,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryGroup group = client.accessManagement().activeDirectoryGroups()
             .define(getName())
@@ -127,7 +127,7 @@ public void update(GyroUI ui, State state, Resource current, Set<String> changed
 
     @Override
     public void delete(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         client.accessManagement().activeDirectoryGroups().deleteById(getId());
     }

src/main/java/gyro/azure/accessmanagement/ActiveDirectoryUserFinder.java

@@ -39,7 +39,7 @@
  */
 @Type("active-directory-user")
 public class ActiveDirectoryUserFinder
-    extends AzureFinder<ActiveDirectoryUser, ActiveDirectoryUserResource> {
+    extends AzureFinder<AzureResourceManager, ActiveDirectoryUser, ActiveDirectoryUserResource> {
 
     private String id;
     private String name;

src/main/java/gyro/azure/accessmanagement/ActiveDirectoryUserResource.java

@@ -141,7 +141,7 @@ public void copyFrom(ActiveDirectoryUser user) {
 
     @Override
     public boolean refresh() {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryUser user = client.accessManagement().activeDirectoryUsers().getById(getId());
 
@@ -156,7 +156,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryUser activeDirectoryUser = client.accessManagement().activeDirectoryUsers()
             .define(getName())
@@ -175,7 +175,7 @@ public void update(GyroUI ui, State state, Resource current, Set<String> changed
 
     @Override
     public void delete(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         client.accessManagement().activeDirectoryUsers().deleteById(getId());
     }

src/main/java/gyro/azure/accessmanagement/ApplicationFinder.java

@@ -37,7 +37,7 @@
  *    application: $(external-query azure::application {})
  */
 @Type("application")
-public class ApplicationFinder extends AzureFinder<ActiveDirectoryApplication, ApplicationResource> {
+public class ApplicationFinder extends AzureFinder<AzureResourceManager, ActiveDirectoryApplication, ApplicationResource> {
 
     private String id;
 

src/main/java/gyro/azure/accessmanagement/ApplicationResource.java

@@ -171,7 +171,7 @@ public void copyFrom(ActiveDirectoryApplication model) {
 
     @Override
     public boolean refresh() {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryApplication application = client.accessManagement()
             .activeDirectoryApplications()
@@ -188,7 +188,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryApplication.DefinitionStages.WithCreate withCreate = client.accessManagement()
             .activeDirectoryApplications()
@@ -215,7 +215,7 @@ public void create(GyroUI ui, State state) throws Exception {
     @Override
     public void update(
         GyroUI ui, State state, Resource current, Set<String> changedFieldNames) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ActiveDirectoryApplication application = client.accessManagement()
             .activeDirectoryApplications()
@@ -258,7 +258,7 @@ public void update(
 
     @Override
     public void delete(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         client.accessManagement().activeDirectoryApplications().deleteById(getId());
     }

src/main/java/gyro/azure/accessmanagement/RoleAssignmentResource.java

@@ -152,7 +152,7 @@ public void copyFrom(RoleAssignment roleAssignment) {
         setScope(roleAssignment.scope());
         setId(roleAssignment.id());
 
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
         setRole(client.accessManagement().roleDefinitions().getById(roleAssignment.roleDefinitionId()).roleName());
 
         ActiveDirectoryUser user = null;
@@ -180,7 +180,7 @@ public void copyFrom(RoleAssignment roleAssignment) {
 
     @Override
     public boolean refresh() {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         RoleAssignment roleAssignment = client.accessManagement().roleAssignments().getByScope(getScope(), getName());
 
@@ -195,7 +195,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         if (Stream.of(getPrincipalId(), getUser(), getGroup()).filter(Objects::nonNull).count() > 1) {
             throw new GyroException("Only one of 'principal-id' or 'user' or 'group' is allowed.");
@@ -254,7 +254,7 @@ public void update(GyroUI ui, State state, Resource current, Set<String> changed
 
     @Override
     public void delete(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         client.accessManagement().roleAssignments().deleteById(getId());
     }

src/main/java/gyro/azure/accessmanagement/ServicePrincipalFinder.java

@@ -37,7 +37,7 @@
  *    service-principal: $(external-query azure::service-principal {})
  */
 @Type("service-principal")
-public class ServicePrincipalFinder extends AzureFinder<ServicePrincipal, ServicePrincipalResource> {
+public class ServicePrincipalFinder extends AzureFinder<AzureResourceManager, ServicePrincipal, ServicePrincipalResource> {
 
     private String id;
 

src/main/java/gyro/azure/accessmanagement/ServicePrincipalResource.java

@@ -98,7 +98,7 @@ public void copyFrom(ServicePrincipal model) {
 
     @Override
     public boolean refresh() {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ServicePrincipal servicePrincipal = client.accessManagement().servicePrincipals().getByName(getName());
 
@@ -113,7 +113,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         ServicePrincipal servicePrincipal = client.accessManagement().servicePrincipals()
             .define(getName())
@@ -131,7 +131,7 @@ public void update(
 
     @Override
     public void delete(GyroUI ui, State state) throws Exception {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         client.accessManagement().servicePrincipals().deleteById(getId());
     }

src/main/java/gyro/azure/cdn/CdnEndpointResource.java

@@ -339,7 +339,7 @@ public boolean refresh() {
 
     @Override
     public void create(GyroUI ui, State state) {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         CdnProfileResource parent = (CdnProfileResource) parent();
 
@@ -432,7 +432,7 @@ public void create(GyroUI ui, State state) {
 
     @Override
     public void update(GyroUI ui, State state, Resource current, Set<String> changedProperties) {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         CdnProfileResource parent = (CdnProfileResource) parent();
 
@@ -524,7 +524,7 @@ public void update(GyroUI ui, State state, Resource current, Set<String> changed
 
     @Override
     public void delete(GyroUI ui, State state) {
-        AzureResourceManager client = createClient();
+        AzureResourceManager client = createClient(AzureResourceManager.class);
 
         CdnProfileResource parent = (CdnProfileResource) parent();
 

src/main/java/gyro/azure/cdn/CdnProfileFinder.java

@@ -37,7 +37,7 @@
  *    cdn-profile: $(external-query azure::cdn-profile {})
  */
 @Type("cdn-profile")
-public class CdnProfileFinder extends AzureFinder<CdnProfile, CdnProfileResource> {
+public class CdnProfileFinder extends AzureFinder<AzureResourceManager, CdnProfile, CdnProfileResource> {
 
     private String id;