Skip to content

Combine all 2022-05-01 preview changes to one commit; prevent merge conflict.#20736

Closed
ericshape wants to merge 1 commit intoAzure:dev-sql-Microsoft.Sql-2022-05-01-previewfrom
ericshape:dev-sql-Microsoft.Sql-2022-05-01-preview
Closed

Combine all 2022-05-01 preview changes to one commit; prevent merge conflict.#20736
ericshape wants to merge 1 commit intoAzure:dev-sql-Microsoft.Sql-2022-05-01-previewfrom
ericshape:dev-sql-Microsoft.Sql-2022-05-01-preview

Conversation

@ericshape
Copy link
Member

@ericshape ericshape commented Sep 15, 2022 •
edited
Loading

there is no actual code change.

combine all the commits of 2022-05-01-preview (https://github.com/Azure/azure-rest-api-specs/commits/dev-sql-Microsoft.Sql-2022-05-01-preview) into one commit.

It will prevent upcoming merge conflicts for release.

image

@ericshape
Combine all changes to one commit; prevent merge conflict.
d570bc7 
[2022-05-01] Update parameter name of Database ARM API swagger changes for vbs enclaves (#20606)

* swagger changes for vbs enclaves

* remove unreferenced json example

* update name of parameter from enclaveType -> preferredEnclaveType

* name change fix

* fix json

* added examples for update database with enclave type

* add missing example file

* fix spell check
[2022-05-01] Database ARM API swagger changes for vbs enclaves (#20413)

* swagger changes for vbs enclaves

* remove unreferenced json example
Adding new Virtual Cluster APIs (#20469)

* adding new VC VNext APIs

* fixing examples

* fixing examples2

* doing this to kick of validation that's stuck

* doing this to kick of validation that's stuck

* removing not neede file

Co-authored-by: Jovana Toroman <jtoroman@microsoft.com>
swagger and example files for new api GetSynapselinkWorkspaces (#20377)

* swagger and example files for new api

* Update readme.md

* Update custom-words.txt

* Update GetSynapseLinkWorkspaces.json

Fix databaseName spelling.

* Update SynapseLinkWorkspaces.json

regenerate swagger to fix spelling.

* Update readme.md

add to v5 package

* update example file

* Update GetSynapseLinkWorkspaces.json

empty properties

* Update SynapseLinkWorkspaces.json

Use TrackedResource

* Update SynapseLinkWorkspaces.json

revert tracked resource

* Update SynapseLinkWorkspaces.json

* Update GetSynapseLinkWorkspaces.json

only for testing.

* Update GetSynapseLinkWorkspaces.json

add properties back

* Update GetSynapseLinkWorkspaces.json

remove properties for testing only.

* Update GetSynapseLinkWorkspaces.json

add value to example file.

* Update SynapseLinkWorkspaces.json

add x-ms-identifier

* Update GetSynapseLinkWorkspaces.json

fix prettier text

* remove get and use listbydatbases

remove get and use listbydatbases

* fix path of example file.

fix path of example file.

* Update SynapseLinkWorkspaces.json

added new error codes.
Added new DTC api version in V2022-05-01-preview (#20395)

* Added new examples and swagger for managed instance DTC

* Fixed examples

* Fixed examples typo, and added newer version to package composite v5 readme

* Changed error messages and updated parameter descriptions

Co-authored-by: Stefan Krivokapic <skrivokapic@microsoft.com>
[SQL] 2022-05-01 DistributedAvailabilityGroups SetRole specs (#20321)

* Add DAG setRole swag docs

* regenerate files

* regenerate files

* bump v5 tag

* Update specification/sql/resource-manager/readme.md

* Minor fix - update descriptions
MI standby replica (#20237)

* Update InstanceFailoverGroups

* Regenerate swagger

Co-authored-by: Lazar Lazic <a-lazarlazic@microsoft.com>
Managed Instance Long Term Retention Policy v20220501 (#20099)

* aupdate swagger files

* fix validation break

* fix validation error again

* fix validation v3
ManagedDatabases 2022-05-01-preview update: ManagedDatabaseStatus (#20114)

* ManagedDatabases 2022-05-01-preview update: ManagedDatabaseStatus

* Add Swaggers for API versions < 20220501

* Revert "Add Swaggers for API versions < 20220501"

This reverts commit e3d4879.

* Regenerate Swagger after the latest API changes

* Regenerate Swagger after reverting the SwaggerEnum-name to "ManagedDatabaseStatus"

Co-authored-by: Djordje Jeremic <djjeremi@microsoft.com>
ManagedDatabaseMoveOperations: Initial commit (#20066)

* ManagedDatabaseMoveOperations: Initial commit

* fixup! ManagedDatabaseMoveOperations: Initial commit

Co-authored-by: Djordje Jeremic <djjeremi@microsoft.com>
Added new managed database swagger and example (#19954)

Create dev branch dev-sql-Microsoft.Sql-2022-05-01-preview (#19915)

* Adds base for updating Microsoft.Sql from version preview/2022-02-01-preview to version 2022-05-01-preview

* Updates readme

* Updates API version in new specs and examples

* revert the default tag
@openapi-workflow-bot
Copy link

openapi-workflow-bot bot commented Sep 15, 2022

Hi, @ericshape Thanks for your PR. I am workflow bot for review process. Here are some small tips.

  • Please ensure to do self-check against checklists in first PR comment.
  • PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging.
  • For specs comparison cross API versions, Use API Specs Comparison Report Generator
  • If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. How to fix?

    • Any feedback about review process or workflow bot, pls contact swagger and tools team. vscswagger@microsoft.com

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 15, 2022 •
    edited
    Loading

    Swagger Validation Report

    ️️✔️BreakingChange succeeded [Detail] [Expand] 
    There are no breaking changes.
    ️️✔️Breaking Change(Cross-Version) succeeded [Detail] [Expand] 
    There are no breaking changes.
    ️️✔️LintDiff succeeded [Detail] [Expand] 
    Validation passes for LintDiff.
    ️️✔️Avocado succeeded [Detail] [Expand] 
    Validation passes for Avocado.
    ️️✔️ModelValidation succeeded [Detail] [Expand] 
    Validation passes for ModelValidation.
    ️️✔️SemanticValidation succeeded [Detail] [Expand] 
    Validation passes for SemanticValidation.
    ️️✔️SDK Track2 Validation succeeded [Detail] [Expand] 
    Validation passes for SDKTrack2Validation
    ️️✔️PrettierCheck succeeded [Detail] [Expand] 
    Validation passes for PrettierCheck.
    ️️✔️SpellCheck succeeded [Detail] [Expand] 
    Validation passes for SpellCheck.
    ️️✔️CadlValidation succeeded [Detail] [Expand] 
    Validation passes for CadlValidation.
    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 15, 2022 •
    edited
    Loading

    Swagger Generation Artifacts

    ️️✔️ApiDocPreview succeeded [Detail] [Expand]
    ️️✔️SDK Breaking Change Tracking succeeded [Detail] [Expand]

    Breaking Changes Tracking

    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 15, 2022

    Swagger pipeline started successfully. If there is ApiView generated, it will be updated in this comment.

    @ghost ghost added the SQL label Sep 15, 2022
    @ericshape ericshape marked this pull request as ready for review September 15, 2022 22:21
    @ericshape ericshape requested a review from jamestao as a code owner September 15, 2022 22:21
    @ericshape
    Copy link
    Member Author

    ericshape commented Sep 15, 2022

    @raych1 @xiaoxuqi-ms can you help review and merge? thanks!

    there is no actual code change.

    combine all the commits of 2022-05-01-preview (https://github.com/Azure/azure-rest-api-specs/commits/dev-sql-Microsoft.Sql-2022-05-01-preview) into one commit.

    It will prevent upcoming merge conflicts for release.

    @ericshape ericshape closed this Sep 16, 2022
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

    Reviewers

    @raych1 raych1 raych1 approved these changes

    @jamestao jamestao Awaiting requested review from jamestao

    Assignees

    @xiaoxuqi-ms xiaoxuqi-ms

    Labels

    SQL

    Projects

    None yet

    Milestone

    No milestone

    Development

    Successfully merging this pull request may close these issues.

    3 participants

    @ericshape @raych1 @xiaoxuqi-ms