diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/common.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/common.json new file mode 100644 index 000000000000..45820933959f --- /dev/null +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/common.json @@ -0,0 +1,34 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-04-01-preview", + "title": "KeyVaultManagementClient", + "description": "The Azure management API provides a RESTful set of web services that interact with Azure Key Vault." + }, + "paths": {}, + "definitions": { + "CloudError": { + "description": "An error response from Key Vault resource provider", + "properties": { + "error": { + "$ref": "#/definitions/CloudErrorBody" + } + }, + "x-ms-external": true + }, + "CloudErrorBody": { + "description": "An error response from Key Vault resource provider", + "properties": { + "code": { + "type": "string", + "description": "Error code. This is a mnemonic that can be consumed programmatically." + }, + "message": { + "type": "string", + "description": "User friendly error message. The message is typically localized and may vary with service version." + } + }, + "x-ms-external": true + } + } +} diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json index bfcef174e0e1..d7f6704ec41b 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json @@ -139,7 +139,8 @@ "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, - "vaultUri": "https://sample-vault.vault.azure.net" + "vaultUri": "https://sample-vault.vault.azure.net", + "provisioningState": "Succeeded" } } }, @@ -211,7 +212,26 @@ "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, - "vaultUri": "https://sample-vault.vault.azure.net" + "vaultUri": "https://sample-vault.vault.azure.net", + "provisioningState": "Succeeded" + } + } + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "409": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json index 15e15f63d586..9e6c943f6abb 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json @@ -109,6 +109,24 @@ "vaultUri": "https://sample-vault.vault.azure.net" } } + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "409": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/deleteVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/deleteVault.json index ca3613bc6326..ee4257b02662 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/deleteVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/deleteVault.json @@ -11,6 +11,15 @@ }, "204": { "headers": {} + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getDeletedVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getDeletedVault.json index 04f83b94645a..3b8091f7be29 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getDeletedVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getDeletedVault.json @@ -17,7 +17,8 @@ "location": "westus", "tags": {}, "deletionDate": "2017-01-01T00:00:59Z", - "scheduledPurgeDate": "2017-04-01T00:00:59Z" + "scheduledPurgeDate": "2017-04-01T00:00:59Z", + "purgeProtectionEnabled": true } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getPrivateEndpointConnection.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getPrivateEndpointConnection.json index 2fb84a554652..287caee88a94 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getPrivateEndpointConnection.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getPrivateEndpointConnection.json @@ -12,6 +12,7 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/privateEndpointConnections/sample-pec", "name": "sample-pec", "type": "Microsoft.KeyVault/vaults/privateEndpointConnections", + "etag": "", "properties": { "provisioningState": "Succeeded", "privateEndpoint": { @@ -20,10 +21,13 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "This was automatically approved by user1234@contoso.com", - "actionRequired": "None" + "actionsRequired": "None" } } } + }, + "204": { + "headers": {} } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json index 9ad3bc5a4220..6d61831d11d2 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json @@ -74,7 +74,8 @@ "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, - "vaultUri": "https://sample-vault.vault.azure.net" + "vaultUri": "https://sample-vault.vault.azure.net", + "provisioningState": "Succeeded" } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listDeletedVaults.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listDeletedVaults.json index 61cf7abfa431..182400a85ae8 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listDeletedVaults.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listDeletedVaults.json @@ -17,7 +17,8 @@ "location": "westus", "tags": {}, "deletionDate": "2017-01-01T00:00:59Z", - "scheduledPurgeDate": "2017-04-01T00:00:59Z" + "scheduledPurgeDate": "2017-04-01T00:00:59Z", + "purgeProtectionEnabled": true } } ], diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listOperations.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listOperations.json index 4b2ccaa8fe0b..1e5b0fda6ad4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listOperations.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listOperations.json @@ -13,7 +13,8 @@ "resource": "Key Vault", "operation": "View Key Vault", "description": "View the properties of a key vault" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/write", @@ -22,7 +23,8 @@ "resource": "Key Vault", "operation": "Update Key Vault", "description": "Create a new key vault or update the properties of an existing key vault" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/delete", @@ -31,7 +33,8 @@ "resource": "Key Vault", "operation": "Delete Key Vault", "description": "Delete a key vault" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/deploy/action", @@ -40,7 +43,8 @@ "resource": "Key Vault", "operation": "Use Vault for Azure Deployments", "description": "Enables access to secrets in a key vault when deploying Azure resources" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/secrets/read", @@ -49,7 +53,8 @@ "resource": "Secret", "operation": "View Secret Properties", "description": "View the properties of a secret, but not its value" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/secrets/write", @@ -58,7 +63,8 @@ "resource": "Secret", "operation": "Update Secret", "description": "Create a new secret or update the value of an existing secret" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/vaults/accessPolicies/write", @@ -67,7 +73,8 @@ "resource": "Access Policy", "operation": "Update Access Policy", "description": "Update an existing access policy by merging or replacing, or add a new access policy to a vault." - } + }, + "isDataAction": false }, { "origin": "system", @@ -78,6 +85,7 @@ "operation": "Read log definition", "description": "Gets the available logs for a key vault" }, + "isDataAction": false, "properties": { "serviceSpecification": { "logSpecifications": [ @@ -98,7 +106,8 @@ "resource": "Key Vault Diagnostic Settings", "operation": "Read diagnostic setting", "description": "Gets the diagnostic setting for the resource" - } + }, + "isDataAction": false }, { "origin": "system", @@ -108,7 +117,8 @@ "resource": "Key Vault Diagnostic Settings", "operation": "Write diagnostic setting", "description": "Creates or updates the diagnostic setting for the resource" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/register/action", @@ -117,7 +127,8 @@ "resource": "Subscription", "operation": "Register Subscription", "description": "Registers a subscription" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/unregister/action", @@ -126,7 +137,8 @@ "resource": "Subscription", "operation": "Unregister Subscription", "description": "Unregisters a subscription" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/operations/read", @@ -135,7 +147,8 @@ "resource": "Operations", "operation": "Available Key Vault Operations", "description": "Lists operations available on Microsoft.KeyVault resource provider" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/checkNameAvailability/read", @@ -144,7 +157,8 @@ "resource": "Name Availability", "operation": "Check Name Availability", "description": "Checks that a key vault name is valid and is not in use" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/deletedVaults/read", @@ -153,7 +167,8 @@ "resource": "Soft Deleted Key Vault", "operation": "View Soft Deleted Vaults", "description": "View the properties of soft deleted key vaults" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/locations/deletedVaults/read", @@ -162,7 +177,8 @@ "resource": "Soft Deleted Key Vault", "operation": "View Soft Deleted Key Vault", "description": "View the properties of a soft deleted key vault" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/locations/deletedVaults/purge/action", @@ -171,7 +187,8 @@ "resource": "Soft Deleted Key Vault", "operation": "Purge Soft Deleted Key Vault", "description": "Purge a soft deleted key vault" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/locations/operationResults/read", @@ -180,7 +197,8 @@ "resource": "Long Run Operation Result", "operation": "Check Operation Result", "description": "Check the result of a long run operation" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/hsmPools/read", @@ -189,7 +207,8 @@ "resource": "HSM pool", "operation": "View HSM pool", "description": "View the properties of an HSM pool" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/hsmPools/write", @@ -198,7 +217,8 @@ "resource": "HSM pool", "operation": "Create or Update HSM pool", "description": "Create a new HSM pool of update the properties of an existing HSM pool" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/hsmPools/delete", @@ -207,7 +227,8 @@ "resource": "HSM pool", "operation": "Delete HSM pool", "description": "Delete an HSM pool" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/hsmPools/joinVault/action", @@ -216,7 +237,8 @@ "resource": "HSM pool", "operation": "Join KeyVault to HSM pool", "description": "Join a key vault to an HSM pool" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/managedHSMs/read", @@ -225,7 +247,8 @@ "resource": "Managed HSM", "operation": "View Managed HSM", "description": "View the properties of a Managed HSM" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/managedHSMs/write", @@ -234,7 +257,8 @@ "resource": "Managed HSM", "operation": "Create or Update Managed HSM", "description": "Create a new Managed HSM of update the properties of an existing Managed HSM" - } + }, + "isDataAction": false }, { "name": "Microsoft.KeyVault/managedHSMs/delete", @@ -243,7 +267,8 @@ "resource": "Managed HSM", "operation": "Delete Managed HSM", "description": "Delete a Managed HSM" - } + }, + "isDataAction": false }, { "origin": "system", @@ -254,6 +279,7 @@ "operation": "Read metric definition", "description": "Gets the available metrics for a key vault" }, + "isDataAction": false, "properties": { "serviceSpecification": {} } @@ -266,7 +292,8 @@ "resource": "Location", "operation": "Modify Network ACLs containing the deleted Vitual Network or Subnet ", "description": "Notifies Microsoft.KeyVault that a virtual network or subnet is being deleted" - } + }, + "isDataAction": false } ] } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json index 2c8180503662..b68471d72365 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json @@ -77,7 +77,8 @@ "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, "enableSoftDelete": true, - "vaultUri": "https://sample-vault.vault.azure.net/" + "vaultUri": "https://sample-vault.vault.azure.net/", + "provisioningState": "Succeeded" } } ], diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json index b0d0dd555f98..47f4f46bf374 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json @@ -76,7 +76,8 @@ "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, "enableSoftDelete": true, - "vaultUri": "https://sample-vault.vault.azure.net/" + "vaultUri": "https://sample-vault.vault.azure.net/", + "provisioningState": "Succeeded" } } ], diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/purgeDeletedVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/purgeDeletedVault.json index 2b48cf219ca8..f422a42cd22a 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/purgeDeletedVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/purgeDeletedVault.json @@ -11,6 +11,24 @@ }, "202": { "headers": {} + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "404": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/putPrivateEndpointConnection.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/putPrivateEndpointConnection.json index 2e37409c6098..6f2437db6840 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/putPrivateEndpointConnection.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/putPrivateEndpointConnection.json @@ -28,7 +28,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "My name is Joe and I'm approving this.", - "actionRequired": "None" + "actionsRequired": "None" } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateAccessPoliciesAdd.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateAccessPoliciesAdd.json index fb43acb94d79..9b00f06c8320 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateAccessPoliciesAdd.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateAccessPoliciesAdd.json @@ -77,6 +77,33 @@ ] } } + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "404": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "409": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json index b179dc327999..2cc0a4b3a286 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json @@ -138,7 +138,8 @@ "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, - "vaultUri": "https://sample-vault.vault.azure.net" + "vaultUri": "https://sample-vault.vault.azure.net", + "provisioningState": "Succeeded" } } }, @@ -210,7 +211,26 @@ "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, - "vaultUri": "https://sample-vault.vault.azure.net" + "vaultUri": "https://sample-vault.vault.azure.net", + "provisioningState": "Succeeded" + } + } + }, + "400": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" + } + } + }, + "409": { + "headers": {}, + "body": { + "error": { + "code": "", + "message": "" } } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json index f527a8a0c7c7..62996f472b36 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json @@ -62,6 +62,26 @@ "schema": { "$ref": "#/definitions/Vault" } + }, + "400": { + "description": "Bad request.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "409": { + "description": "A conflict occurred to prevent the operation from completing.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -129,6 +149,26 @@ "schema": { "$ref": "#/definitions/Vault" } + }, + "400": { + "description": "Bad request.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "409": { + "description": "A conflict occurred to prevent the operation from completing.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -177,6 +217,19 @@ }, "204": { "description": "No Content." + }, + "400": { + "description": "Bad request.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -225,6 +278,12 @@ "schema": { "$ref": "#/definitions/Vault" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -307,6 +366,33 @@ "schema": { "$ref": "#/definitions/VaultAccessPolicyParameters" } + }, + "400": { + "description": "Bad request.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "404": { + "description": "The specified resource does not exist.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "409": { + "description": "A conflict occurred to prevent the operation from completing.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -495,6 +581,12 @@ "schema": { "$ref": "#/definitions/DeletedVault" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -546,6 +638,26 @@ }, "202": { "description": "Vault is being purged." + }, + "400": { + "description": "Bad request.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "404": { + "description": "The specified resource does not exist.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + }, + "x-ms-error-response": true + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -705,10 +817,13 @@ "$ref": "#/definitions/PrivateEndpointConnection" } }, + "204": { + "description": "The private endpoint connection does not exist." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "common.json#/definitions/CloudError" } } } @@ -762,7 +877,8 @@ "headers": { "Retry-After": { "description": "(specified only if operation does not finish synchronously) The recommended number of seconds to wait before calling the URI specified in Azure-AsyncOperation.", - "type": "integer" + "type": "integer", + "format": "int32" }, "Azure-AsyncOperation": { "description": "(specified only if operation does not finish synchronously) The URI to poll for completion status. The response of this URI may be synchronous or asynchronous.", @@ -776,7 +892,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "common.json#/definitions/CloudError" } } } @@ -824,7 +940,8 @@ "headers": { "Retry-After": { "description": "The recommended number of seconds to wait before calling the URI specified in the location header.", - "type": "integer" + "type": "integer", + "format": "int32" }, "Location": { "description": "The URI to poll for completion status.", @@ -838,7 +955,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "common.json#/definitions/CloudError" } } }, @@ -884,7 +1001,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "common.json#/definitions/CloudError" } } } @@ -892,29 +1009,6 @@ } }, "definitions": { - "CloudError": { - "description": "An error response from Key Vault resource provider", - "properties": { - "error": { - "$ref": "#/definitions/CloudErrorBody" - } - }, - "x-ms-external": true - }, - "CloudErrorBody": { - "description": "An error response from Key Vault resource provider", - "properties": { - "code": { - "type": "string", - "description": "Error code. This is a mnemonic that can be consumed programmatically." - }, - "message": { - "type": "string", - "description": "User friendly error message. The message is typically localized and may vary with service version." - } - }, - "x-ms-external": true - }, "Sku": { "properties": { "family": { @@ -1157,6 +1251,18 @@ "$ref": "#/definitions/NetworkRuleSet", "description": "Rules governing the accessibility of the key vault from specific network locations." }, + "provisioningState": { + "type": "string", + "description": "Provisioning state of the vault.", + "enum": [ + "Succeeded", + "RegisteringDns" + ], + "x-ms-enum": { + "name": "VaultProvisioningState", + "modelAsString": true + } + }, "privateEndpointConnections": { "readOnly": true, "type": "array", @@ -1284,6 +1390,11 @@ "type": "string" }, "description": "Tags of the original vault." + }, + "purgeProtectionEnabled": { + "readOnly": true, + "type": "boolean", + "description": "Purge protection status of the original vault." } }, "description": "Properties of the deleted vault." @@ -1643,6 +1754,10 @@ "$ref": "#/definitions/PrivateEndpointConnectionProperties", "x-ms-client-flatten": true, "description": "Resource properties." + }, + "etag": { + "type": "string", + "description": "Modified whenever there is a change in the state of private endpoint connection." } }, "allOf": [ @@ -1690,9 +1805,16 @@ "type": "string", "description": "The reason for approval or rejection." }, - "actionRequired": { + "actionsRequired": { "type": "string", - "description": "A message indicating if changes on the service provider require any updates on the consumer." + "description": "A message indicating if changes on the service provider require any updates on the consumer.", + "enum": [ + "None" + ], + "x-ms-enum": { + "name": "ActionsRequired", + "modelAsString": true + } } }, "description": "An object that represents the approval state of the private link connection." diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/providers.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/providers.json index f2e42a6d1f7b..518c2140b9fb 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/providers.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/providers.json @@ -108,6 +108,10 @@ "x-ms-client-flatten": true, "x-ms-client-name": "OperationProperties", "$ref": "#/definitions/OperationProperties" + }, + "isDataAction": { + "type": "boolean", + "description": "Property to specify whether the action is a data action." } } }, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/secrets.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/secrets.json index 608fd5183158..944e6b7ae25f 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/secrets.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/secrets.json @@ -69,6 +69,12 @@ "schema": { "$ref": "#/definitions/Secret" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -141,6 +147,12 @@ "schema": { "$ref": "#/definitions/Secret" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": { @@ -196,6 +208,12 @@ "schema": { "$ref": "#/definitions/Secret" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "common.json#/definitions/CloudError" + } } }, "x-ms-examples": {