Skip to content

Fix merge conflicts #34752

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
Open
wants to merge 776 commits into
base: release-machinelearningservices-Microsoft.MachineLearningServices-2025-04-01-preview
Choose a base branch
from
Open

Fix merge conflicts #34752

wants to merge 776 commits into from

Conversation

fmabroukmsft
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.

spec_pr_review_workflow_diagram

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 created in adherence to OpenAPI specs PR creation guidance).
  • 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.
  • Convert existing OpenAPI spec to TypeSpec spec (do not combine this with implementing changes for a new API version).
  • Other, please clarify:
    • Address merge conflicts

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.
  • A release plan has been created. If not, please create one as it will help guide you through the REST API and SDK creation process.

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.
  • If you don't have permissions to remove or add labels to the PR, request write access per aka.ms/azsdk/access#request-access-to-rest-api-or-sdk-repositories
  • 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 ARM review (PR workflow diagram Step 2), 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.

alluri02 and others added 30 commits April 22, 2025 10:10
@alluri02
Neon GA release dotnet SDK client fixes (#34043)
0c2a77f 
* updated the client spec file to fix the dotnet sdk issues

* removed unused imports

---------

Co-authored-by: Srinivas Alluri <[email protected]>
@Padmapriya-09 @09-Padmapriya
update existing api version for dell with optional fields (#34020)
1c7ebac 
* update api version for dell with optional fields

* add termUnit in marketplace

---------

Co-authored-by: Padmapriya-09 <[email protected]>
@weidongxu-microsoft
java, openai, Update tspconfig.yaml, put back namespace option (#34117)
2a41147
@JiaqiZhang-Dev
update tspconfig.yaml (#34064)
0e84b9d
@kazrael2119 @MaryGao
Fix the @bodyRoot nested with @Body issue for scvmm (#33827)
d2457f3 
* Fix the @bodyRoot nested with @Body issue for scvmm

* Update custom.tsp

* Update custom.tsp

---------

Co-authored-by: Mary Gao <[email protected]>
@koderjoker
Change customerFacingSizeInGB to sizeInGB (#34118)
0eaaa71 
Co-authored-by: Kanchan Joshi <[email protected]>
@ChenxiJiang333
[Onlineexperimentation] update tsp config (#34113)
908f30f 
* python-tsp-config

* reformat

* Update client.tsp
@jliusan
update readme.go.md (#33988)
549e13f 
 remove deprecated configs from track 1, some kind of automation is expected as it runs against a large set of RP, force merging this PR
@jliusan
add tspconfig (#34121)
b713df2 
* add tspconfig

* add tspconfig
@amruthashree18
Fixing the breaking change from 2024-01-26-preview API version. Updat… (
7a6eb29 
#34088)

* Fixing the breaking change from 2024-01-26-preview API version. Updated endpoint back to ledgerEndpoint

* Updating ledgerEndpoint parameter

* Keeping the change only on 2024-12-09-preview version

* Adding supressions for linter

* Correcting typo errors
@mitsha-microsoft
[Azure Load Testing] Disable Samples Project Generation for .NET SDK …
4d3c92e 
…Configuration (#34130)

* Correcting the properties used for generation of SDK
@azure-sdk @scbedd
Fix additional TriggerPaths not being honored in Get-PrPkgProperties (#…
fd6d755 
…34112)

Co-authored-by: Scott Beddall <[email protected]>
@jovinson-ms @josiahvinson
Update .NET client names (#34131)
4653079 
* Update .NET client names

* Java SDK feedback

---------

Co-authored-by: Josiah Vinson <[email protected]>
@andrewjhopkins
Anhopki/communication phone numbers 2025 04 15 preview (#33220)
9233e7c 
* mobile preview api version
@azure-sdk @jorgerangel-msft
build: enable pushing emitter nuget packages (#34129)
ea7af0b 
Co-authored-by: Jorge Rangel <[email protected]>
Co-authored-by: Jorge Rangel <[email protected]>
@quentinRobinson
Update Language AnalyzeText API to version 2025-05-15-preview (#33767)
50f369c 
* Update Language AnalyzeText API to version 2025-05-15-preview

* fixes

* update examples

* fixes

* more fixes

* organization update in readme.md

* add cancleAfter for jobs

* add cancelAfter parameter to job definition for timeout handling

* add entitySynonyms parameter to enhance entity detection in AnalyzeText API

* fix error

* tsv fix

* fix pii logging optout bug

* tsv fix

* updated arrays to new format, and added language format for EntitySynonym

* tsv fix

* tsv fixes

* fix synonym placement

* tsv

* tsv

* added PII categories

* tsv

* tsv
@dependabot
Bump marked from 15.0.8 to 15.0.9 in /.github/shared (#34105)
130c797 
Bumps [marked](https://github.com/markedjs/marked) from 15.0.8 to 15.0.9.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](markedjs/marked@v15.0.8...v15.0.9)

---
updated-dependencies:
- dependency-name: marked
  dependency-version: 15.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump marked from 15.0.8 to 15.0.9 in /.github (#34104)
e7f3c3e 
Bumps [marked](https://github.com/markedjs/marked) from 15.0.8 to 15.0.9.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](markedjs/marked@v15.0.8...v15.0.9)

---
updated-dependencies:
- dependency-name: marked
  dependency-version: 15.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chlowell
Azure.Batch Go configuration (#32768)
1669c50
@chidozieononiwu
Switch to Step Condition (#33960)
eda4421
@dependabot
Bump the eslint group across 2 directories with 2 updates (#34106)
aaf0b7a 
Bumps the eslint group with 2 updates in the /.github directory: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint).
Bumps the eslint group with 2 updates in the /.github/shared directory: [@eslint/js](https://github.com/eslint/eslint/tree/HEAD/packages/js) and [eslint](https://github.com/eslint/eslint).


Updates `@eslint/js` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.25.1/packages/js)

Updates `eslint` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.24.0...v9.25.1)

Updates `@eslint/js` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.25.1/packages/js)

Updates `eslint` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.24.0...v9.25.1)

Updates `@eslint/js` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.25.1/packages/js)

Updates `eslint` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.24.0...v9.25.1)

Updates `@eslint/js` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/commits/v9.25.1/packages/js)

Updates `eslint` from 9.24.0 to 9.25.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v9.24.0...v9.25.1)

---
updated-dependencies:
- dependency-name: "@eslint/js"
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@eslint/js"
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@eslint/js"
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: "@eslint/js"
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
- dependency-name: eslint
  dependency-version: 9.25.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: eslint
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@FumingZhang @nddq
@purpleran7 @reneeli123
Review request for Microsoft.ContainerService/aks to add version prev…
b75ffbe 
…iew/2025-02-02-preview (#33892)

* Adds base for updating Microsoft.ContainerService/aks from version preview/2025-01-02-preview to version preview/2025-02-02-preview

* Updates readme

* Updates API version in new specs and examples

* nguyenquang/2025 02 02 preview ACNS L7 Policy API (#33584)

* nguyenquang/2025 02 02 preview ACNS L7 Policy API

* formatting

* prettier + enum to string

* add namespace to swagger 2025-02-02-preview (#33594)

* add namespace to swagger 2025-02-02-preview

* fix pipeline

* fix pipeline

* add NamespacesListCredentialResult.json

* refactor

* prettier

* prettier again

* fix pipeline

* prettier

* fix pipeline

* prettier

* refactor to fix pipeline

* refactor

* fix pipeline

* revert to use v5 as suggested

* suppress lint diff

* fix

* fix

* fix

* fix

* nguyenquang/2025 02 02 preview ACNS Transit Encryption API (#33870)

* nguyenquang/2025 02 02 preview ACNS Transit Encryption API

* prettier

* Update mixed sku api sizes to size and remove osDisk related fields (#33941)

* Update mixed sku api sizes to size and remove osDisk related fields

* fix prettier

* fix model validation

---------

Co-authored-by: [email protected] <reneeli>

---------

Co-authored-by: Quang Nguyen <[email protected]>
Co-authored-by: Yiran Li <[email protected]>
Co-authored-by: reneeli123 <[email protected]>
@ArthurMa1978
Prepare client settings for release PineconeVectorDB .Net SDK (#34132)
c32a29a
@ChenxiJiang333
Update client.tsp (#34149)
8ab23bf
@RenzoPrettoMS
remove operation status endpoint from sdk (#34099)
8aec79a
@ArthurMa1978
Prepare client settings for release LambdaTestHyperExecute, WeightsAn…
ad9b489 
…dBiases, ArizeAIObservabilityEval .Net SDK (#34151)
@v-hongli1
java, mgmt, Firmware Analysis in Azure, client (#34077)
8a61513 
* java, mgmt, Firmware Analysis in Azure, client

* update service name
@live1206
rename PortalServices for .NET SDK (#34155)
fc1f625
@raych1
Repurposed breaking chagne artifact to be spec-gen-sdk artifact (#34095)
f33ec2c
@timotheeguerin
Upgrade typespec 1.0.0-rc.1 (#34137)
dc2b7ba
@openapi-pipeline-app openapi-pipeline-app
Copy link

openapi-pipeline-app bot commented May 16, 2025 •
edited
Loading

Next Steps to Merge

Next steps that must be taken to merge this PR:
  • ❌ Your PR requires an API stewardship board review as it introduces a new API version (label: new-api-version). Schedule the review by following aka.ms/azsdk/onboarding/restapischedule.
  • ❌ This PR is in purview of the ARM review (label: ARMReview). This PR must get ARMSignedOff label from an ARM reviewer.
    This PR is awaiting ARM reviewer feedback (label: WaitForARMFeedback).
    To learn when this PR will get reviewed, see ARM review queue at aka.ms/azsdk/pr-arm-review
    For details of the ARM review, see aka.ms/azsdk/pr-arm-review
  • ❌ The required check named Swagger PrettierCheck has failed. Refer to the check in the PR's 'Checks' tab for details on how to fix it and consult the aka.ms/ci-fix guide
  • ❌ The required check named Swagger Avocado has failed. Refer to the check in the PR's 'Checks' tab for details on how to fix it and consult the aka.ms/ci-fix guide

@openapi-pipeline-app openapi-pipeline-app
Copy link

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

@fmabroukmsft fmabroukmsft requested review from DominikMe and marclerwick and removed request for a team May 16, 2025 22:37
@github-actions github-actions bot added BreakingChange-Go-Sdk-Suppression BreakingChange-JavaScript-Sdk-Suppression brownfield Brownfield services will soon be required to convert to TypeSpec. See https://aka.ms/azsdk/typespec. labels May 16, 2025
@AzureRestAPISpecReview AzureRestAPISpecReview added ARMReview data-plane new-api-version resource-manager RPaaS SuppressionReviewRequired TypeSpec Authored with TypeSpec WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required labels May 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weshaggard weshaggard Awaiting requested review from weshaggard weshaggard is a code owner

@mikeharder mikeharder Awaiting requested review from mikeharder mikeharder is a code owner

@benbp benbp Awaiting requested review from benbp benbp is a code owner

@msyyc msyyc Awaiting requested review from msyyc msyyc is a code owner

@tadelesh tadelesh Awaiting requested review from tadelesh tadelesh is a code owner

@jsntcy jsntcy Awaiting requested review from jsntcy jsntcy is a code owner

@qiaozha qiaozha Awaiting requested review from qiaozha qiaozha is a code owner

@yangyuan yangyuan Awaiting requested review from yangyuan yangyuan is a code owner

@jessicl-ms jessicl-ms Awaiting requested review from jessicl-ms jessicl-ms is a code owner

@rrahulms rrahulms Awaiting requested review from rrahulms rrahulms is a code owner

@ChenglongLiu ChenglongLiu Awaiting requested review from ChenglongLiu ChenglongLiu is a code owner

@Ptnan7 Ptnan7 Awaiting requested review from Ptnan7 Ptnan7 is a code owner

@wiboris wiboris Awaiting requested review from wiboris wiboris is a code owner

@dpwatrous dpwatrous Awaiting requested review from dpwatrous dpwatrous is a code owner

@skapur12 skapur12 Awaiting requested review from skapur12 skapur12 is a code owner

@cRui861 cRui861 Awaiting requested review from cRui861 cRui861 is a code owner

@wanghoppe wanghoppe Awaiting requested review from wanghoppe wanghoppe is a code owner

@jijohn14 jijohn14 Awaiting requested review from jijohn14 jijohn14 is a code owner

@Juliehzl Juliehzl Awaiting requested review from Juliehzl Juliehzl is a code owner

@DominikMe DominikMe Awaiting requested review from DominikMe DominikMe is a code owner automatically assigned from Azure/api-stewardship-board

@marclerwick marclerwick Awaiting requested review from marclerwick marclerwick is a code owner automatically assigned from Azure/api-stewardship-board

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
ARMReview BreakingChange-Go-Sdk-Suppression BreakingChange-JavaScript-Sdk-Suppression brownfield Brownfield services will soon be required to convert to TypeSpec. See https://aka.ms/azsdk/typespec. data-plane new-api-version resource-manager RPaaS SuppressionReviewRequired TypeSpec Authored with TypeSpec WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.