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

Update DeletionRecovery Level #9895

Merged
merged 13 commits into from
Jun 23, 2020
Merged

Update DeletionRecovery Level #9895

merged 13 commits into from
Jun 23, 2020

Conversation

jlichwa
Copy link
Contributor

@jlichwa jlichwa commented Jun 19, 2020

MSFT employees can try out our new experience at OpenAPI Hub - one location for using our validation tools and finding your workflow.

Contribution checklist:

If any further question about AME onboarding or validation tools, please view the FAQ.

ARM API Review Checklist

  • Service team MUST add the "WaitForARMFeedback" label if the management plane API changes fall into one of the below categories.
    • adding/removing APIs.
    • adding/removing properties.
    • adding/removing API-version.
    • adding a new service in Azure.

Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.

  • If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.
    Please follow the link to find more details on API review process.

@openapi-pipeline-app
Copy link

openapi-pipeline-app bot commented Jun 19, 2020

[Staging] Swagger Validation Report

BreakingChange: 10 Errors, 0 Warnings [Detail] [Expand]
Rule Message
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L3875:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L3875:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L5900:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L5768:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L4242:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L4176:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L4155:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L4122:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L3875:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L3875:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L4155:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L4122:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L5900:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L5768:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L5592:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L5493:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L5592:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L5493:9
1020 - AddedEnumValue The new version is adding enum value(s) 'CustomizedRecoverable+Purgeable, CustomizedRecoverable, CustomizedRecoverable+ProtectedSubscription' from the old version.
New: Microsoft.KeyVault/stable/7.0/keyvault.json#L4242:9
Old: Microsoft.KeyVault/stable/7.0/keyvault.json#L4176:9
LintDiff: 2 Errors, 0 Warnings [Detail] [Expand]
Rule Message
An error occurred while executing JSON.parse() on the linter output for specification/keyvault/data-plane/readme.md: "role":"Lint Diff",
"new":"https://github.com/Azure/azure-rest-api-specs/blob/b6f52e28b6b61e30043038aa292d5ade0c5d077e/specification/keyvault/data-plane/readme.md",
"old":"https://github.com/Azure/azure-rest-api-specs/blob/master/specification/keyvault/data-plane/readme.md"
An error occurred while executing JSON.parse() on the linter output for specification/keyvault/data-plane/readme.md: "role":"Lint Diff",
"new":"https://github.com/Azure/azure-rest-api-specs/blob/b6f52e28b6b61e30043038aa292d5ade0c5d077e/specification/keyvault/data-plane/readme.md",
"old":"https://github.com/Azure/azure-rest-api-specs/blob/master/specification/keyvault/data-plane/readme.md"
️✔️Avocado [Detail]
 Validation passes for Avocado. 
Posted by Swagger Pipeline | How to fix these errors?

@jlichwa jlichwa marked this pull request as draft June 19, 2020 17:21
@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jlichwa
Copy link
Contributor Author

jlichwa commented Jun 19, 2020

Please #hold-off it is still a draft

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

Trenton Generation - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-net - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-python - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-go - Release

failed [Logs] [Expand Details]
  • Generate from b6f52e2 with merge commit f9caf92. SDK Automation 13.0.17.20200619.4
    [AutoRest] FATAL: System.InvalidOperationException: Swagger document contains two or more x-ms-enum extensions with the same name 'JsonWebKeyType' and different values: EC,EC-HSM,RSA,RSA-HSM,oct,oct-HSM vs. RSA,RSA-HSM
    [AutoRest]    at AutoRest.Modeler.ObjectBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\ObjectBuilder.cs:line 147
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.ParentBuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 204
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 46
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
    [AutoRest]    at AutoRest.Modeler.ObjectBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\ObjectBuilder.cs:line 179
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.ParentBuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 204
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 46
    [AutoRest]    at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
    [AutoRest]    at AutoRest.Modeler.SwaggerModeler.BuildCompositeTypes() in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SwaggerModeler.cs:line 271
    [AutoRest]    at AutoRest.Modeler.SwaggerModeler.Build(ServiceDefinition serviceDefinition) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SwaggerModeler.cs:line 66
    [AutoRest]    at AutoRest.Modeler.Program.d__2.MoveNext() in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\Program.cs:line 60
    [AutoRest] --- End of stack trace from previous location where exception was thrown ---
    [AutoRest]    at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
    [AutoRest]    at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
    [AutoRest]    at NewPlugin.d__15.MoveNext()
    [AutoRest] FATAL: go/imodeler1 - FAILED
    [AutoRest] FATAL: Error: Plugin imodeler1 reported failure.
    [AutoRest] Failure during batch task - {"tag":"package-7.2-preview"} -- Error: Plugin imodeler1 reported failure..
    [AutoRest]   Error: Plugin imodeler1 reported failure.
    Failed to run autorest.
    Error: /z/node_modules/.bin/autorest --use=@microsoft.azure/autorest.go@~2.1.144 --go --verbose --multiapi --use-onever --preview-chk --version=previous --go-sdk-folder=/z/work/src/github.com/Azure/azure-sdk-for-go /z/work/azure-rest-api-specs/specification/keyvault/data-plane/readme.md FATAL: System.InvalidOperationException: Swagger document contains two or more x-ms-enum extensions with the same name 'JsonWebKeyType' and different values: EC,EC-HSM,RSA,RSA-HSM,oct,oct-HSM vs. RSA,RSA-HSM
       at AutoRest.Modeler.ObjectBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\ObjectBuilder.cs:line 147
       at AutoRest.Modeler.SchemaBuilder.ParentBuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 204
       at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 46
       at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
       at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
       at AutoRest.Modeler.ObjectBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\ObjectBuilder.cs:line 179
       at AutoRest.Modeler.SchemaBuilder.ParentBuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 204
       at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 46
       at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SchemaBuilder.cs:line 131
       at AutoRest.Modeler.SwaggerModeler.BuildCompositeTypes() in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SwaggerModeler.cs:line 271
       at AutoRest.Modeler.SwaggerModeler.Build(ServiceDefinition serviceDefinition) in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\SwaggerModeler.cs:line 66
       at AutoRest.Modeler.Program.d__2.MoveNext() in C:\Users\ci\AppData\Local\Temp\PUBLISH8kiit\38_20171116T010915\autorest.modeler\src\Program.cs:line 60
    --- End of stack trace from previous location where exception was thrown ---
       at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
       at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
       at NewPlugin.d__15.MoveNext()
    FATAL: go/imodeler1 - FAILED
    FATAL: Error: Plugin imodeler1 reported failure.
    Failure during batch task - {"tag":"package-7.2-preview"} -- Error: Plugin imodeler1 reported failure..
      Error: Plugin imodeler1 reported failure.
    , {} 
    Failed to find any diff after autorest so no changed packages was found.

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-js - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

Azure CLI Extension Generation - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-java - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

"values": [
{
"value": "Purgeable",
"description": "It can be purged by a priviliged user after 90 days"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: these are sentences used in documentation and should use punctuation, i.e. end in a period.

},
{
"value": "Recoverable+Purgeable",
"description": "It can be recovered by a priviliged user until is purged.It can be purged by a priviliged user after 90 days"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space between "purged.It".

},
{
"value": "Recoverable+ProtectedSubscription",
"description": ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing description.

},
{
"value": "CustomizedRecoverable",
"description": "It can be recovered by priviliged user until is purged. System purge after number of days specificed in 'softDeleteRetentionInDays'"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"a privileged user"

"values": [
{
"value": "Purgeable",
"description": "It can be purged by a priviliged user after 90 days"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"privileged" (last "i" -> "e"). If you're using Visual Studio Code, I highly recommend the cSpell and Micorosft Docs extensions (the latter is an extension pack).

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@openapi-sdkautomation
Copy link

openapi-sdkautomation bot commented Jun 19, 2020

azure-sdk-for-python-track2 - Release

No readme.md specification configuration files were found that are associated with the files modified in this pull request, or swagger_to_sdk section in readme.md is not configured

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines
Copy link

No commit pushedDate could be found for PR 9895 in repo Azure/azure-rest-api-specs

@jlichwa
Copy link
Contributor Author

jlichwa commented Jun 19, 2020

#sign-off

@jlichwa jlichwa marked this pull request as ready for review June 19, 2020 19:34
@jlichwa
Copy link
Contributor Author

jlichwa commented Jun 19, 2020

#sign-off

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@lmazuel lmazuel merged commit f9caf92 into Azure:master Jun 23, 2020
iscai-msft added a commit to iscai-msft/azure-rest-api-specs that referenced this pull request Oct 5, 2020
…into fix_kv_python_readme

* 'master' of https://github.com/Azure/azure-rest-api-specs: (22 commits)
  Update DeletionRecovery Level (Azure#9895)
  Updating operations API to enable metrics via public metrics REST API. (Azure#9918)
  Xynoclafe/2020 06 version (Azure#9888)
  update java md (Azure#9923)
  Compute 2020-06-01 API version (Azure#9167)
  Merge Dev containerservice microsoft.container service 2020 06 01 (Azure#9914)
  new Batch Document Translation API Preview 1.0 (Azure#9218)
  1. Add a property as required (Azure#9899)
  Operational insights delete wrong lines data export (Azure#9849)
  [SRP]Adding allowBlobPublicAccess and minimumTlsVersion property for June19 and April19 (Azure#9831)
  [Hub Generated] Review request for Microsoft.ContainerInstance to add version stable/2019-12-01 (Azure#9838)
  add Java to AVS (Azure#9855)
  LaMigrationDate (Azure#9882)
  change vmware client name to AVSClient (Azure#9863)
  Fix typo in common private links definition for actionsRequired (Azure#9727)
  Microsoft.Support RP documentation updates (Azure#9880)
  BUG FIX: Fixed HopLink properties: context should be a dictionary, uint32 from… (Azure#9868)
  Update ci-fix.md (Azure#9881)
  Update Attestation control plane swagger to include 2 new defaultprovider API (Azure#9819)
  update java readme digitaltwins (Azure#9878)
  ...
00Kai0 pushed a commit to 00Kai0/azure-rest-api-specs that referenced this pull request Oct 12, 2020
* Update description for certificate type

* update description for certificate type

* Revert "update description for certificate type"

This reverts commit 3093d69.

* Revert "Update description for certificate type"

This reverts commit 83c4922.

* Update description for certificate type

* Update

* Update DeletionRecoveryLevel

* Update keyvault.json

* Update RecoveryLevel

* Update Recovery Level description

* Update Deletion Recovery Level
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants