mgmt, support kind, sku, identity for generic resource (Azure#19449)

Author: weidongxu-microsoft

sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/implementation/GenericResourceImpl.java

@@ -9,11 +9,14 @@
 import com.azure.resourcemanager.resources.fluentcore.model.implementation.AcceptedImpl;
 import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
 import com.azure.resourcemanager.resources.models.GenericResource;
+import com.azure.resourcemanager.resources.models.Identity;
 import com.azure.resourcemanager.resources.models.Plan;
 import com.azure.resourcemanager.resources.fluentcore.arm.ResourceUtils;
 import com.azure.resourcemanager.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
 import com.azure.resourcemanager.resources.fluent.models.GenericResourceInner;
 import com.azure.resourcemanager.resources.fluent.ResourcesClient;
+import com.azure.resourcemanager.resources.models.ResourceIdentityType;
+import com.azure.resourcemanager.resources.models.Sku;
 import reactor.core.publisher.Mono;
 
 /**
@@ -84,6 +87,26 @@ public Object properties() {
         return innerModel().properties();
     }
 
+    @Override
+    public String kind() {
+        return innerModel().kind();
+    }
+
+    @Override
+    public Sku sku() {
+        return innerModel().sku();
+    }
+
+    @Override
+    public Identity identity() {
+        return innerModel().identity();
+    }
+
+    @Override
+    public String managedBy() {
+        return innerModel().managedBy();
+    }
+
     @Override
     protected Mono<GenericResourceInner> getInnerAsync() {
         return this.manager().serviceClient().getResources().getAsync(
@@ -100,6 +123,30 @@ public GenericResourceImpl withProperties(Object properties) {
         return this;
     }
 
+    @Override
+    public GenericResourceImpl withKind(String kind) {
+        innerModel().withKind(kind);
+        return this;
+    }
+
+    @Override
+    public GenericResourceImpl withSku(Sku sku) {
+        innerModel().withSku(sku);
+        return this;
+    }
+
+    @Override
+    public GenericResourceImpl withIdentity(Identity identity) {
+        innerModel().withIdentity(identity);
+        return this;
+    }
+
+    @Override
+    public GenericResourceImpl withoutIdentity() {
+        innerModel().withIdentity(new Identity().withType(ResourceIdentityType.NONE));
+        return this;
+    }
+
     @Override
     public GenericResourceImpl withParentResourceId(String parentResourceId) {
         return withParentResourcePath(ResourceUtils.relativePathFromResourceId(parentResourceId));

sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/models/GenericResource.java

@@ -52,6 +52,26 @@ public interface GenericResource extends
      */
     Object properties();
 
+    /**
+     * @return the kind of the resource
+     */
+    String kind();
+
+    /**
+     * @return the SKU of the resource
+     */
+    Sku sku();
+
+    /**
+     * @return the managed identity of the resource
+     */
+    Identity identity();
+
+    /**
+     * @return the ID of the resource that manages this resource
+     */
+    String managedBy();
+
     /**
      * The entirety of the generic resource definition.
      */
@@ -183,6 +203,30 @@ interface WithCreate extends
              */
             WithCreate withProperties(Object properties);
 
+            /**
+             * Specifies resource kind.
+             *
+             * @param kind the kind of the resource
+             * @return the next stage of generic resource definition
+             */
+            WithCreate withKind(String kind);
+
+            /**
+             * Specifies resource SKU.
+             *
+             * @param sku the SKU of the resource
+             * @return the next stage of generic resource definition
+             */
+            WithCreate withSku(Sku sku);
+
+            /**
+             * Specifies managed identity.
+             *
+             * @param identity the managed identity
+             * @return the next stage of generic resource definition
+             */
+            WithCreate withIdentity(Identity identity);
+
             /**
              * Begins creating the Azure resource.
              *
@@ -265,6 +309,52 @@ interface WithApiVersion {
              */
             Update withApiVersion(String apiVersion);
         }
+
+        /**
+         * The template for a generic resource update operation for specifying the resource kind.
+         */
+        interface WithKind {
+            /**
+             * Specifies resource kind.
+             *
+             * @param kind the kind of the resource
+             * @return the next stage of generic resource update
+             */
+            Update withKind(String kind);
+        }
+
+        /**
+         * The template for a generic resource update operation for specifying the resource SKU.
+         */
+        interface WithSku {
+            /**
+             * Specifies resource SKU.
+             *
+             * @param sku the SKU of the resource
+             * @return the next stage of generic resource update
+             */
+            Update withSku(Sku sku);
+        }
+
+        /**
+         * The template for a generic resource update operation for specifying the managed identity.
+         */
+        interface WithIdentity {
+            /**
+             * Specifies managed identity.
+             *
+             * @param identity the managed identity
+             * @return the next stage of generic resource update
+             */
+            Update withIdentity(Identity identity);
+
+            /**
+             * Specifies managed identity.
+             *
+             * @return the next stage of generic resource update
+             */
+            Update withoutIdentity();
+        }
     }
 
     /**
@@ -276,6 +366,9 @@ interface Update extends
             UpdateStages.WithPlan,
             UpdateStages.WithParentResource,
             UpdateStages.WithProperties,
+            UpdateStages.WithKind,
+            UpdateStages.WithSku,
+            UpdateStages.WithIdentity,
             Resource.UpdateWithTags<Update> {
     }
 }

sdk/resourcemanager/azure-resourcemanager-resources/src/test/java/com/azure/resourcemanager/resources/GenericResourcesTests.java

@@ -16,7 +16,10 @@
 import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
 import com.azure.resourcemanager.resources.models.GenericResource;
 import com.azure.resourcemanager.resources.models.GenericResources;
+import com.azure.resourcemanager.resources.models.Identity;
 import com.azure.resourcemanager.resources.models.ResourceGroups;
+import com.azure.resourcemanager.resources.models.ResourceIdentityType;
+import com.azure.resourcemanager.resources.models.Sku;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -145,4 +148,43 @@ public void canCreateDeleteResourceSyncPoll() throws Exception {
         boolean deleted = resourcesAfterDelete.stream().noneMatch(r -> resourceName.equals(r.name()));
         Assertions.assertTrue(deleted);
     }
+
+    @Test
+    public void canCreateUpdateKindSkuIdentity() throws Exception {
+        final String resourceName = "rs" + testId;
+        final String apiVersion = "2021-01-01";
+
+        GenericResource storageResource = resourceClient.genericResources().define(resourceName)
+            .withRegion(Region.US_WEST)
+            .withExistingResourceGroup(rgName)
+            .withResourceType("storageAccounts")
+            .withProviderNamespace("Microsoft.Storage")
+            .withoutPlan()
+            .withKind("Storage")
+            .withSku(new Sku().withName("Standard_LRS"))
+            .withIdentity(new Identity().withType(ResourceIdentityType.SYSTEM_ASSIGNED))
+            .withProperties(new ObjectMapper().readTree("{\"minimumTlsVersion\": \"TLS1_2\", \"supportsHttpsTrafficOnly\": true}"))
+            .withApiVersion(apiVersion)
+            .create();
+        Assertions.assertEquals("Storage", storageResource.kind());
+        Assertions.assertEquals("Standard_LRS", storageResource.sku().name());
+        Assertions.assertNotNull(storageResource.identity());
+        Assertions.assertEquals(ResourceIdentityType.SYSTEM_ASSIGNED, storageResource.identity().type());
+        Assertions.assertNotNull(storageResource.identity().principalId());
+        Assertions.assertNotNull(storageResource.identity().tenantId());
+
+        storageResource.update()
+            .withKind("StorageV2")
+            .withoutIdentity()
+            .withApiVersion(apiVersion)
+            .apply();
+        Assertions.assertEquals("StorageV2", storageResource.kind());
+        Assertions.assertEquals(ResourceIdentityType.NONE, storageResource.identity().type());
+
+        storageResource.update()
+            .withSku(new Sku().withName("Standard_RAGRS"))
+            .withApiVersion(apiVersion)
+            .apply();
+        Assertions.assertEquals("Standard_RAGRS", storageResource.sku().name());
+    }
 }