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.

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

Automation 3.0.2 - preview #4308

Merged
merged 8 commits into from
May 14, 2018
Merged

Automation 3.0.2 - preview #4308

merged 8 commits into from
May 14, 2018

Conversation

MiaRomero
Copy link

@MiaRomero MiaRomero commented May 10, 2018 •
edited
Loading

Description

  • Adding sourceControl, sourceControlSyncJob resources
  • Updating Jobs, DscNodes, DscNodeConfigurationn resources (API version: 2018-01-15)

Swagger Specs PR:

Turned 3 tests off due to WebService changes. Once the changes get deployed, we'll send another PR to turn them on.

FYI: @finiteattractor, @safeermohammed, @Francisco-Gamino, @vrdmr

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
  • The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as the commitid of your swagger spec or link to the swagger spec, used to generate the code.
  • The *.csproj and AssemblyInfo.cs files have been updated with the new version of the SDK.

dsgouda
dsgouda suggested changes May 11, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Please run msbuild build.proj /t:build /p:Scope=SDKs\Automation and commit any changes to the props file

src/SDKs/Automation/Automation.Tests/ScenarioTests/AutomationTests.cs Outdated
@@ -16,7 +16,7 @@ namespace Automation.Tests.ScenarioTests

public class AutomationTest
{
[Fact]
//[Fact]
Copy link
Contributor

Choose a reason for hiding this comment

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

Mark as a skipped tests instead of commenting

Copy link
Author

Choose a reason for hiding this comment

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

Fixed.

src/SDKs/_metadata/automation_resource-manager.txt Outdated
@@ -1,11 +1,11 @@
2018-01-18 21:18:29 UTC
2018-05-10 20:38:47 UTC
Copy link
Contributor

Choose a reason for hiding this comment

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

Please create a generate.ps1 similar to this and regenerate the code.

Copy link
Author

Choose a reason for hiding this comment

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

Fixed.

src/SDKs/Automation/Management.Automation/Properties/AssemblyInfo.cs Outdated
@@ -7,8 +7,8 @@
[assembly: AssemblyTitle("Microsoft Azure Automation Management Library")]
[assembly: AssemblyDescription("Provides Microsoft Azure Automation management operations including the ability to create, update and delete runbooks and schedules.")]

[assembly: AssemblyVersion("3.0.1.0")]
[assembly: AssemblyFileVersion("3.0.1.0")]
[assembly: AssemblyVersion("3.0.2.0")]
Copy link
Contributor

Choose a reason for hiding this comment

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

Please update the AssemblyFileVersion only

dsgouda
dsgouda suggested changes May 11, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Looks good apart from the minor comment.

src/SDKs/Automation/Management.Automation/generate.ps1
@@ -0,0 +1 @@
powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -File "$(split-path $SCRIPT:MyInvocation.MyCommand.Path -parent)\..\..\..\..\tools\generateTool.ps1" -ResourceProvider "automation/resource-manager" -PowershellInvoker -AutoRestVersion "latest"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please regenerate the code using this script.

Copy link
Author

Choose a reason for hiding this comment

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

Done. Just out of curiosity, what does the generate.ps1 file do that the other doesn't?
@dsgouda, Thanks for taking the time to review! :)

Copy link
Contributor

Choose a reason for hiding this comment

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

The src/SDKs/_metadata/automation_resource-manager.txt log file tells us when code has been generated using powershell. We're slowly moving most RPs towards using ps1 scripts instead of cmds in order to provide better usage

dsgouda
dsgouda approved these changes May 14, 2018
View reviewed changes
Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

LGTM subject to CIs passing

@MiaRomero
Copy link
Author

@dsgouda, the CI's have passed, please merge. Thank you!

@dsgouda dsgouda merged commit f6b956f into Azure:psSdkJson6 May 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsgouda dsgouda dsgouda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MiaRomero @dsgouda