Skip to content

Commit

Permalink
mgmt, upgrade keyvault to 2023-07-01 (Azure#37330)
Browse files Browse the repository at this point in the history
* default autorest-java to latest

* regen 2023-07

* record
  • Loading branch information
weidongxu-microsoft authored Oct 24, 2023
1 parent 02f2369 commit 191a5aa
Show file tree
Hide file tree
Showing 49 changed files with 810 additions and 50 deletions.
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"dir": "azure-resourcemanager-keyvault",
"source": "specification/keyvault/resource-manager/readme.md",
"package": "com.azure.resourcemanager.keyvault",
"args": "--tag=package-2023-02",
"args": "--tag=package-2023-07",
"note": "use local azure-rest-api-specs and remove keys.json, secrets.json and keysManagedHsm.json in README.md tag"
},
"keyvault-hybrid": {
Expand Down
10 changes: 4 additions & 6 deletions sdk/resourcemanager/azure-resourcemanager-keyvault/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

## 2.32.0-beta.1 (Unreleased)

### Features Added

### Breaking Changes

### Bugs Fixed

### Other Changes

#### Dependency Updates

- Updated `api-version` to `2023-07-01`.
-
## 2.31.0 (2023-09-28)

### Other Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "java",
"TagPrefix": "java/resourcemanager/azure-resourcemanager-keyvault",
"Tag": "java/resourcemanager/azure-resourcemanager-keyvault_dcfafbf480"
"Tag": "java/resourcemanager/azure-resourcemanager-keyvault_a24b8fea25"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.azure.resourcemanager.keyvault.models.ManagedHsmProperties;
import com.azure.resourcemanager.keyvault.models.ManagedHsmResource;
import com.azure.resourcemanager.keyvault.models.ManagedHsmSku;
import com.azure.resourcemanager.keyvault.models.ManagedServiceIdentity;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Map;

Expand Down Expand Up @@ -51,6 +52,13 @@ public ManagedHsmInner withSku(ManagedHsmSku sku) {
return this;
}

/** {@inheritDoc} */
@Override
public ManagedHsmInner withIdentity(ManagedServiceIdentity identity) {
super.withIdentity(identity);
return this;
}

/** {@inheritDoc} */
@Override
public ManagedHsmInner withLocation(String location) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.azure.core.annotation.Fluent;
import com.azure.resourcemanager.keyvault.models.ManagedHsmResource;
import com.azure.resourcemanager.keyvault.models.ManagedHsmSku;
import com.azure.resourcemanager.keyvault.models.ManagedServiceIdentity;
import com.azure.resourcemanager.keyvault.models.MhsmPrivateEndpoint;
import com.azure.resourcemanager.keyvault.models.MhsmPrivateLinkServiceConnectionState;
import com.azure.resourcemanager.keyvault.models.PrivateEndpointConnectionProvisioningState;
Expand Down Expand Up @@ -68,6 +69,13 @@ public MhsmPrivateEndpointConnectionInner withSku(ManagedHsmSku sku) {
return this;
}

/** {@inheritDoc} */
@Override
public MhsmPrivateEndpointConnectionInner withIdentity(ManagedServiceIdentity identity) {
super.withIdentity(identity);
return this;
}

/** {@inheritDoc} */
@Override
public MhsmPrivateEndpointConnectionInner withLocation(String location) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public KeyVaultManagementClientImpl buildClient() {
localSerializerAdapter,
localDefaultPollInterval,
localEnvironment,
subscriptionId,
this.subscriptionId,
localEndpoint);
return client;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public OperationsClient getOperations() {
this.defaultPollInterval = defaultPollInterval;
this.subscriptionId = subscriptionId;
this.endpoint = endpoint;
this.apiVersion = "2023-02-01";
this.apiVersion = "2023-07-01";
this.vaults = new VaultsClientImpl(this);
this.privateEndpointConnections = new PrivateEndpointConnectionsClientImpl(this);
this.privateLinkResources = new PrivateLinkResourcesClientImpl(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ public class ManagedHsmResource extends Resource {
@JsonProperty(value = "systemData", access = JsonProperty.Access.WRITE_ONLY)
private SystemData systemData;

/*
* Managed service identity (system assigned and/or user assigned identities)
*/
@JsonProperty(value = "identity")
private ManagedServiceIdentity identity;

/** Creates an instance of ManagedHsmResource class. */
public ManagedHsmResource() {
}
Expand Down Expand Up @@ -58,6 +64,26 @@ public SystemData systemData() {
return this.systemData;
}

/**
* Get the identity property: Managed service identity (system assigned and/or user assigned identities).
*
* @return the identity value.
*/
public ManagedServiceIdentity identity() {
return this.identity;
}

/**
* Set the identity property: Managed service identity (system assigned and/or user assigned identities).
*
* @param identity the identity value to set.
* @return the ManagedHsmResource object itself.
*/
public ManagedHsmResource withIdentity(ManagedServiceIdentity identity) {
this.identity = identity;
return this;
}

/** {@inheritDoc} */
@Override
public ManagedHsmResource withLocation(String location) {
Expand All @@ -81,5 +107,8 @@ public void validate() {
if (sku() != null) {
sku().validate();
}
if (identity() != null) {
identity().validate();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.resourcemanager.keyvault.models;

import com.azure.core.annotation.Fluent;
import com.azure.core.util.logging.ClientLogger;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Map;
import java.util.UUID;

/** Managed service identity (system assigned and/or user assigned identities). */
@Fluent
public final class ManagedServiceIdentity {
/*
* The service principal ID of the system assigned identity. This property will only be provided for a system
* assigned identity.
*/
@JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY)
private UUID principalId;

/*
* The tenant ID of the system assigned identity. This property will only be provided for a system assigned
* identity.
*/
@JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
private UUID tenantId;

/*
* Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed).
*/
@JsonProperty(value = "type", required = true)
private ManagedServiceIdentityType type;

/*
* The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys
* will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}.
* The dictionary values can be empty objects ({}) in requests.
*/
@JsonProperty(value = "userAssignedIdentities")
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
private Map<String, UserAssignedIdentity> userAssignedIdentities;

/** Creates an instance of ManagedServiceIdentity class. */
public ManagedServiceIdentity() {
}

/**
* Get the principalId property: The service principal ID of the system assigned identity. This property will only
* be provided for a system assigned identity.
*
* @return the principalId value.
*/
public UUID principalId() {
return this.principalId;
}

/**
* Get the tenantId property: The tenant ID of the system assigned identity. This property will only be provided for
* a system assigned identity.
*
* @return the tenantId value.
*/
public UUID tenantId() {
return this.tenantId;
}

/**
* Get the type property: Type of managed service identity (where both SystemAssigned and UserAssigned types are
* allowed).
*
* @return the type value.
*/
public ManagedServiceIdentityType type() {
return this.type;
}

/**
* Set the type property: Type of managed service identity (where both SystemAssigned and UserAssigned types are
* allowed).
*
* @param type the type value to set.
* @return the ManagedServiceIdentity object itself.
*/
public ManagedServiceIdentity withType(ManagedServiceIdentityType type) {
this.type = type;
return this;
}

/**
* Get the userAssignedIdentities property: The set of user assigned identities associated with the resource. The
* userAssignedIdentities dictionary keys will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}.
* The dictionary values can be empty objects ({}) in requests.
*
* @return the userAssignedIdentities value.
*/
public Map<String, UserAssignedIdentity> userAssignedIdentities() {
return this.userAssignedIdentities;
}

/**
* Set the userAssignedIdentities property: The set of user assigned identities associated with the resource. The
* userAssignedIdentities dictionary keys will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}.
* The dictionary values can be empty objects ({}) in requests.
*
* @param userAssignedIdentities the userAssignedIdentities value to set.
* @return the ManagedServiceIdentity object itself.
*/
public ManagedServiceIdentity withUserAssignedIdentities(Map<String, UserAssignedIdentity> userAssignedIdentities) {
this.userAssignedIdentities = userAssignedIdentities;
return this;
}

/**
* Validates the instance.
*
* @throws IllegalArgumentException thrown if the instance is not valid.
*/
public void validate() {
if (type() == null) {
throw LOGGER
.logExceptionAsError(
new IllegalArgumentException("Missing required property type in model ManagedServiceIdentity"));
}
if (userAssignedIdentities() != null) {
userAssignedIdentities()
.values()
.forEach(
e -> {
if (e != null) {
e.validate();
}
});
}
}

private static final ClientLogger LOGGER = new ClientLogger(ManagedServiceIdentity.class);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.resourcemanager.keyvault.models;

import com.azure.core.util.ExpandableStringEnum;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Collection;

/** Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). */
public final class ManagedServiceIdentityType extends ExpandableStringEnum<ManagedServiceIdentityType> {
/** Static value None for ManagedServiceIdentityType. */
public static final ManagedServiceIdentityType NONE = fromString("None");

/** Static value SystemAssigned for ManagedServiceIdentityType. */
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");

/** Static value UserAssigned for ManagedServiceIdentityType. */
public static final ManagedServiceIdentityType USER_ASSIGNED = fromString("UserAssigned");

/** Static value SystemAssigned,UserAssigned for ManagedServiceIdentityType. */
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED =
fromString("SystemAssigned,UserAssigned");

/**
* Creates a new instance of ManagedServiceIdentityType value.
*
* @deprecated Use the {@link #fromString(String)} factory method.
*/
@Deprecated
public ManagedServiceIdentityType() {
}

/**
* Creates or finds a ManagedServiceIdentityType from its string representation.
*
* @param name a name to look for.
* @return the corresponding ManagedServiceIdentityType.
*/
@JsonCreator
public static ManagedServiceIdentityType fromString(String name) {
return fromString(name, ManagedServiceIdentityType.class);
}

/**
* Gets known ManagedServiceIdentityType values.
*
* @return known ManagedServiceIdentityType values.
*/
public static Collection<ManagedServiceIdentityType> values() {
return values(ManagedServiceIdentityType.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ public MhsmPrivateLinkResource withSku(ManagedHsmSku sku) {
return this;
}

/** {@inheritDoc} */
@Override
public MhsmPrivateLinkResource withIdentity(ManagedServiceIdentity identity) {
super.withIdentity(identity);
return this;
}

/** {@inheritDoc} */
@Override
public MhsmPrivateLinkResource withLocation(String location) {
Expand Down
Loading

0 comments on commit 191a5aa

Please sign in to comment.