Fix merge conflicts in custom-words.txt #24532

erjms · 2023-06-21T15:43:19Z

ARM (Control Plane) API Specification Update Pull Request

Purpose of this PR

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

New API version. (Such PR should have been generated with OpenAPI Hub, per this wiki doc.)
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:
- Fix merge conflicts in protected staging branch

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 have reviewed the general guidance on the spec PR review process: https://aka.ms/specprreview.
I confirm this PR is modifying Azure Resource Manager (ARM) related specifications, and not data-plane related specifications.
I commit to follow the Breaking Change Policy.
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 request review from an ARM API Review board.

ARM API changes review

If you want for the ARM team to review this PR, you must add the ARMReview label.
The automation may automatically add the ARMReview label, if appropriate.
If this happens, proceed according to guidance given in GitHub comments also added by the automation.

Breaking change review

If you have any breaking changes as defined in the Breaking Change Policy,
follow the process outlined in the High-level Breaking Change Process doc.

Getting help

For guidance on fixing this PR CI check failures, see the hyperlinks provided in given failure
and https://aka.ms/ci-fix.
For additional help, see https://aka.ms/azsdk/support/spectools.

openapi-workflow-bot · 2023-06-21T15:43:23Z

Hi, @erjms 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 · 2023-06-21T15:43:23Z

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.

️️✔️SwaggerAPIView succeeded [Detail] [Expand]

️️✔️CadlAPIView succeeded [Detail] [Expand]

️️✔️TypeSpecAPIView succeeded [Detail] [Expand]

️️✔️ModelValidation succeeded [Detail] [Expand]

Validation passes for ModelValidation.

️️✔️SemanticValidation succeeded [Detail] [Expand]

Validation passes for SemanticValidation.

️️✔️PrettierCheck succeeded [Detail] [Expand]

Validation passes for PrettierCheck.

️️✔️SpellCheck succeeded [Detail] [Expand]

Validation passes for SpellCheck.

️️✔️CadlValidation succeeded [Detail] [Expand]

Validation passes for CadlValidation.

️️✔️TypeSpec Validation succeeded [Detail] [Expand]

Validation passes for TypeSpec Validation.

️️✔️PR Summary succeeded [Detail] [Expand]

Validation passes for Summary.

_{Posted by Swagger Pipeline | How to fix these errors?}

openapi-pipeline-app · 2023-06-21T15:43:25Z

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 · 2023-06-21T15:43:25Z

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

…to add version preview/2023-06-01-preview (#24049) * Adds base for updating Microsoft.MachineLearningServices from version preview/2023-04-01-preview to version 2023-06-01-preview * Updates readme * Updates API version in new specs and examples * MFE 2023-06-01-preview staging (#24051) * Updated mfe.json * Added package example * Updated custom-words.txt * Updated package examples * Added pattern retriction to resource name parameters * Fixed cross-api breaking changes * Fixed cross-api breaking changes * Added descriptions * Added description * Separate workspace rp swagger from mlc (#24249) * separate workspace rp swagger from mlc * add missing parameter * Updated mfe.json descriptions for put 200 responses (#24295) * update EnableNodePublicIp for computeInstance of MLC (#24231) Co-authored-by: Bingchen Li <bingchenli@microsoft.com> * Update workspaceRP swagger with automation result (#24333) * Update workspace rp swagger with automation result rename pe definition to avoid conflict fix update PE name Update connection credential hide armid fix more things Fix enum issue fix polymorphism Update examples Update body name and example fix more issue update response body Fix Revert "file change" This reverts commit 4a1fdccf6eb22e1dda82d3acce8065fae171f422. file change Update swagger fix errors update format add example for connetion list secrets api run prettier * Fixing more issue * revert custom-words * run prettier * Update securityDefinitions * Revert operation id * Update description and summary. * fix prettier issue and add description * remove redundent object definition * fixing swagger issue revert PaginationParameter * Revert back to old file with only reorder for better compare * Revert "Revert back to old file with only reorder for better compare" This reverts commit 8feb7d8. * Revert connection v2 tag issue * Add back delete op for network rule * Add back example for the removed API * Suppress header check caused by old design * fix delete rule in path * Update example error * Update delete rule api and remove suppression * Fixed merge conflicts in custom-words.txt (#24532) --------- Co-authored-by: ZhidaLiu <zhili@microsoft.com> Co-authored-by: libc16 <88697960+libc16@users.noreply.github.com> Co-authored-by: Bingchen Li <bingchenli@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

…to add version preview/2023-06-01-preview (Azure#24049) * Adds base for updating Microsoft.MachineLearningServices from version preview/2023-04-01-preview to version 2023-06-01-preview * Updates readme * Updates API version in new specs and examples * MFE 2023-06-01-preview staging (Azure#24051) * Updated mfe.json * Added package example * Updated custom-words.txt * Updated package examples * Added pattern retriction to resource name parameters * Fixed cross-api breaking changes * Fixed cross-api breaking changes * Added descriptions * Added description * Separate workspace rp swagger from mlc (Azure#24249) * separate workspace rp swagger from mlc * add missing parameter * Updated mfe.json descriptions for put 200 responses (Azure#24295) * update EnableNodePublicIp for computeInstance of MLC (Azure#24231) Co-authored-by: Bingchen Li <bingchenli@microsoft.com> * Update workspaceRP swagger with automation result (Azure#24333) * Update workspace rp swagger with automation result rename pe definition to avoid conflict fix update PE name Update connection credential hide armid fix more things Fix enum issue fix polymorphism Update examples Update body name and example fix more issue update response body Fix Revert "file change" This reverts commit 4a1fdccf6eb22e1dda82d3acce8065fae171f422. file change Update swagger fix errors update format add example for connetion list secrets api run prettier * Fixing more issue * revert custom-words * run prettier * Update securityDefinitions * Revert operation id * Update description and summary. * fix prettier issue and add description * remove redundent object definition * fixing swagger issue revert PaginationParameter * Revert back to old file with only reorder for better compare * Revert "Revert back to old file with only reorder for better compare" This reverts commit 8feb7d8. * Revert connection v2 tag issue * Add back delete op for network rule * Add back example for the removed API * Suppress header check caused by old design * fix delete rule in path * Update example error * Update delete rule api and remove suppression * Fixed merge conflicts in custom-words.txt (Azure#24532) --------- Co-authored-by: ZhidaLiu <zhili@microsoft.com> Co-authored-by: libc16 <88697960+libc16@users.noreply.github.com> Co-authored-by: Bingchen Li <bingchenli@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

Fixed merge conflicts in custom-words.txt

dcbf945

erjms changed the title ~~Fixed merge conflicts in custom-words.txt~~ Fix merge conflicts in custom-words.txt Jun 21, 2023

erjms marked this pull request as ready for review June 21, 2023 15:45

erjms added the ARMReview label Jun 21, 2023

openapi-workflow-bot bot added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Jun 21, 2023

erjms added resource-manager and removed WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required ARMReview resource-manager labels Jun 21, 2023

maririos approved these changes Jun 21, 2023

View reviewed changes

erjms merged commit e3f383f into Azure:release-machinelearningservices-Microsoft.MachineLearningServices-2023-06-01-preview Jun 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix merge conflicts in custom-words.txt #24532

Fix merge conflicts in custom-words.txt #24532

erjms commented Jun 21, 2023 •

edited

Loading

openapi-workflow-bot bot commented Jun 21, 2023

openapi-pipeline-app bot commented Jun 21, 2023 •

edited

Loading

openapi-pipeline-app bot commented Jun 21, 2023 •

edited

Loading

Breaking Changes Tracking

openapi-pipeline-app bot commented Jun 21, 2023

Fix merge conflicts in custom-words.txt #24532

Fix merge conflicts in custom-words.txt #24532

Conversation

erjms commented Jun 21, 2023 • edited Loading

ARM (Control Plane) API Specification Update Pull Request

Purpose of this PR

Due diligence checklist

ARM API changes review

Breaking change review

Getting help

openapi-workflow-bot bot commented Jun 21, 2023

openapi-pipeline-app bot commented Jun 21, 2023 • edited Loading

Swagger Validation Report

openapi-pipeline-app bot commented Jun 21, 2023 • edited Loading

Swagger Generation Artifacts

Breaking Changes Tracking

openapi-pipeline-app bot commented Jun 21, 2023

erjms commented Jun 21, 2023 •

edited

Loading

openapi-pipeline-app bot commented Jun 21, 2023 •

edited

Loading

openapi-pipeline-app bot commented Jun 21, 2023 •

edited

Loading