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

merge recent custom-words.txt changes from main branch to resolve conflicts #15938

Merged
merged 5 commits into from
Sep 8, 2021
Merged

Conversation

chengliangli0918
Copy link
Contributor

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

Merge recent custom-words.txt changes from main branch to dev-containerservice-Microsoft.ContainerService-2021-08-01 because there is conflict on custom-words.txt in the PR to merge dev-containerservice-Microsoft.ContainerService-2021-08-01 to main (#15937)

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

…-01' of github.com:Azure/azure-rest-api-specs into dev-containerservice-Microsoft.ContainerService-2021-08-01
…-01' of github.com:Azure/azure-rest-api-specs into dev-containerservice-Microsoft.ContainerService-2021-08-01
@openapi-workflow-bot
Copy link

Hi, @chengliangli0918 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. vsswagger@microsoft.com

    @openapi-workflow-bot
    Copy link

    [Call for Action] To better understand Azure service dev/test scenario, and support Azure service developer better on Swagger and REST API related tests in early phase, please help to fill in with this survey https://aka.ms/SurveyForEarlyPhase. It will take 5 to 10 minutes. If you already complete survey, please neglect this comment. Thanks.

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 7, 2021

    Swagger Validation Report

    ️️✔️BreakingChange succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️LintDiff succeeded [Detail] [Expand]
    Validation passes for LintDiff.
    ️️✔️Avocado succeeded [Detail] [Expand]
    Validation passes for Avocado.
    ️️✔️ModelValidation succeeded [Detail] [Expand]
    Validation passes for ModelValidation.
    ️️✔️SemanticValidation succeeded [Detail] [Expand]
    Validation passes for SemanticValidation.
    ️️✔️Cross-Version Breaking Changes succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️[Staging] SDK Track2 Validation succeeded [Detail] [Expand]
    Validation passes for SDKTrack2Validation
    ️️✔️[Staging] PrettierCheck succeeded [Detail] [Expand]
    Validation passes for PrettierCheck.
    ️️✔️[Staging] SpellCheck succeeded [Detail] [Expand]
    Validation passes for SpellCheck.
    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 7, 2021

    Swagger Generation Artifacts

    ️️✔️[Staging] ApiDocPreview succeeded [Detail] [Expand]
    ️️✔️[Staging] SDK Breaking Change Tracking succeeded [Detail] [Expand]

    Breaking Changes Tracking

    Posted by Swagger Pipeline | How to fix these errors?

    @chengliangli0918
    Copy link
    Contributor Author

    @ArcturusZhang as the assignee, could you help us merge this PR to dev-containerservice-Microsoft.ContainerService-2021-08-01? Our merging PR from dev-containerservice-Microsoft.ContainerService-2021-08-01 to main was blocked because of conflict on file custom-words.txt.

    @ArcturusZhang ArcturusZhang merged commit d339887 into Azure:dev-containerservice-Microsoft.ContainerService-2021-08-01 Sep 8, 2021
    qwordy pushed a commit that referenced this pull request Sep 9, 2021
    …ch to main (#15954)
    
    * Adds base for updating Microsoft.ContainerService from version stable/2021-07-01 to version 2021-08-01
    
    * Updates readme
    
    * Updates API version in new specs and examples
    
    * add publicNetworkAccess property per network platform's request (#15489)
    
    * add publicNetworkAccess per network platform's request
    
    * fix quota
    
    Co-authored-by: Li Ma <lima2@microsoft.com>
    
    * update readme for 2021-08-01 sdk generation (#15476)
    
    * update readme for sdk generation
    
    * update readme for sdk generation
    
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    
    * allow disabling of runcommand (#15481)
    
    * allow disabling of runcommand
    
    * rename file
    
    * another rename
    
    * fix prittier check
    
    * fix stupid prettier check
    
    * change publicNetworkAccess to enum (#15564)
    
    Co-authored-by: Li Ma <lima2@microsoft.com>
    
    * Add CreationData property to Agentpool level in 2021-08-01 API (#15563)
    
    * Add CreationData property to Agentpool level in 2021-08-01 API
    
    * fix json format
    
    * fix swagger spell check
    
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    
    * chore: add enableMultipleStandardLoadBalancers to loadBalancerProfile (#15579)
    
    * Add snapshot related new APIs and properties to AKS 2021-08-01 swagger (#15586)
    
    * Add CreationData property to Agentpool level in 2021-08-01 API
    
    * Add snapshot related APIs and properties to AKS 2021-08-01 swagger
    
    * fix lint and spell checks
    
    * fix lint and spell checks
    
    * fix PrettierCheck
    
    * Change some Nodepool to NodePool
    
    * some changes according to ARM team's review comments
    
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    
    * fix tag typo to match tag convention (#15683)
    
    * add workload runtime to agent pool api (#15726)
    
    * add workload runtime to agent pool api
    
    * reference example
    
    * add custom words
    
    * fix: workload runtime description (#15782)
    
    * fix: workload runtime description
    
    * add wasmtime to custom words
    
    * clarify single workload type per node
    
    Co-authored-by: Matthew Christopher <matthchr@microsoft.com>
    
    Co-authored-by: Matthew Christopher <matthchr@microsoft.com>
    
    * fix typo in readme.python.md (#15903)
    
    * Add CreationData property to Agentpool level in 2021-08-01 API
    
    * fix typos in readme.python.md
    
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    
    * merge recent custom-words.txt changes from main branch to resolve conflicts (#15938)
    
    * Add CreationData property to Agentpool level in 2021-08-01 API
    
    * merge recent custom-words.txt changes from main branch to resolve conflicts
    
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    
    * pull custom-words.txt from main
    
    * add a new word - NodePool
    
    * add two more words
    
    Co-authored-by: Super <mali_no2@hotmail.com>
    Co-authored-by: Li Ma <lima2@microsoft.com>
    Co-authored-by: Charlie Li <charlili@microsoft.com>
    Co-authored-by: Haitao Chen <haitch@users.noreply.github.com>
    Co-authored-by: Qi Ni <pomelonicky@gmail.com>
    Co-authored-by: Ariel Silverman <asilverman@users.noreply.github.com>
    Co-authored-by: Ace Eldeib <alexeldeib@gmail.com>
    Co-authored-by: Matthew Christopher <matthchr@microsoft.com>
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    None yet
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    4 participants