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.

Sign up for GitHub

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

Jump to bottom

Resolve conflicts with the main branch #27097

Closed
wants to merge 115 commits into from
Closed

Resolve conflicts with the main branch #27097

wants to merge 115 commits into from

Conversation

saragluna
Copy link
Member

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.

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)

  • If this PR is in purview of ARM review then automation will add the ARMReview label.
  • If you want to force ARM review, add the label yourself.
  • Proceed according to the diagram at the top of this comment.
Click here to see the diagram footnotes

Diagram footnotes

[1] ARM review queue (for merge queues, see [2])
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.
If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label ARMChangesRequested
is removed from your PR. This should cause the label WaitForARMFeedback to be added.
[2] public repo merge queue, private repo merge queue (for ARM review queue, [1])

If you need further help with anything, see Getting help section below.

Purpose of this PR

What's the purpose of this PR? Check all that apply. This is mandatory!

  • New API version. (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 swagger 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
Swagger-Suppression-Process
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.
  • 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.

besh2014 and others added 30 commits November 22, 2023 02:08
@besh2014
[Hub Generated] Review request for Sms to add version preview/2023-06…
4ad21c4 
…-30-privatepreview and preview/2024-01-14-preview (Azure#26083)

* Added Mms private preview. Includes Sms from GA.

* Added 2024-01-14-preview version of MMS to communication-sms.

* Fixed prettier issues (https://aka.ms/ci-fix#prettier-check).

* Fixed prettier issues

* Fixed required warnings. Removed private-preview for now

* Fixed constraints

* Fixed model and spellcheckk warnings

* Few more warnings fixed.

* change default tag

* Added x-ms-long-running-operation

* Removed long running operation

* Updated default tag

* Added lro suppression.

* Added IntegerTypeMustHaveFormat suppression

* PR comments: Updated descriptions. Added SmsSendResponseItem back and MmsSendResponseItem.

* Removed enum accepted/rejected from repeatabilityResult because of XmsEnumValidation LintDiff error.

* Revert accidental changes from stable version

* Removed enum accepted/rejected from repeatabilityResult because of XmsEnumValidation LintDiff error.

* Add enum accepted/rejected to repeatabilityResult  as it break SDK. Suppressed XmsEnumValidation LintDiff error.

* PR comments. Renamed examples files to something simpler.

* Typos

* Added enum accepted/rejected to MMS repeatabilityResult.

* Renamed mimeType to contentType and transformed to an extensible enum field to indicate what values are supported.

* Updated samples with contentType and contentInBase64.

* Added msvideo to custom-words.txt to fix Swagger SpellCheck.

* Added format byte to contentInBase64.

* removed IntegerTypeMustHaveFormat suppression.

* Added int32 type to SmsSendResponseItem httpStatusCode
@HariPrasadV
Reusing the OSSku definition and renaming definitions to avoid overla…
219d875 
…p in SDK - HybridAKS 2023-11-15-preview (Azure#26741)

* Reusing the OSSku definition

* Adding readonly flag and default value

* Renaming properties structure to avoid overlap

* Fixing the readonly

* fixing the casing

* Fixing Model Validation
@jessHuh
[Hub Generated] Review request for Microsoft.NotificationHubs to add …
21467ec 
…version preview/2023-10-01-preview (Azure#26443)

* Adds base for updating Microsoft.NotificationHubs from version stable/2023-09-01 to version 2023-10-01-preview

* Updates readme

* Updates API version in new specs and examples

* Update API Spec including FCMv1

* update api spec

* linting
@cparisineti
Revert "Add KeyCredentialTrait (Azure#26779)" (Azure#26819)
8263dd6 
This reverts commit 7ae8d80.
@Alancere
update paloaltonetworks readme.go.md (Azure#26731)
4bb583b 
* remove operationName

* fix
@vivekmore-msft
Call Automation Api spec for 2023-10-15 (GA2) (Azure#25624)
ae57786 
* GA2 swagger JSON

* Pointing default tag to package-2023-10-15

* Adding/updating signalling feature APIs and examples

* Updated examples

* Updated events

* Fixed API review comments

* Updated examples with API review fixes

* API review fixes and added custom context (Azure#26252)

* API review fixes and added custom context

* Fixed Json error

* Updated CustomContext description

* Fixed review comments (Azure#26509)

* GA2 swagger JSON

* Pointing default tag to package-2023-10-15

* Adding/updating signalling feature APIs and examples

* Updated examples

* Updated events

* Fixed API review comments

* Updated examples with API review fixes

* API review fixes and added custom context (Azure#26252)

* API review fixes and added custom context

* Fixed Json error

* Updated CustomContext description

* Fixed review comments (Azure#26509)

* Adding back cogservice in custom-words.txt

* Renamed param to customCallingContext

* Renamed class to CustomCallingContext
@kazrael2119
add directive in paloaltonetwork readme.typescript.md (Azure#26709)
c1ba9df
@weidongxu-microsoft
mgmt, java, skip flatten for non-GA TypeSpec libs (Azure#26687)
8d68a1d
@ChenxiJiang333
Update readme.python.md (Azure#26711)
739f4f5
@haolingdong-msft
networkanalytics, create readme.java.md to add service name and title (…
3abd387 
…Azure#26785)
@koyasu221b
first commit (Azure#26787)
cb2d97e 
Co-authored-by: Will Huang <huangwill@microsoft.com>
@cparisineti
Add customizaton class (Azure#26821)
12de39b
@raych1
PR workflow diagram update (Azure#26816)
738ab25 
* Add files via upload

* Add files via upload

* Update control_plane_template.md

updated asset url and removed obsolete notes.

* Removed the misspelled underline from words

* Update control_plane_template.md

Use new link of diagram.
Removed unused sdk breaking change reviewers pinned link.
@asmitt @soumyapattnaik
@Shashank1306s @nickpacificomsft
[Hub Generated] Review request for Microsoft.DataProtection to add ve…
9c146b3 
…rsion stable/2023-11-01 (Azure#26491)

* Adds base for updating Microsoft.DataProtection from version stable/2023-05-01 to version 2023-11-01

* Updates readme

* Updates API version in new specs and examples

* copied changes for CRR from api-version 2023-04-01-preview

* added replicated regions to vault and filters to fetch CRR jobs

* removed extension routing changes

* completed with warnings job changes

* Add RecoveryPointState to DataProtection

* Asmitt dataprotection microsoft.data protection 2023 11 01 (Azure#26663)

* Adds base for updating Microsoft.DataProtection from version preview/2023-04-01-preview to version 2023-06-01-preview

* Updates readme

* Updates API version in new specs and examples

* changes for AKS vault tier restore

* address typos

* Adds base for updating Microsoft.DataProtection from version stable/2023-05-01 to version 2023-11-01

* Updates readme

* Updates API version in new specs and examples

* copied changes for CRR from api-version 2023-04-01-preview

* added replicated regions to vault and filters to fetch CRR jobs

* Adds base for updating Microsoft.DataProtection from version stable/2023-05-01 to version 2023-08-01

* Updates readme

* Updates API version in new specs and examples

* removed extension routing changes

* changes for vault tier

* completed with warnings job changes

* Add RecoveryPointState to DataProtection (Azure#26426)

* Add RecoveryPointState to DataProtection

* Prettier fixes

* Adds base for updating Microsoft.DataProtection from version stable/2023-05-01 to version 2023-11-01

* Updates readme

* Updates API version in new specs and examples

* copied changes for CRR from api-version 2023-04-01-preview

* added replicated regions to vault and filters to fetch CRR jobs

* removed extension routing changes

* completed with warnings job changes

* Add RecoveryPointState to DataProtection (Azure#26426)

* Add RecoveryPointState to DataProtection

* Prettier fixes

---------

Co-authored-by: Shashank Singh <shashank1306s@gmail.com>
Co-authored-by: asmitt <62243673+asmitt@users.noreply.github.com>
Co-authored-by: Ashish Mittal <asmitt@microsoft.com>
Co-authored-by: nickpacificomsft <144935783+nickpacificomsft@users.noreply.github.com>

* resolved lint issues

* added missing operation and schema description

* spelling fix

* lint error suppressions

* resolved warnings

* fixed operationId

---------

Co-authored-by: soumyapattnaik <33341338+soumyapattnaik@users.noreply.github.com>
Co-authored-by: Shashank Singh <shashank1306s@gmail.com>
Co-authored-by: nickpacificomsft <144935783+nickpacificomsft@users.noreply.github.com>
@vipray-ms
Adding new preview version "2023-11-01-preview" with new APIs (Azure#…
5856115 
…26528)

* New API Version 2023-11-01-preview

* Adding new APIs

* Fixing PR Errors

* Model Validation Errors Fix

* fixing lint diff errors

* ModalValidation Error Fixed

* fixing ARM ID in examples

* Revert "ModalValidation Error Fixed"

This reverts commit 90a9177.

* reverting default tag value

* fix error

* resolving comments

* adding email param in body

* Resolving Comments

* updating default tag
@Alancere
security readme.go.md directive (Azure#26857)
c0e7b13
@Sandido @kangsun-ctrl
GalleryRP 2022-08-03 release branch (Azure#25524)
a4d77e0 
* copied over old api version

* api version update

* modelvalidation and br cleanup

* CVM TDX and Custom UEFI Keys (Azure#25661)

* changes

* prettier

* Add 'artifactTags' and 'disclaimer' field for shared gallery and community gallery (Azure#25659)

* all discalimer and previous arm updates

* cleanup

* prettier

* 'update' (Azure#25769)

* uri format (Azure#25794)

* Address ARM reviewer comment for community gallery (Azure#25803)

* update

* update

---------

Co-authored-by: kangsun-ctrl <69279251+kangsun-ctrl@users.noreply.github.com>
@ryanosh
[Hub Generated] Review request for Microsoft.DesktopVirtualization to…
41a50ea 
… add version preview/2023-11-01-preview (Azure#26606)

* Adds base for updating Microsoft.DesktopVirtualization from version preview/2023-10-04-preview to version 2023-11-01-preview

* Updates readme

* Updates API version in new specs and examples

* pull in changes from 2022-08-09-privatepreview

* add missing parameter

* add retryProvisioning endpoint

* update to use consistent version of common-types

* remove 204 response for LRO POST calls

* Make SHC put an lro

* fix modelValidation

* remove 204 response from examples

* add resourceName restriction patterns

* update pattern restriction

* add suppression for resourceNameRestriction

* missed suppression

* use v5 common-types

* Revert "use v5 common-types"

This reverts commit c356d33.

* use v5 common-types

* Revert "use v5 common-types"

This reverts commit 239d772.

* update SHM operation status to correctly present custom properties

* add type object
@JoshLove-msft
Update readme.md (Azure#26872)
de24532
@RheaHooda23
Adding new version 2023-11-01-preview for updating monitor Properties (…
565e209 
…Azure#26659)

* Base API commit

* Changing version to new 2023-11-01-preview

* adding additional parameters to monitorProperties

* updating readme.md

* updated readme.md

* updating description

* updating example
@apoorvasingh130
Azure Active Directory change to Microsoft Entra ID (Azure#26815)
1631971 
* Azure Active Directory change to Microsoft Entra ID

* Add missing location headers
@stevemunk
Update readme.md (Azure#26775)
784f4a4 
current: Common/stable/2023-07-01
Updated: Common/stable/2023-06-01
@bexxx
Fix type of detected to be boolean as returned by service (Azure#26863)
9c7722c
@zhaiyutong
enable java partial update in AACS (Azure#26880)
91ada2b
Revert "Add TypeSpec label for PullRequests (Azure#26542)" (Azure#26879)
6511ebd 
This reverts commit b672a0b.
@mikeharder
Upgrade typespec-client-generator-core to 0.36.1 (Azure#26878)
4fabea7
@JoshuaLai
Updating examples and documents (Azure#26840)
4eb1ac2 
* Updating examples and documents

* Updating the examples as per comments

* Updating prettier errors
@aneesh-ponneth @anponnet
[Hub Generated] Publish private branch 'edgemrketplace202308' (Azure#…
6507720 
…25556)

* add or modify files

* Update readme.md to remove reference to older versions

* Added readme.az.md fole

* Correct casing - EdgeMarketPlace to EdgeMarketplace

* A commit to rename folder

* Correct casing of folder name

* Fix readme files

---------

Co-authored-by: Aneesh Ponneth <anponnet@microsoft.com>
@audunn
[Hub Generated] Publish private branch 'release-netapp-Microsoft.NetA…
f5aa38d 
…pp-2023-05-01-preview' (Azure#26643)

* Adds base for updating Microsoft.NetApp from version preview/2022-11-01-preview to version 2023-05-01-preview

* Updates readme

* Updates API version in new specs and examples

* Apply 2023-05-01-preview changes

* pretty

* spelling

* spelling2

* spelling

* default error response

* added to requred again

* remove onprem migration operations

* fix breaking

* fix breaking2

* update common types to v5

* deploymentspec

* lintdiff

* style lint

* lint model

* lint model

* lint model2

* lint model2

* lint model

* LintDiff issues

* DeleteResponseCode lintDiff
@gyz0072004
[Hub Generated] Publish private branch 'gyz0072004-testbase-Microsoft…
30d711a 
….TestBase-2023-11-01-preview' (Azure#26488)

* add or modify files

* update readme files

* fix samples

* update resource name patterns and response codes for CI check for testbase 2023-11-01-preview (Azure#26621)

* update resource name patterns

* update editable responce codes

* update descriptions

* try to fix the suppression (Azure#26755)

* try to fix suppression again (Azure#26810)
This was referenced Dec 15, 2023
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Draft
Closed
Draft
Closed
Closed
Draft
Closed
Draft
Closed
Closed
Closed
Closed
Draft
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.