Reservations RP 2018-06-01: Add new cosmosDb in the reservedResourceT… by luluRagdoll · Pull Request #4701 · Azure/azure-sdk-for-net

luluRagdoll · 2018-08-24T19:41:30Z

…ype enum. Add name property in Patch properties

Description

Add "CosmosDb" in the reservedResourceType enum
Add "name" property in the PatchProperties

Link to REST API spec PR: Azure/azure-rest-api-specs#3690

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

Please add REST spec PR link to the SDK PR
I have read the contribution guidelines.
The pull request does not introduce breaking changes.

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.

…ype enum. Add name property in Patch properties

dsgouda

Left a couple of comments

dsgouda · 2018-08-24T20:26:05Z

src/SDKs/Reservations/Management.Reservations/Generated/SdkInfo_AzureReservationAPI.cs

-  }
+      // BEGIN: Code Generation Metadata Section
+      public static readonly String AutoRestVersion = "latest";
+      public static readonly String AutoRestBootStrapperVersion = "(empty)";


Was this manually modified?

I think this is because I was using the generate.ps1
Start-AutoRestCodeGeneration -ResourceProvider "reservations/resource-manager" -AutoRestVersion "latest"
I used this to generate this PR. Do you think I need to change the autorestversion here from latest to "1.2.0-preview"

This is auto-generated.

Thanks for confirming

Sure. Please feel free to let me know if there is anything else I need to do.

dsgouda · 2018-08-24T20:27:48Z

src/SDKs/Reservations/Management.Reservations/Generated/Models/Patch.cs

+        /// </summary>
+        [JsonProperty(PropertyName = "properties.name")]
+        public string Name { get; set; }
+


These look like additive changes.
Please update package version, assembly version and package realease notes in the csproj and AssemblyInfo.cs file

Sure. Currently, it is 1.1.0-preview. Should it be updated to 1.2.0-preview?
AssemblyInfo.cs should be 1.0.2.0 ?

I also saw the AssemblyFileVersion currenlty as 1.8.0.0. Should I update that too.

1.8.0-preview is the last published version.
Please update package version to 1.9.0-preview and AssemblyFileVersion in AssemblyInfo.cs to 1.9.0.0

dsgouda · 2018-08-28T16:57:58Z

Please fix the CI build failures

dsgouda

Please fix CI test failures

dsgouda · 2018-08-28T21:04:45Z

src/SDKs/Reservations/Management.Reservations/Generated/SdkInfo_AzureReservationAPI.cs

-  }
+      // BEGIN: Code Generation Metadata Section
+      public static readonly String AutoRestVersion = "latest";
+      public static readonly String AutoRestBootStrapperVersion = "(empty)";


Thanks for confirming

dsgouda · 2018-08-28T21:33:49Z

@luluRagdoll Like I pointed out please take a look at the CI failures and fix them

luluRagdoll · 2018-08-29T18:00:28Z

Sure! Working on that fix now.

…

On Tue, Aug 28, 2018 at 2:34 PM Deepak Shankargouda < ***@***.***> wrote: @luluRagdoll <https://github.com/luluRagdoll> Like I pointed out please take a look at the CI failures and fix them — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#4701 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AfclgjjQv8FtQH3B1XDsrCtr3fsoZmRBks5uVbdYgaJpZM4WL4wB> .

luluRagdoll · 2018-08-30T17:20:44Z

@dsgouda
Hi Deepak,
I checked the reason for the failure is the wrong position of '}'. in SdkInfo_AzureReservationAPI.cs.
// END: Code Generation Metadata Section }

However this is auto-generated by running generate.ps1:
Start-AutoRestCodeGeneration -ResourceProvider "reservations/resource-manager" -AutoRestVersion "latest"
Does that mean the autorest is having some issue auto-generating the sdkInfo?
Any suggestions on how I can fix that? Thx

dsgouda · 2018-08-30T19:03:21Z

@luluRagdoll Acknowledged the issue, will fix the code generator
Until then can you manually push that trailing } to the next line and update the PR
Apologize for the inconvenience

…dk-for-net into reservations

luluRagdoll · 2018-08-30T21:06:44Z

@dsgouda Sure! Just updated that file manually. CI test is passing now.

dsgouda · 2018-08-30T21:12:44Z

@luluRagdoll everything looks great.
Please squash commits into a single commit and we are good to merge here

luluRagdoll · 2018-08-30T21:51:30Z

@dsgouda
Looks like I cannot change the commits that are already pushed in the remote branch. So I squash the commits and created a new pull request: #4724

luluRagdoll · 2018-08-30T21:52:11Z

Do you mean I can squash merge my change to Azure:psSdkJson6 myself?

dsgouda · 2018-08-30T21:54:09Z

Thanks, taking a look

dsgouda · 2018-08-30T21:56:09Z

The new PR is way behind the psSdkJson6 branch. Please create a new branch with latest psSdkJson6 changes and copy over your changes to it. That PR should be good

luluRagdoll · 2018-08-30T22:29:50Z

#4725 Just synced up with the latest version. This is the PR. Thx

Reservations RP 2018-06-01: Add new cosmosDb in the reservedResourceT…

2f1bda1

…ype enum. Add name property in Patch properties

dsgouda suggested changes Aug 24, 2018

View reviewed changes

dsgouda added the Changes Requested label Aug 24, 2018

dorislewisbjtu added 2 commits August 28, 2018 13:40

Update AssemblyInfo to 1.9.0.0

478c196

Update package version to 1.9.0-preview

57cf915

dsgouda suggested changes Aug 28, 2018

View reviewed changes

Update the commits

04dc2d7

Merge branch 'psSdkJson6' into reservations

db46a66

dorislewisbjtu added 2 commits August 30, 2018 13:24

Reservations RP: Manually update the SdkInfo. Update release info

d32eaf9

Merge branch 'reservations' of https://github.com/luluRagdoll/azure-s…

0311828

…dk-for-net into reservations

dsgouda closed this Aug 30, 2018

dsgouda reopened this Aug 30, 2018

dsgouda closed this Aug 30, 2018

Comments

Conversation

luluRagdoll commented Aug 24, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Link to REST API spec PR: Azure/azure-rest-api-specs#3690

Uh oh!

dsgouda left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luluRagdoll Aug 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsgouda commented Aug 28, 2018

Uh oh!

dsgouda left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dsgouda commented Aug 28, 2018

Uh oh!

luluRagdoll commented Aug 29, 2018 via email

Uh oh!

luluRagdoll commented Aug 30, 2018

Uh oh!

dsgouda commented Aug 30, 2018

Uh oh!

luluRagdoll commented Aug 30, 2018

Uh oh!

dsgouda commented Aug 30, 2018

Uh oh!

luluRagdoll commented Aug 30, 2018

Uh oh!

luluRagdoll commented Aug 30, 2018

Uh oh!

dsgouda commented Aug 30, 2018

Uh oh!

dsgouda commented Aug 30, 2018

Uh oh!

luluRagdoll commented Aug 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

luluRagdoll commented Aug 24, 2018 •

edited

Loading

luluRagdoll Aug 27, 2018 •

edited

Loading