diff --git a/sdk/keyvault/mgmt-v2015_06_01/pom.xml b/sdk/keyvault/mgmt-v2015_06_01/pom.xml
index a7b512134a926..b4c29bd6435d1 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/pom.xml
+++ b/sdk/keyvault/mgmt-v2015_06_01/pom.xml
@@ -11,15 +11,15 @@
com.microsoft.azure
azure-arm-parent
- 1.2.0
- ../../parents/azure-arm-parent
+ 1.1.0
+ ../../../pom.management.xml
azure-mgmt-keyvault
1.0.0-beta
jar
Microsoft Azure SDK for KeyVault Management
This package contains Microsoft KeyVault Management SDK.
- https://github.com/Azure/azure-libraries-for-java
+ https://github.com/Azure/azure-sdk-for-java
The MIT License (MIT)
@@ -28,8 +28,8 @@
- scm:git:https://github.com/Azure/azure-libraries-for-java
- scm:git:git@github.com:Azure/azure-libraries-for-java.git
+ scm:git:https://github.com/Azure/azure-sdk-for-java
+ scm:git:git@github.com:Azure/azure-sdk-for-java.git
HEAD
@@ -71,6 +71,8 @@
azure-arm-client-runtime
test-jar
test
+
+ 1.6.5
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/AccessPolicyEntry.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/AccessPolicyEntry.java
index a4f75a5f01d09..87efafbcb1650 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/AccessPolicyEntry.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/AccessPolicyEntry.java
@@ -44,7 +44,7 @@ public class AccessPolicyEntry {
private Permissions permissions;
/**
- * Get the tenantId value.
+ * Get the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
*
* @return the tenantId value
*/
@@ -53,7 +53,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId value.
+ * Set the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
*
* @param tenantId the tenantId value to set
* @return the AccessPolicyEntry object itself.
@@ -64,7 +64,7 @@ public AccessPolicyEntry withTenantId(UUID tenantId) {
}
/**
- * Get the objectId value.
+ * Get the object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies.
*
* @return the objectId value
*/
@@ -73,7 +73,7 @@ public String objectId() {
}
/**
- * Set the objectId value.
+ * Set the object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies.
*
* @param objectId the objectId value to set
* @return the AccessPolicyEntry object itself.
@@ -84,7 +84,7 @@ public AccessPolicyEntry withObjectId(String objectId) {
}
/**
- * Get the applicationId value.
+ * Get application ID of the client making request on behalf of a principal.
*
* @return the applicationId value
*/
@@ -93,7 +93,7 @@ public UUID applicationId() {
}
/**
- * Set the applicationId value.
+ * Set application ID of the client making request on behalf of a principal.
*
* @param applicationId the applicationId value to set
* @return the AccessPolicyEntry object itself.
@@ -104,7 +104,7 @@ public AccessPolicyEntry withApplicationId(UUID applicationId) {
}
/**
- * Get the permissions value.
+ * Get permissions the identity has for keys, secrets and certificates.
*
* @return the permissions value
*/
@@ -113,7 +113,7 @@ public Permissions permissions() {
}
/**
- * Set the permissions value.
+ * Set permissions the identity has for keys, secrets and certificates.
*
* @param permissions the permissions value to set
* @return the AccessPolicyEntry object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Permissions.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Permissions.java
index ebe1f7a27f25b..f9a1d1d1ee7ae 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Permissions.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Permissions.java
@@ -34,7 +34,7 @@ public class Permissions {
private List certificates;
/**
- * Get the keys value.
+ * Get permissions to keys.
*
* @return the keys value
*/
@@ -43,7 +43,7 @@ public List keys() {
}
/**
- * Set the keys value.
+ * Set permissions to keys.
*
* @param keys the keys value to set
* @return the Permissions object itself.
@@ -54,7 +54,7 @@ public Permissions withKeys(List keys) {
}
/**
- * Get the secrets value.
+ * Get permissions to secrets.
*
* @return the secrets value
*/
@@ -63,7 +63,7 @@ public List secrets() {
}
/**
- * Set the secrets value.
+ * Set permissions to secrets.
*
* @param secrets the secrets value to set
* @return the Permissions object itself.
@@ -74,7 +74,7 @@ public Permissions withSecrets(List secrets) {
}
/**
- * Get the certificates value.
+ * Get permissions to certificates.
*
* @return the certificates value
*/
@@ -83,7 +83,7 @@ public List certificates() {
}
/**
- * Set the certificates value.
+ * Set permissions to certificates.
*
* @param certificates the certificates value to set
* @return the Permissions object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Sku.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Sku.java
index 1ffed88967bf9..6c8a9f83bbb75 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Sku.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Sku.java
@@ -29,13 +29,14 @@ public class Sku {
/**
* Creates an instance of Sku class.
+ * @param name sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'.
*/
public Sku() {
family = "A";
}
/**
- * Get the family value.
+ * Get sKU family name.
*
* @return the family value
*/
@@ -44,7 +45,7 @@ public String family() {
}
/**
- * Set the family value.
+ * Set sKU family name.
*
* @param family the family value to set
* @return the Sku object itself.
@@ -55,7 +56,7 @@ public Sku withFamily(String family) {
}
/**
- * Get the name value.
+ * Get sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'.
*
* @return the name value
*/
@@ -64,7 +65,7 @@ public SkuName name() {
}
/**
- * Set the name value.
+ * Set sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'.
*
* @param name the name value to set
* @return the Sku object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Vault.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Vault.java
index c929f2a8bacb4..ad9ba0d5b79af 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Vault.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/Vault.java
@@ -10,12 +10,12 @@
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.Resource;
+import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
import com.microsoft.azure.arm.resources.models.HasResourceGroup;
import com.microsoft.azure.arm.model.Refreshable;
import com.microsoft.azure.arm.model.Updatable;
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
-import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.keyvault.v2015_06_01.implementation.KeyVaultManager;
import com.microsoft.azure.management.keyvault.v2015_06_01.implementation.VaultInner;
@@ -57,7 +57,9 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup tags() {
}
/**
- * Set the tags value.
+ * Set the tags that will be assigned to the key vault.
*
* @param tags the tags value to set
* @return the VaultCreateOrUpdateParameters object itself.
@@ -74,7 +74,7 @@ public VaultCreateOrUpdateParameters withTags(Map tags) {
}
/**
- * Get the properties value.
+ * Get properties of the vault.
*
* @return the properties value
*/
@@ -83,7 +83,7 @@ public VaultProperties properties() {
}
/**
- * Set the properties value.
+ * Set properties of the vault.
*
* @param properties the properties value to set
* @return the VaultCreateOrUpdateParameters object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/VaultProperties.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/VaultProperties.java
index c1174275cf114..72a7bf511149c 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/VaultProperties.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/VaultProperties.java
@@ -72,7 +72,7 @@ public class VaultProperties {
private Boolean enableSoftDelete;
/**
- * Get the vaultUri value.
+ * Get the URI of the vault for performing operations on keys and secrets.
*
* @return the vaultUri value
*/
@@ -81,7 +81,7 @@ public String vaultUri() {
}
/**
- * Set the vaultUri value.
+ * Set the URI of the vault for performing operations on keys and secrets.
*
* @param vaultUri the vaultUri value to set
* @return the VaultProperties object itself.
@@ -92,7 +92,7 @@ public VaultProperties withVaultUri(String vaultUri) {
}
/**
- * Get the tenantId value.
+ * Get the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
*
* @return the tenantId value
*/
@@ -101,7 +101,7 @@ public UUID tenantId() {
}
/**
- * Set the tenantId value.
+ * Set the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault.
*
* @param tenantId the tenantId value to set
* @return the VaultProperties object itself.
@@ -112,7 +112,7 @@ public VaultProperties withTenantId(UUID tenantId) {
}
/**
- * Get the sku value.
+ * Get sKU details.
*
* @return the sku value
*/
@@ -121,7 +121,7 @@ public Sku sku() {
}
/**
- * Set the sku value.
+ * Set sKU details.
*
* @param sku the sku value to set
* @return the VaultProperties object itself.
@@ -132,7 +132,7 @@ public VaultProperties withSku(Sku sku) {
}
/**
- * Get the accessPolicies value.
+ * Get an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID.
*
* @return the accessPolicies value
*/
@@ -141,7 +141,7 @@ public List accessPolicies() {
}
/**
- * Set the accessPolicies value.
+ * Set an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID.
*
* @param accessPolicies the accessPolicies value to set
* @return the VaultProperties object itself.
@@ -152,7 +152,7 @@ public VaultProperties withAccessPolicies(List accessPolicies
}
/**
- * Get the enabledForDeployment value.
+ * Get property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
*
* @return the enabledForDeployment value
*/
@@ -161,7 +161,7 @@ public Boolean enabledForDeployment() {
}
/**
- * Set the enabledForDeployment value.
+ * Set property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
*
* @param enabledForDeployment the enabledForDeployment value to set
* @return the VaultProperties object itself.
@@ -172,7 +172,7 @@ public VaultProperties withEnabledForDeployment(Boolean enabledForDeployment) {
}
/**
- * Get the enabledForDiskEncryption value.
+ * Get property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
*
* @return the enabledForDiskEncryption value
*/
@@ -181,7 +181,7 @@ public Boolean enabledForDiskEncryption() {
}
/**
- * Set the enabledForDiskEncryption value.
+ * Set property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
*
* @param enabledForDiskEncryption the enabledForDiskEncryption value to set
* @return the VaultProperties object itself.
@@ -192,7 +192,7 @@ public VaultProperties withEnabledForDiskEncryption(Boolean enabledForDiskEncryp
}
/**
- * Get the enabledForTemplateDeployment value.
+ * Get property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
*
* @return the enabledForTemplateDeployment value
*/
@@ -201,7 +201,7 @@ public Boolean enabledForTemplateDeployment() {
}
/**
- * Set the enabledForTemplateDeployment value.
+ * Set property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
*
* @param enabledForTemplateDeployment the enabledForTemplateDeployment value to set
* @return the VaultProperties object itself.
@@ -212,7 +212,7 @@ public VaultProperties withEnabledForTemplateDeployment(Boolean enabledForTempla
}
/**
- * Get the enableSoftDelete value.
+ * Get property to specify whether the 'soft delete' functionality is enabled for this key vault.
*
* @return the enableSoftDelete value
*/
@@ -221,7 +221,7 @@ public Boolean enableSoftDelete() {
}
/**
- * Set the enableSoftDelete value.
+ * Set property to specify whether the 'soft delete' functionality is enabled for this key vault.
*
* @param enableSoftDelete the enableSoftDelete value to set
* @return the VaultProperties object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/KeyVaultManagementClientImpl.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/KeyVaultManagementClientImpl.java
index b667faf2ae780..aec0e38f5fd19 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/KeyVaultManagementClientImpl.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/KeyVaultManagementClientImpl.java
@@ -63,11 +63,11 @@ public String apiVersion() {
return this.apiVersion;
}
- /** Gets or sets the preferred language for the response. */
+ /** The preferred language for the response. */
private String acceptLanguage;
/**
- * Gets Gets or sets the preferred language for the response.
+ * Gets The preferred language for the response.
*
* @return the acceptLanguage value.
*/
@@ -76,7 +76,7 @@ public String acceptLanguage() {
}
/**
- * Sets Gets or sets the preferred language for the response.
+ * Sets The preferred language for the response.
*
* @param acceptLanguage the acceptLanguage value.
* @return the service client itself
@@ -86,11 +86,11 @@ public KeyVaultManagementClientImpl withAcceptLanguage(String acceptLanguage) {
return this;
}
- /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+ /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
private int longRunningOperationRetryTimeout;
/**
- * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+ * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @return the longRunningOperationRetryTimeout value.
*/
@@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
}
/**
- * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+ * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
* @return the service client itself
@@ -109,11 +109,11 @@ public KeyVaultManagementClientImpl withLongRunningOperationRetryTimeout(int lon
return this;
}
- /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+ /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
private boolean generateClientRequestId;
/**
- * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+ * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @return the generateClientRequestId value.
*/
@@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
}
/**
- * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+ * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @param generateClientRequestId the generateClientRequestId value.
* @return the service client itself
@@ -191,6 +191,6 @@ protected void initialize() {
*/
@Override
public String userAgent() {
- return String.format("%s (%s, %s)", super.userAgent(), "KeyVaultManagementClient", "2015-06-01");
+ return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "KeyVaultManagementClient", "2015-06-01");
}
}
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultInner.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultInner.java
index 8270b6ed24eb3..245acb5cf9e34 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultInner.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultInner.java
@@ -29,7 +29,7 @@ public class VaultInner extends Resource {
private String name;
/**
- * Get the properties value.
+ * Get properties of the vault.
*
* @return the properties value
*/
@@ -38,7 +38,7 @@ public VaultProperties properties() {
}
/**
- * Set the properties value.
+ * Set properties of the vault.
*
* @param properties the properties value to set
* @return the VaultInner object itself.
@@ -49,7 +49,7 @@ public VaultInner withProperties(VaultProperties properties) {
}
/**
- * Get the name value.
+ * Get the name of the key vault.
*
* @return the name value
*/
@@ -58,7 +58,7 @@ public String name() {
}
/**
- * Set the name value.
+ * Set the name of the key vault.
*
* @param name the name value to set
* @return the VaultInner object itself.
diff --git a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultsInner.java b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultsInner.java
index 12b678b324169..ff6e8dece3ccc 100644
--- a/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultsInner.java
+++ b/sdk/keyvault/mgmt-v2015_06_01/src/main/java/com/microsoft/azure/management/keyvault/v2015_06_01/implementation/VaultsInner.java
@@ -271,6 +271,7 @@ public Observable> call(Response response) {
private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException {
return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter())
.register(200, new TypeToken() { }.getType())
+ .register(204, new TypeToken() { }.getType())
.registerError(CloudException.class)
.build(response);
}