diff --git a/sdk/managedapplications/mgmt-v2019_07_01/pom.xml b/sdk/managedapplications/mgmt-v2019_07_01/pom.xml index 6f9f24b9e2bf..715d003c8228 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/pom.xml +++ b/sdk/managedapplications/mgmt-v2019_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-managedapplications 1.0.0-beta diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java index 1a529de7b4a1..72b094c5ecaf 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.managedapplications.v2019_07_01; +import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -27,11 +28,20 @@ public class Identity { private String tenantId; /** - * The identity type. Possible values include: 'SystemAssigned'. + * The identity type. Possible values include: 'SystemAssigned', + * 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. */ @JsonProperty(value = "type") private ResourceIdentityType type; + /** + * The list of user identities associated with the resource. The user + * identity dictionary key references will be resource ids in the form: + * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + */ + @JsonProperty(value = "userAssignedIdentities") + private Map userAssignedIdentities; + /** * Get the principal ID of resource identity. * @@ -51,7 +61,7 @@ public String tenantId() { } /** - * Get the identity type. Possible values include: 'SystemAssigned'. + * Get the identity type. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. * * @return the type value */ @@ -60,7 +70,7 @@ public ResourceIdentityType type() { } /** - * Set the identity type. Possible values include: 'SystemAssigned'. + * Set the identity type. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. * * @param type the type value to set * @return the Identity object itself. @@ -70,4 +80,24 @@ public Identity withType(ResourceIdentityType type) { return this; } + /** + * Get the list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * + * @return the userAssignedIdentities value + */ + public Map userAssignedIdentities() { + return this.userAssignedIdentities; + } + + /** + * Set the list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * + * @param userAssignedIdentities the userAssignedIdentities value to set + * @return the Identity object itself. + */ + public Identity withUserAssignedIdentities(Map userAssignedIdentities) { + this.userAssignedIdentities = userAssignedIdentities; + return this; + } + } diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java index b83d6b1e2e55..51ac50cd10f9 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java @@ -16,7 +16,16 @@ */ public enum ResourceIdentityType { /** Enum value SystemAssigned. */ - SYSTEM_ASSIGNED("SystemAssigned"); + SYSTEM_ASSIGNED("SystemAssigned"), + + /** Enum value UserAssigned. */ + USER_ASSIGNED("UserAssigned"), + + /** Enum value SystemAssigned, UserAssigned. */ + SYSTEM_ASSIGNED_USER_ASSIGNED("SystemAssigned, UserAssigned"), + + /** Enum value None. */ + NONE("None"); /** The actual serialized value for a ResourceIdentityType instance. */ private String value; diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java new file mode 100644 index 000000000000..0b14c994b3a4 --- /dev/null +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java @@ -0,0 +1,48 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.managedapplications.v2019_07_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Represents the user assigned identity that is contained within the + * UserAssignedIdentities dictionary on ResourceIdentity. + */ +public class UserAssignedResourceIdentity { + /** + * The principal id of user assigned identity. + */ + @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY) + private String principalId; + + /** + * The tenant id of user assigned identity. + */ + @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY) + private String tenantId; + + /** + * Get the principal id of user assigned identity. + * + * @return the principalId value + */ + public String principalId() { + return this.principalId; + } + + /** + * Get the tenant id of user assigned identity. + * + * @return the tenantId value + */ + public String tenantId() { + return this.tenantId; + } + +} diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java index 78c6c1297454..82a3461370e0 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java @@ -101,6 +101,18 @@ public ApplicationDefinitionImpl define(String name) { return wrapModel(name); } + @Override + public Observable getByIdAsync(String applicationDefinitionId) { + ApplicationDefinitionsInner client = this.inner(); + return client.getByIdAsync(applicationDefinitionId) + .map(new Func1() { + @Override + public ApplicationDefinition call(ApplicationDefinitionInner inner) { + return new ApplicationDefinitionImpl(inner.name(), inner, manager()); + } + }); + } + @Override public Completable deleteByIdAsync(String applicationDefinitionId) { ApplicationDefinitionsInner client = this.inner(); diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java index ff07a7fe0727..25dc9df999e0 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java @@ -125,6 +125,18 @@ public ApplicationImpl define(String name) { return wrapModel(name); } + @Override + public Observable getByIdAsync(String applicationId) { + ApplicationsInner client = this.inner(); + return client.getByIdAsync(applicationId) + .map(new Func1() { + @Override + public Application call(ApplicationInner inner) { + return new ApplicationImpl(inner.name(), inner, manager()); + } + }); + } + @Override public Completable deleteByIdAsync(String applicationId) { ApplicationsInner client = this.inner();