Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR sdk/managedapplications/mgmt-v2019_07_01] Revert "Fix Parameter Description for validate resource move (#8524)" #11614

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/managedapplications/mgmt-v2019_07_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-managedapplications</artifactId>
<version>1.0.0-beta</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package com.microsoft.azure.management.managedapplications.v2019_07_01;

import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
Expand All @@ -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<String, UserAssignedResourceIdentity> userAssignedIdentities;

/**
* Get the principal ID of resource identity.
*
Expand All @@ -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
*/
Expand All @@ -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.
Expand All @@ -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<String, UserAssignedResourceIdentity> 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<String, UserAssignedResourceIdentity> userAssignedIdentities) {
this.userAssignedIdentities = userAssignedIdentities;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@ public ApplicationDefinitionImpl define(String name) {
return wrapModel(name);
}

@Override
public Observable<ApplicationDefinition> getByIdAsync(String applicationDefinitionId) {
ApplicationDefinitionsInner client = this.inner();
return client.getByIdAsync(applicationDefinitionId)
.map(new Func1<ApplicationDefinitionInner, ApplicationDefinition>() {
@Override
public ApplicationDefinition call(ApplicationDefinitionInner inner) {
return new ApplicationDefinitionImpl(inner.name(), inner, manager());
}
});
}

@Override
public Completable deleteByIdAsync(String applicationDefinitionId) {
ApplicationDefinitionsInner client = this.inner();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,18 @@ public ApplicationImpl define(String name) {
return wrapModel(name);
}

@Override
public Observable<Application> getByIdAsync(String applicationId) {
ApplicationsInner client = this.inner();
return client.getByIdAsync(applicationId)
.map(new Func1<ApplicationInner, Application>() {
@Override
public Application call(ApplicationInner inner) {
return new ApplicationImpl(inner.name(), inner, manager());
}
});
}

@Override
public Completable deleteByIdAsync(String applicationId) {
ApplicationsInner client = this.inner();
Expand Down