Skip to content

Merge Az.Batch-preview to master #10286

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
Merged
merged 33 commits into from
Oct 23, 2019
Merged

Merge Az.Batch-preview to master #10286

merged 33 commits into from
Oct 23, 2019

Conversation

matthchr
Copy link
Member

Description

This brings the long outstanding breaking changes in the Az.Batch module into master

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • 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 -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
    • the markdown help files have been regenerated using the commands listed here

matthchr and others added 30 commits February 28, 2019 12:55
@matthchr
Update AzBatch module SDK versions
3b03e5d 
  - Updated the Microsoft.Azure.Batch pacakge to 10.1.0.
  - Updated the Microsoft.Azure.Management.Batch package to 7.0.0.
  - Add new "New-AzBatchResourceFile" cmdlet to aid in ResourceFile creation.
@matthchr
Update Batch changelog and breaking changes
ca97936
@matthchr
Update cmdlet help
d22bc9d
@matthchr
Fix PSImageReference format
ce532d6
@matthchr
Fix issue with Batch error formatting
31762e4 
  - Also fix New-AzBatchTask parameter requirements.
@matthchr
Change Metadata and EnviornmentSettings to be IDictionary
409e5e4 
  - This makes it so that a response from the Batch service can be used
    as input to a New cmdlet. For example: `Get-AzBatchJob` `Metadata` can
    now be supplied as an input parameter to `New-AzBatchJob`.
  - This resolves issue Azure#6611.
@matthchr
Re-record tests
46ba3dd
@matthchr
Update Microsoft.Extensions.Primitives to 2.2.0
5b87eec
@matthchr
Add SignatureIssues supression
ea20b51
@matthchr
Update Batch psd1 required assemblies
ebb7e70
@matthchr
Fix CredScan suppressions
822429e
@cormacpayne
Merge pull request Azure#8612 from matthchr/feature/batch-jan-2019
11567d2 
Update Azure Batch cmdlets to latest SDK versions
@cormacpayne
Version Batch for preview release
1e54802
@cormacpayne
Merge pull request Azure#8663 from cormacpayne/version-batch
f66fc0e 
Version Batch for preview release
@matthchr
Merge branch 'master' into Az.Batch-preview
27535de
@matthchr
Update test Extensions.Primitives reference
99081b4
@matthchr
Fix issue with breaking change exceptions
cc98039
@markcowl
Merge pull request Azure#9997 from matthchr/feature/update-az.batch-p…
44c86d9 
…review

Merge latest master into Az.Batch-preview
@matthchr
New-AzBatchTask should allow empty command line
be48054 
  - This fixes Azure#9938.
@matthchr
Fix bug with New-AzureBatchTask -Tasks parameter
a4b5080 
  - This fixes Azure#9912.
@matthchr
Update Batch Powershell to target new SDKs
172db75 
  - Target Microsoft.Azure.Batch 12.0.
  - Target Microsoft.Azure.Management.Batch 9.0.
  - Update tests.
@matthchr
Regenerate help
5b3e557
@matthchr
Re-record tests
521e91a
@matthchr
Add exceptions for expected breaking changes
dc43fd2
@matthchr
Fix usages of plural (s suffix)
f173f25 
  - Includes renaming Get-AzBatchSupportedImages
    to Get-AzBatchSupportedImage.
@markcowl
Merge pull request Azure#10001 from matthchr/feature/more-preview-stuff
07f9d34 
Update Batch preview module to support data plane API version 2019-08-01.10.0 and mgmt API version 2019-08-01
@markcowl
Update Az.Batch.psd1
afee1b5
@markcowl
Update changelog for preview release
fc75314
@markcowl
Update assembly version
7ef7ac7
@markcowl
Fix mapping issue
6da1180
@matthchr
Copy link
Member Author

Note for reviewers

  1. This does include breaking changes. These changes have been in Az.Batch-preview for a while, and we are now targeting the Nov 4 Milestone for releasing these changes as part of the standard Az.Batch module.
  2. The PRs merged into Az.Batch-preview already went through review. You can see them here:
  3. Because some new cmdlets were added, we did design reviews for those. You can see those reviews either in the PR links above, or duplicated here:
    • The new New-AzBatchResourceFile cmdlet was reviewed here
    • The Get-AzBatchSupportedImages cmdlet was reviewed here

This resolves issue: #10137

There were a few conflicts in the merge which I had to fix (which is why the merge is originating from a branch and not Az.Batch-preview directly.
The conflicting files were:

  • src/Batch/Batch/Az.Batch.psd1
  • src/Batch/Batch/BatchAccounts/GetBatchAccountSupportedImagesCommand.cs
  • src/Batch/Batch/ChangeLog.md
  • src/Batch/Batch/Properties/AssemblyInfo.cs

Please ensure that the changelog and module versions look right, as this was published as a preview, so it's already moved to 2.0.0-preview, and the code in this PR should be shipped as 2.0.0.

@matthchr
Copy link
Member Author

@erich-wang @markcowl - please let me know if you need anything from me for this PR to be merged.

@erich-wang
Copy link
Member

@matthchr, I'm reviewing this PR, it may take some time since it is big, should be done in next couple days.

@matthchr
Copy link
Member Author

@erich-wang - just checking on this - I don't want this PR to miss the cutoff for release.

erich-wang
erich-wang approved these changes Oct 23, 2019
View reviewed changes
Copy link
Member

@erich-wang erich-wang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthchr , I updated the changelog.md to put change log under Ignite release instead of preview release.

@erich-wang erich-wang merged commit 6919797 into Azure:master Oct 23, 2019
@matthchr matthchr deleted the feature/merge-azbatch-preview branch October 23, 2019 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erich-wang erich-wang erich-wang approved these changes

Assignees

@erich-wang erich-wang

Labels
Waiting for CI :shipit:
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@matthchr @erich-wang @azuresdkci @cormacpayne @markcowl @wyunchi-ms