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

Web ant94 2021 02 01 - resolve conflict in service branch #15539

Closed
wants to merge 451 commits into from
Closed

Web ant94 2021 02 01 - resolve conflict in service branch #15539

wants to merge 451 commits into from

Conversation

naveedaz
Copy link
Contributor

@naveedaz naveedaz commented Aug 5, 2021

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

Changelog

Add a changelog entry for this PR by answering the following questions:

  1. What's the purpose of the update?
    • new service onboarding
    • new API version
    • update existing version for new feature
    • update existing version to fix swagger quality issue in s360
    • Other, please clarify
  2. When are you targeting to deploy the new service/feature to public regions? Please provide the date or, if the date is not yet available, the month.
  3. When do you expect to publish the swagger? Please provide date or, the the date is not yet available, the month.
  4. If updating an existing version, please select the specific langauge SDKs and CLIs that must be refreshed after the swagger is published.
    • SDK of .NET (need service team to ensure code readiness)
    • SDK of Python
    • SDK of Java
    • SDK of Js
    • SDK of Go
    • PowerShell
    • CLI
    • Terraform
    • No refresh required for updates in this PR

Contribution checklist:

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

ARM API Review Checklist

Applicability: ⚠️

If your changes encompass only the following scenarios, you should SKIP this section, as these scenarios do not require ARM review.

  • Change to data plane APIs
  • Adding new properties
  • All removals

Otherwise your PR may be subject to ARM review requirements. Complete the following:

  • Check this box if any of the following apply to the PR so that label “WaitForARMFeedback” will be added automatically to begin ARM API Review. Failure to comply may result in delays to the manifest.

    • Adding a new service
    • Adding new API(s)
    • Adding a new API version
      -[ ] To review changes efficiently, ensure you copy the existing version into the new directory structure for first commit (including refactoring) and then push new changes, including version updates, in separate commits.
  • Ensure you've reviewed following guidelines including ARM resource provider contract and REST guidelines. Estimated time (4 hours). This is required before you can request review from ARM API Review board.

  • If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.

Breaking Change Review Checklist

If any of the following scenarios apply to the PR, request approval from the Breaking Change Review Board as defined in the Breaking Change Policy.

  • Removing API(s) in a stable version
  • Removing properties in a stable version
  • Removing API version(s) in a stable version
  • Updating API in a stable or public preview version with Breaking Change Validation errors
  • Updating API(s) in public preview over 1 year (refer to Retirement of Previews)

Action: to initiate an evaluation of the breaking change, create a new intake using the template for breaking changes. Addition details on the process and office hours are on the Breaking change Wiki.

Please follow the link to find more details on PR review process.

diwudd and others added 30 commits June 30, 2021 15:17
* The previous version in the 2021-08-1 folder

* Add new feature registration apis

* Update readme files

* Update readme file

* Remove feature configuration apis

* Fix avocado

* Fix validations

* Fix validation

* Fix validations

* Fix validation

* Fix title

* Fix validation

* Fix validation

* Fix readme

* Fix validation

* Fix validation

* Fix validation

* Fix validation

* Fix validation

* suppress r4009

* Fix validation

* Fix validation

* Fix python

* Fix readme

* Fix python

* Remove post api

* Update example api-versions

Co-authored-by: shenshengkafei <[email protected]>
* Copy of 2020-09-01 for ease of review

* Azure Batch updated to 2021-06-01.14

Suppressions

Fixed property name.

Fixed type

Fixed casing

Fixed casing

Spelling fix

Fixed enums

Fixed enum

Fixed EOF and casing from PR feedback

Markdown fixes

Added Managed Identity and Authentication Mode APIs.

Fixed example

Spot cleanup

Casing fix

Fixed spacing

Added maxParallelTasks.

Formatting.

Removed newline

Reverted markdown change to satisfy Avocado

http://azure.github.io/autorest/user/literate-file-formats/configuration.html#the-file-format
…- update readme.md (#15047)

* Update readme.md

* Update readme.md
* sql t2 readme config

* readme config

* Update readme.python.md

* conflient resolve

* readme config

Co-authored-by: msyyc <[email protected]>
* Fix typos and add some descriptins

* more description changes

Co-authored-by: Arvind Krishnaa Jagannathan <[email protected]>
… PUT request (#14705)

* Add Identity to createWorkpace example

* change for getTransitivePEUsages

* update

* prettier code

* add another new endpoint

* address comments

* change for getTransitivePEUsages

* update

* prettier code

* add another new endpoint

* address comments

* revert change on transitivePE and notebookKeys

* revert change on transitivePE and notebookKeys

* add new stable version 2021-01-01

* add ListNotebookAccessToken

* add primaryUserAssignedIdentity

* fix missing properties and apis

* fix one more missing property

* 202 status for start and stop CI

* make resync keys long runnin operation in version Jan2021

* resync keys 204

* update resync keys example

* Dont throw 204 for resync

* update resync keys

* Formatting

* revert Jan2021changes and add new version

* start apr2021 version for azure ml rp

* undo remove new line in jan2021

* use systemData definition in common

* removed old files

* fix small swagger bugs

* run prettier

* remove reference to sku

* update readme

* minimum agentCount should be 0

* add createdOn and ModifiedOn to compute properties

* add LoadBalancerType to aks compute

* add isNotebookInstanceCompute to virtualMachine

* add leafDomainLabel to SslConfiguration

* add overwriteExistingDomain to SslConfiguration

* add synapseSpark as supported compute-type

* update patch compute response to 202

* remove location from example responses

* Revert "remove location from example responses"

This reverts commit 048bf25.

* MachineLearningCompute_Update should have a 200 response

* sys data to use local def due to naming conflicts.

* Fix enum casing

* Fix operationId PR comment.

* Change opId in apr version

* remove 20210401 for easy review

* only change api version

* merge changes for 20210401 version

* Add x-ms-discriminator-value for Synapse spark

* camelcase loadbalancer properties

* add createdOn and Modified on to examples

* address AvoidAnonymousTypes error for SynapseSpark

* Minor fixes + new property

* Remove subscription state.

* fix swagger bug

* fix example

* fix more reported problems

* remove nullable flag for tags

* make containerRegistry nullable

* address comments

* fix example

Co-authored-by: Vinay Rajmal Soni <[email protected]>
Co-authored-by: Suba <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Josh Peterson <[email protected]>
Co-authored-by: Suba <[email protected]>
…or for AAD pod identity provisioning spec (#15054)

Co-authored-by: Kaiqi Zhang <[email protected]>
* Copy commit for code review

* Initial changes

Prettier

Suppressions

Added Managed Identity and Authenticate Mode APIs

Added type

Replace spot.

Added line break

Newline

Revert "Newline"

This reverts commit 735a19497174fcbc1cb2c7d7835205018614eb42.

Revert "Added line break"

This reverts commit bd0ceca43016e7df20bbc1280271af0f4b503b8d.

Reverted markdown change to satisfy Avocado

http://azure.github.io/autorest/user/literate-file-formats/configuration.html#the-file-format
* python track2 config

* redis

* redis
* Fix swagger correctness issues

* Fix casing in localTimestamp

* Fix localTimeStamp property

* Fix lintdiff errors
* Created base 2021-06-01-preview a copy of 2021-02-01-preview.

* Added my changes to support datasource auth credentials ontop of the base from previous version.

* Fixed as issue with FindRestorableTimeRanges.json example.
…14935)

* new api changes (#1)

* new api changes

* referer url change

* EdgeOrder 2020-12-01-preview Swagger changes (#5)

* readme changes

* Swagger refresh and update examples

* Change examples as per oav validations

* Minor swagger modifications

* Minor spacing adjustments

* Set ModelAsString to true for enums and modify examples

* Fix swagger lint validation error

* Modify readme and examples

* Modify readme.go.md

* Update swagger

* Minor prettier fix

* Change python package version in readme

* Fix spell check error

Co-authored-by: sashanm <[email protected]>
…gres, MySQL and MariaDB (#15016)

* Changes to fix the Resource provided name casing issue for Azure Postgres, MySQL and MariaDB services

* Changes to fix the Resource provided name casing issue for Azure Postgres, MySQL and MariaDB services

* Revert "Changes to fix the Resource provided name casing issue for Azure Postgres, MySQL and MariaDB services"

This reverts commit ecc38dc.
* Added missing properties for managed Private endpoints

Added missing properties for managed private endpoints in stable version.
Added the missing swagger files for managed private endpoints in the latest  preview version.

* fixed indentation issues

* fix indentation issues1

* ran prettier-fix

* Added missing examples files

* fixed examples

* fixed version in preview swagger

* Update readme.md

Updated readme.md

* Update readme.md

Co-authored-by: Sai-Kumar-1901 <[email protected]>
…hub (#14950)

* New api version support to include disable local auth flag for event hub

* Updated api-version in examples

* Added auth examples in NameSpaces

* Fixing LintDiff error

* Fixing LintDiff error contd

* Removed UserassignedIdentities as part of definition

* Changed to UserAssignedIdentity as a reference in userAssignedIdentities object

Co-authored-by: Sayan Ghosh <[email protected]>
* Add dividePerInstance property to the autoscale metric trigger

* Update examples for autoscale to include 'dividePerInstance'

* Update examples for correctness

* update example for correctness

* swagger corrections

* remove entry from wrong tag

* fix boolean as string validation error

* validation fix

* added missing lifter changes

* add recommended linter suppression
…stable/2018-04-16 (#15072)

* Added suppression for R4005 linting error

* Using Pascal case for resource provider

* Added all missing type:object

* Added supperssion for R3016 - camel case for odata.type

Co-authored-by: Avi Jerafi <[email protected]>
* add optional parameter private dns zone to server create/update

* fix lintdiff errors

* fix prettier issues
* sql t2 readme config

* readme config

* Update readme.python.md

* conflient resolve

* readme t2 config

Co-authored-by: msyyc <[email protected]>
…review/2021-06-01-preview (#14814)

* Adds base for updating Microsoft.Synapse from version stable/2021-05-01 to version 2021-06-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add kustoPool.json to new API version + examples files + in readme.md

* Add "type": "object" to definitions

* Modify SKU to new name & size instead of previous name & tier

* Add KustoPool stop

* fix KustoPool Stop example params

* Add KustoPool Start + example

* Add KustoPool LanguageExtension Add/List/Remove

* Add "type": "object" to LanguageExtensionsList

* Add KustoPoolFollowerDatabases DETACH and LIST + examples

* Add KustoPoolDatabasePrincipals ADD & LIST + examples

* Add missing DatabasePrincipalListRequest definition

* Add "type": "object" to FollowerDatabaseListResult, DatabasePrincipalListRequest, DatabasePrincipalListResult

* Add KustoPoolDatabasePrincipalsRemove + example

* Remove redundant newline

* Add AttachedDatabaseConfigurations to KustoPool + examples

* Add AttachedDatabaseConfigurationNameParameter

* Fixes for AttachedDatabaseConfiguration

* Add "type": "object" to TableLevelSharingProperties

* Fix example of KustoPoolAttachedDatabaseConfigurationCreateOrUpdate.json

* Add DataConnectionValidation to kustoPool.json + example

* Fixes to DataConnectionValidation

* Remove properties from KustoPoolDataConnectionValidation.json

* Fix object instead of array at KustoPoolDataConnectionValidation.json example

* Fix indentation at KustoPoolDataConnectionValidation.json

* Add KustoPoolPrincipalAssignmentCheckNameAvailability to kustoPool.json + example

* Remove redundant slash

* Add KustoPoolDatabasePrincipalAssignmentsCheckNameAvailability to kustoPool.json + example

* Fix in KustoPoolDatabasePrincipalAssignmentsCheckNameAvailability.json

* Add KustoPoolDataConnectionCheckNameAvailability.json + example

* Add KustoPoolListSkus + example

* Add kustoSkus path to kustoPool.json + example

* Remove {databaseName}/addPrincipals, listPrincipals, removePrincipals.
Remove related definitions + example files

* Change workspaceUid to workspaceUID to keep convention with Workspace resource

* Add new KustoPool properties:
optimizedAutoscale
enableStreamingIngest
enablePurge
languageExtensions

* Change "KustoCluster" to "KustoPool" and remove engineType property

* Change "kustoSkus" endpoint to "skus"

* Add KustoPool databases CheckNameAvailability + examples

* Re-position kustoPoolCheckNameAvailability

* Fix typo in example

* Minor adjustments in KustoPool databases CheckNameAvailability

* Change to "validateDataConnection"

* Revert back to DataConnectionValidation to keep consistency with kusto swagger

Co-authored-by: Amit Elran <[email protected]>
…ion stable/2021-03-01 (#15013)

* Address missing defaults noted by s360

* Update to remove default of array of objects that failed to validate.
)

* Microsoft.HanaOnAzure swagger: Update spec with missing fields from RP

Add HanaSID array to StorageProfile properties

* Update ListOperations API to include isDataAction field

* Add examples for HanaSID field

* correct bool to boolean

* Fix LintDiff error introduced by this PR
…ervices to add version stable/2021-04-01 (#14930)

* Adds base for updating Microsoft.RecoveryServices from version stable/2021-02-10 to version 2021-04-01

* Updates readme

* Updates API version in new specs and examples
* Copied Watchlists version 2021-03-01-preview as is to new directory structure

* Added Watchlist stable version 2021-04-01
This was referenced Aug 6, 2021
Copy link
Member

@tjprescott tjprescott left a comment

Choose a reason for hiding this comment

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

This seems like a very bad merge or rebase. There's no way a change to a service branch should touch 5k+ files.

@naveedaz naveedaz closed this Aug 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.