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

[Do not Squash] Merge main branch to Az.Storage-preview branch (#1) #20970

Merged
merged 8 commits into from
Feb 20, 2023

Conversation

blueww
Copy link
Member

@blueww blueww commented Feb 20, 2023

Description

Since #20956 can't pass PR check, try to split it.

Checklist

  • SHOULD select appropriate branch. Cmdlets from Autorest.PowerShell should go to generation branch.
  • SHOULD make the title of PR clear and informative, and in the present imperative tense.
  • SHOULD update ChangeLog.md file(s) appropriately
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header in the past tense. Add changelog in description section if PR goes into generation branch.
    • Should not change ChangeLog.md if no new release is required, such as fixing test case only.
  • SHOULD have approved design review for the changes in this repository (Microsoft internal only) with following situations
    • Create new module from scratch
    • Create new resource types which are not easy to conform to Azure PowerShell Design Guidelines
    • Create new resource type which name doesn't use module name as prefix
    • Have design question before implementation
  • SHOULD regenerate markdown help files if there is cmdlet API change. Instruction
  • SHOULD have proper test coverage for changes in pull request.
  • SHOULD NOT introduce breaking changes in Az minor release except preview version.
  • SHOULD NOT adjust version of module manually in pull request

BethanyZhou and others added 8 commits February 8, 2023 15:02
* add pipeline yml for syncing fabricbot.json aliases

* change git user name and email in script

* change inline script to GetWiki2Json.ps1 file

* remove unnecessary code

* change wrong dir

* change to my personal repo for test

* change the usage of token

* change CreatePR.ps1 for test

* correct ParseWiki2Json.ps1

* remove unnecessary output

* remove quote

* finish test, change back to Azure repo

* change branch name

* change some names

* remove the use of magic number

* change commit message

* remove redundant git pull

* change the way of getting wiki content

* change space to -

* add md

* set current dir

* use space

* use -

* still use ADOToken

* use a better wiki url

* test purpose

* test2

* test oauth

* test3

* finish test

* test again

* test

* finish  test

* test cron

* test double pr

* solve double pr

* test

* test

* test

* finish test

* test

* finish test

* test restapi

* te

* finish test

* test

* finish test

* filter pr

* test

* test

* test

* test

* finish test

---------

Co-authored-by: Hongtu Zhang (FA Talent) <v-hongtzhang@microsoft.com>
* Added cmdlets for policy attestations

* Addressed pipeline errors

* Addressed PR comments

* Subscription ID Changed

* PR Comments 2

* Metadata Tests

* PR Comments Updated Docs
…rce code (Azure#20164)

* Add all files

* Add all code to module

* resolve changes

* Record securitySettings tests

* Record pricing tests

* Record securityAssessment and metadata

* Fix Alerts code and tests record and coverage

* Record and fix JitNetworkAccessPolicy tests

* Record assessments and metadata tests

* Record settings tests

* Add SubPlan support in pricing

* Change SecurityContact page type to list

* Fix and record SecurityContact tests

* Add support in evidence, techniques and sub techniques

* Pricings

* changes

* remove breaking changes

* Update ChangeLog.md

---------

Co-authored-by: Keren Damari <kedamari@microsoft.com>
Co-authored-by: Sulaiman Abu Rashed <surashed@microsoft.com>
Co-authored-by: surashed <55134940+surashed@users.noreply.github.com>
* Fix ThreadJob installation error of smoke test

* Address review comments
Co-authored-by: Beisi Zhou <zhoubeisi@gmail.com>
@blueww blueww added Do Not Squash 🚫 To prevent conflicts, this PR should not be squash merged. Do Not Merge 🚫 and removed Do Not Merge 🚫 labels Feb 20, 2023
@blueww
Copy link
Member Author

blueww commented Feb 20, 2023

@BethanyZhou

Would you please help to merge this PR?
It migrate part of the Main branch commit to Az.Storage-preview, include the Azure.Core upgrade, which is needed to the coming PR for Az.Storage-preview branch.

Other commits still have validation failures on help, which can be seen in #20973

@BethanyZhou BethanyZhou merged commit bec02c6 into Azure:Az.Storage-preview Feb 20, 2023
@blueww blueww deleted the mergestorge1 branch February 20, 2023 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Do Not Squash 🚫 To prevent conflicts, this PR should not be squash merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants