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

[Fleet] 2024-02-02-preview resolve conflicts #27767

Merged

Conversation

zman-ms
Copy link
Contributor

@zman-ms zman-ms commented Feb 13, 2024

ARM (Control Plane) API Specification Update Pull Request

Tip

Overwhelmed by all this guidance? See the Getting help section at the bottom of this PR description.

Note

As of January 2024 there is no PR assignee. This is expected. See https://aka.ms/azsdk/pr-arm-review.

PR review workflow diagram

Please understand this diagram before proceeding. It explains how to get your PR approved & merged.

diagram

Click here to see the details of Step 1

Breaking changes review (Diagram Step 1)

If the automation determines you have breaking changes, i.e. Step 1 from the diagram applies to you,
you must follow the breaking changes process.
IMPORTANT This applies even if:

  • The tool fails while it shouldn't, e.g. due to runtime exception, or incorrect detection of breaking changes.
  • You believe there is no need for you to request breaking change approval, for any reason.
    Such claims must be reviewed, and the process is the same.
Click here to see the details of Step 2

ARM API changes review (Diagram Step 2)

Click here to see the diagram footnotes

Diagram footnotes

[1] See ARM review queue (for PR merge queues, see [2]).
[2] public repo merge queue, private repo merge queue (for ARM review queue, [1])
The ARM reviewer on-call engineer visits the merge queue twice a day, so the approximate ETA for merges is 12 - 24 hours.

Purpose of this PR

What's the purpose of this PR? Check the specific option that applies. This is mandatory!

  • New resource provider.
  • New API version for an existing resource provider. (If API spec is not defined in TypeSpec, the PR should have been generated using OpenAPI Hub).
  • Update existing version for a new feature. (This is applicable only when you are revising a private preview API version.)
  • Update existing version to fix OpenAPI spec quality issues in S360.
  • Other, please clarify:
    • edit this with your clarification

Due diligence checklist

To merge this PR, you must go through the following checklist and confirm you understood
and followed the instructions by checking all the boxes:

  • I confirm this PR is modifying Azure Resource Manager (ARM) related specifications, and not data plane related specifications.
  • I have reviewed following Resource Provider guidelines, including
    ARM resource provider contract and
    REST guidelines (estimated time: 4 hours).
    I understand this is required before I can proceed to the diagram Step 2, "ARM API changes review", for this PR.

Additional information

Viewing API changes

For convenient view of the API changes made by this PR, refer to the URLs provided in the table
in the Generated ApiView comment added to this PR. You can use ApiView to show API versions diff.

Suppressing failures

If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the
suppressions guide to get approval.

Getting help

  • First, please carefully read through this PR description, from top to bottom. Please fill out the Purpose of this PR and Due diligence checklist.
  • To understand what you must do next to merge this PR, see the Next Steps to Merge comment. It will appear within few minutes of submitting this PR and will continue to be up-to-date with current PR state.
  • For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure
    and https://aka.ms/ci-fix.
  • For help with PR workflow diagram Step 2 (ARM review), see https://aka.ms/azsdk/pr-arm-review.
  • If the PR CI checks appear to be stuck in queued state, please add a comment with contents /azp run.
    This should result in a new comment denoting a PR validation pipeline has started and the checks should be updated after few minutes.
  • If the help provided by the previous points is not enough, post to https://aka.ms/azsdk/support/specreview-channel and link to this PR.

allegradomel and others added 30 commits January 9, 2024 19:29
* adding new version

* Typspec versioning

* adding in examples

* fixing examples

* formatting

* formatting

* updating deprecated operations

* formatting fixes

* removing breaking changes

* modify image upload body and docs

* fix example

* fixing example

* adding Location to 202 responses

* tsv formatting changes

* removing unnecessary model

* commiting changes
* Update readme.python.md

* Update readme.python.md
…11 preview (#26576)

* Generate new Service for azuredatatransfer

* Adds base for updating Microsoft.AzureDataTransfer from version private
repo version stable/2023-06-28 to public repo version 2023-10-11-preview

* Move Microsoft.AzureDataTransfer to public repo with new api-version

* Add openapi-subtype

* Fix LintDiff errors

* Fix examples validation errors

* Add Data flow type

* Remove additionalProperties

* Rename to performRequest

* Update result and code

* Remove action endpoint, add listApprovedSchemas and validateSchema endpoints
…ensions/chat/completions (#27271)

* auth

* restore

* vector db

* fix examples

* fix

* matrix

* fix cosmosdb

* fix pinecone description

* generated

---------

Co-authored-by: Yuantao Wang <yuantw@microsoft.com>
…27295)

* Update readme.md: Common/stable/2023-06-01

current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01

* updated version and added exclude-file

* reverted changes from preious commit and changed stable version date.

* Changed which data v2 swagger file is being pointed to.

* Added '- Microsoft.Maps/Data/preview/1.0/data.json' to the deprecated tag.
* remove job name

* Update eng/pipelines/typespec-validation.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>

* Update eng/tools/typespec-validation/ci.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>

* Update eng/pipelines/typespec-validation-all.yml

Co-authored-by: Mike Harder <mharder@microsoft.com>

---------

Co-authored-by: Mike Harder <mharder@microsoft.com>
Co-authored-by: Sushil Upadhyay <supadhyay@microsoft.com>
…n Results (#26777)

* add scriptCode, and enums for script

* update name for sciptcode

* fixed policheck and spelling issue

* Add new words to custom-words.txt and update Bengala enum
* Update readme.md: Common/stable/2023-06-01

current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01

* fixed broken links in Creator.
* fix auth implementation

* format

* suppress auth warning

* clean up after team discussion
…stry service. (#27340)

* Update readme.md: Common/stable/2023-06-01

current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01

* Changed references to the data service to the new data registry service.

* Changed full-URL links to be site-relative links.

* Added words to the override list in cspell.json and ran Prettier check.
* Adds base for updating Microsoft.EdgeOrder from version preview/2022-05-01-preview to version 2024-02-01

* Updates readme

* Updates API version in new specs and examples

* Made with changes on top of 2023 preview swagger

* saving examples

* minor: spelling

* replace sub Id with guid

* mark provisionig state readonly

* fix prov details and site details to correct place in hierarchy

* orderItem delete remove 200 code

* Minor - fix model validation

* add suppression

* remove 202 from address delete

* mark as sync

* remove suppression if not needed

* keep address asynch

* changes as per review

* camelCase

* making contact details fields not required

* add address classification field

* rename state to NotInitiated
* Add snowflake v2 linkedService

* fix prettier

* update snowflakeV2 linkedService

* fix prettier

* Add snowflake v2 copysource and dataset

* Fix prettier

* Add swagger changes for synapse

* fix prettier

* remove AAD auth

* Update synapse linkedService

* Fix prettier

* snowflakeV2 add service principal auth

* remove dfe-string

* fix prettier check issue
* miss

* chunk size

---------

Co-authored-by: Yuantao Wang <yuantw@microsoft.com>
…ew pages. (#27370)

* Update readme.md: Common/stable/2023-06-01

current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01

* moved retirement note so it does not appear is the overview page. Corrected broken links to data and data v2 API.

* Added suppression to readme for RESPONSE_SCHEMA_NOT_IN_SPEC. reason: false positive from oav is breaking our example validation. See Azure/oav#1021.

* fixed links
* Update readme.md: Common/stable/2023-06-01

current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01

* Fixed broken links that appear in the REST API docs.

* Added suppression RESPONSE_SCHEMA_NOT_IN_SPEC. reason: false positive from oav is breaking our example validation. See Azure/oav#1021.

* Added suppression RESPONSE_SCHEMA_NOT_IN_SPEC.
Co-authored-by: Bo Wang <v-bw@microsoft.com>
This was referenced Feb 14, 2024
@mikekistler mikekistler removed their request for review February 14, 2024 11:47
@zman-ms zman-ms closed this Feb 17, 2024
auto-merge was automatically disabled February 17, 2024 01:13

Pull request was closed

@zman-ms zman-ms reopened this Feb 17, 2024
@allenjzhang
Copy link
Member

This is required PR to update a private dev branch in order to bring to same base as main.

@allenjzhang allenjzhang merged commit 662d6d6 into dev-aks-fleet-2024-02-02-preview Feb 17, 2024
5 of 28 checks passed
@allenjzhang allenjzhang deleted the zman/2024-02-02-preview-conflicts-2 branch February 17, 2024 01:40
@allenjzhang allenjzhang restored the zman/2024-02-02-preview-conflicts-2 branch February 17, 2024 01:43
allenjzhang added a commit that referenced this pull request Feb 17, 2024
allenjzhang added a commit that referenced this pull request Feb 17, 2024
This reverts commit 662d6d6.

Co-authored-by: Allen Zhang <allenzhang@live.com>
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.