Merge pull request #5827 from corquiri/ReservedInstance

cormacpayne · web-flow · commit 53e50d687ba3 · 2018-04-17T17:05:34.000-07:00
Adding Guid check for Reservations cmdlet arguments
diff --git a/src/ResourceManager/Reservations/ChangeLog.md b/src/ResourceManager/Reservations/ChangeLog.md
@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Change Guid paramters to Guid type, not string
 * Set minimum dependency of module to PowerShell 5.0
 
 ## Version 0.1.2
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetCatalog.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetCatalog.cs
@@ -16,13 +16,13 @@ public class GetCatalog : AzureReservationsCmdletBase
     {
         [Parameter(Mandatory = false)]
         [ValidateNotNull]
-        public string SubscriptionId { get; set; }
+        public Guid SubscriptionId { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            if (SubscriptionId != null)
+            if (SubscriptionId != default(Guid))
             {
-                var response = AzureReservationAPIClient.GetCatalog(SubscriptionId).Select(x => new PSCatalog(x));
+                var response = AzureReservationAPIClient.GetCatalog(SubscriptionId.ToString()).Select(x => new PSCatalog(x));
                 WriteObject(response, true);
             }
             else
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservation.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservation.cs
@@ -18,12 +18,12 @@ public class GetReservation : AzureReservationsCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,
             Mandatory = false,
             ValueFromPipelineByPropertyName = false)]
-        public string ReservationId { get; set; }
+        public Guid ReservationId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,
             Mandatory = false,
@@ -39,7 +39,7 @@ public class GetReservation : AzureReservationsCmdletBase
 
         private void PageResults()
         {
-            var response = new PSReservationPage(AzureReservationAPIClient.Reservation.List(ReservationOrderId));
+            var response = new PSReservationPage(AzureReservationAPIClient.Reservation.List(ReservationOrderId.ToString()));
             WriteObject(response, true);
             while (response.NextPageLink != null)
             {
@@ -51,9 +51,9 @@ public override void ExecuteCmdlet()
         {
             if (ParameterSetName.Equals(Constants.ParameterSetNames.CommandParameterSet))
             {
-                if (ReservationId != null)
+                if (ReservationId != default(Guid))
                 {
-                    var response = new PSReservation(AzureReservationAPIClient.Reservation.Get(ReservationId, ReservationOrderId));
+                    var response = new PSReservation(AzureReservationAPIClient.Reservation.Get(ReservationId.ToString(), ReservationOrderId.ToString()));
                     WriteObject(response);
                 }
                 else
@@ -65,27 +65,27 @@ public override void ExecuteCmdlet()
             {
                 if (ReservationOrder != null)
                 {
-                    ReservationOrderId = ReservationOrder.Name;
+                    ReservationOrderId = new Guid(ReservationOrder.Name);
                     PageResults();
                 }
             }
             else if (ParameterSetName.Equals(Constants.ParameterSetNames.PageObjectParameterSet))
             {
                 if (ReservationOrderPage != null)
                 {
-                    foreach (PSReservationOrder ReservationOrder in ReservationOrderPage)
+                    foreach (PSReservationOrder reservationOrder in ReservationOrderPage)
                     {
-                        ReservationOrderId = ReservationOrder.Name;
+                        ReservationOrderId = new Guid(reservationOrder.Name);
                         PageResults();
                     }
                     while (ReservationOrderPage.NextPageLink != null)
                     {
                         ReservationOrderPage =
                             new PSReservationOrderPage(
                                 AzureReservationAPIClient.ReservationOrder.ListNext(ReservationOrderPage.NextPageLink));
-                        foreach (PSReservationOrder ReservationOrder in ReservationOrderPage)
+                        foreach (PSReservationOrder reservationOrder in ReservationOrderPage)
                         {
-                            ReservationOrderId = ReservationOrder.Name;
+                            ReservationOrderId = new Guid(reservationOrder.Name);
                             PageResults();
                         }
                     }
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationHistory.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationHistory.cs
@@ -15,13 +15,13 @@ public class GetReservationHistory : AzureReservationsCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet, 
             Mandatory = true,
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNull]
-        public string ReservationId { get; set; }
+        public Guid ReservationId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,
             Mandatory = true,
@@ -34,11 +34,11 @@ public override void ExecuteCmdlet()
             if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
             {
                 string[] name = Reservation.Name.Split('/');
-                ReservationOrderId = name[0];
-                ReservationId = name[1];
+                ReservationOrderId = new Guid(name[0]);
+                ReservationId = new Guid(name[1]);
             }
 
-            var response = new PSReservationPage(AzureReservationAPIClient.Reservation.ListRevisions(ReservationId, ReservationOrderId));
+            var response = new PSReservationPage(AzureReservationAPIClient.Reservation.ListRevisions(ReservationId.ToString(), ReservationOrderId.ToString()));
             WriteObject(response, true);
             while (response.NextPageLink != null)
             {
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationOrder.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationOrder.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.Azure.Commands.Reservations.Common;
+﻿using System;
+using Microsoft.Azure.Commands.Reservations.Common;
 using System.Management.Automation;
 using Microsoft.Azure.Management.Reservations;
 using Microsoft.Azure.Commands.Reservations.Models;
@@ -11,13 +12,13 @@ public class GetReservationOrder : AzureReservationsCmdletBase
     {
         [Parameter(Mandatory = false)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            if (ReservationOrderId != null)
+            if (ReservationOrderId != default(Guid))
             {
-                var response = new PSReservationOrder(AzureReservationAPIClient.ReservationOrder.Get(ReservationOrderId));
+                var response = new PSReservationOrder(AzureReservationAPIClient.ReservationOrder.Get(ReservationOrderId.ToString()));
                 WriteObject(response);
             }
             else
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationOrderId.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/GetReservationOrderId.cs
@@ -15,13 +15,13 @@ public class GetReservationOrderId : AzureReservationsCmdletBase
 
         [Parameter(Mandatory = false)]
         [ValidateNotNull]
-        public string SubscriptionId { get; set; }
+        public Guid SubscriptionId { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            if (SubscriptionId != null)
+            if (SubscriptionId != default(Guid))
             {
-                var response = new PSAppliedReservationOrderId(AzureReservationAPIClient.GetAppliedReservationList(SubscriptionId));
+                var response = new PSAppliedReservationOrderId(AzureReservationAPIClient.GetAppliedReservationList(SubscriptionId.ToString()));
                 WriteObject(response);
             }
             else
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/MergeReservation.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/MergeReservation.cs
@@ -15,13 +15,13 @@ public class MergeReservation : AzureReservationsCmdletBase
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet, 
             Mandatory = true)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet, 
             Mandatory = true)]
         [ValidateNotNull]
         [ValidateCount (2, 2)]
-        public string[] ReservationId { get; set; }
+        public Guid[] ReservationId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,
             Mandatory = true)]
@@ -33,15 +33,15 @@ public override void ExecuteCmdlet()
         {
             if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
             {
-                ReservationOrderId = Reservation[0].Name.Split('/')[0];
-                ReservationId = Reservation.Select(x => x.Name.Split('/')[1]).ToArray();
+                ReservationOrderId = new Guid(Reservation[0].Name.Split('/')[0]);
+                ReservationId = Reservation.Select(x => x.Name.Split('/')[1]).Select(x => new Guid(x)).ToArray();
             }
 
             var resourceInfo = $"Reservation {ReservationId[0]} and {ReservationId[1]} in order {ReservationOrderId}";
             if (ShouldProcess(resourceInfo, "Merge"))
             {
                 MergeRequest Merge = new MergeRequest(ListOfResourceId());
-                var response = AzureReservationAPIClient.Reservation.Merge(ReservationOrderId, Merge).Select(x => new PSReservation(x));
+                var response = AzureReservationAPIClient.Reservation.Merge(ReservationOrderId.ToString(), Merge).Select(x => new PSReservation(x));
                 WriteObject(response, true);
             }
         }
@@ -51,9 +51,9 @@ private List<string> ListOfResourceId()
             return ReservationId.Select(x => CreateResourceId(ReservationOrderId, x)).ToList();
         }
 
-        private string CreateResourceId(string ReservationOrderId, string ReservationId)
+        private string CreateResourceId(Guid reservationOrderId, Guid reservationId)
         {
-            return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", ReservationOrderId, ReservationId);
+            return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", reservationOrderId, reservationId);
         }
     }
 }
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/PatchReservation.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/PatchReservation.cs
@@ -21,12 +21,12 @@ public class PatchReservation : AzureReservationsCmdletBase
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,
             Mandatory = true)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,
             Mandatory = true)]
         [ValidateNotNull]
-        public string ReservationId { get; set; }
+        public Guid ReservationId { get; set; }
 
         [Parameter(Mandatory = true)]
         [ValidateNotNull]
@@ -48,8 +48,8 @@ public override void ExecuteCmdlet()
             if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
             {
                 string[] name = Reservation.Name.Split('/');
-                ReservationOrderId = name[0];
-                ReservationId = name[1];
+                ReservationOrderId = new Guid(name[0]);
+                ReservationId = new Guid(name[1]);
             }
 
             var resourceInfo = $"Reservation {ReservationId} in order {ReservationOrderId}";
@@ -69,7 +69,7 @@ public override void ExecuteCmdlet()
                 {
                     Patch = new Patch(AppliedScopeType);
                 }
-                var response = new PSReservation(AzureReservationAPIClient.Reservation.Update(ReservationOrderId, ReservationId, Patch));
+                var response = new PSReservation(AzureReservationAPIClient.Reservation.Update(ReservationOrderId.ToString(), ReservationId.ToString(), Patch));
                 WriteObject(response);
             }
         }
diff --git a/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/SplitReservation.cs b/src/ResourceManager/Reservations/Commands.Reservations/Cmdlets/SplitReservation.cs
@@ -17,12 +17,12 @@ public class SplitReservation : AzureReservationsCmdletBase
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,
             Mandatory = true)]
         [ValidateNotNull]
-        public string ReservationOrderId { get; set; }
+        public Guid ReservationOrderId { get; set; }
 
         [Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,
             Mandatory = true)]
         [ValidateNotNull]
-        public string ReservationId { get; set; }
+        public Guid ReservationId { get; set; }
 
         [Parameter(Mandatory = true)]
         [ValidateNotNull]
@@ -40,8 +40,8 @@ public override void ExecuteCmdlet()
             if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))
             {
                 string[] name = Reservation.Name.Split('/');
-                ReservationOrderId = name[0];
-                ReservationId = name[1];
+                ReservationOrderId = new Guid(name[0]);
+                ReservationId = new Guid(name[1]);
             }
 
             var resourceInfo = $"Reservation {ReservationId} in order {ReservationOrderId}";
@@ -52,15 +52,15 @@ public override void ExecuteCmdlet()
                     quantityParameter,
                     CreateResourceId(ReservationOrderId, ReservationId)
                 );
-                var response = AzureReservationAPIClient.Reservation.Split(ReservationOrderId, Split).Select(x => new PSReservation(x)).ToList();
+                var response = AzureReservationAPIClient.Reservation.Split(ReservationOrderId.ToString(), Split).Select(x => new PSReservation(x)).ToList();
                 WriteObject(response, true);
             }
 
         }
 
-        private string CreateResourceId(string ReservationOrderId, string ReservationId)
+        private string CreateResourceId(Guid reservationOrderId, Guid reservationId)
         {
-            return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", ReservationOrderId, ReservationId);
+            return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", reservationOrderId, reservationId);
         }
     }
 }
diff --git a/tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ public class GetCatalog : AzureReservationsCmdletBase`
`16`	`16`	`{`
`17`	`17`	`[Parameter(Mandatory = false)]`
`18`	`18`	`[ValidateNotNull]`
`19`		`- public string SubscriptionId { get; set; }`
	`19`	`+ public Guid SubscriptionId { get; set; }`
`20`	`20`
`21`	`21`	`public override void ExecuteCmdlet()`
`22`	`22`	`{`
`23`		`- if (SubscriptionId != null)`
	`23`	`+ if (SubscriptionId != default(Guid))`
`24`	`24`	`{`
`25`		`- var response = AzureReservationAPIClient.GetCatalog(SubscriptionId).Select(x => new PSCatalog(x));`
	`25`	`+ var response = AzureReservationAPIClient.GetCatalog(SubscriptionId.ToString()).Select(x => new PSCatalog(x));`
`26`	`26`	`WriteObject(response, true);`
`27`	`27`	`}`
`28`	`28`	`else`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ public class GetReservation : AzureReservationsCmdletBase`
`18`	`18`	`Mandatory = true,`
`19`	`19`	`ValueFromPipelineByPropertyName = true)]`
`20`	`20`	`[ValidateNotNull]`
`21`		`- public string ReservationOrderId { get; set; }`
	`21`	`+ public Guid ReservationOrderId { get; set; }`
`22`	`22`
`23`	`23`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`24`	`24`	`Mandatory = false,`
`25`	`25`	`ValueFromPipelineByPropertyName = false)]`
`26`		`- public string ReservationId { get; set; }`
	`26`	`+ public Guid ReservationId { get; set; }`
`27`	`27`
`28`	`28`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,`
`29`	`29`	`Mandatory = false,`
`@@ -39,7 +39,7 @@ public class GetReservation : AzureReservationsCmdletBase`
`39`	`39`
`40`	`40`	`private void PageResults()`
`41`	`41`	`{`
`42`		`- var response = new PSReservationPage(AzureReservationAPIClient.Reservation.List(ReservationOrderId));`
	`42`	`+ var response = new PSReservationPage(AzureReservationAPIClient.Reservation.List(ReservationOrderId.ToString()));`
`43`	`43`	`WriteObject(response, true);`
`44`	`44`	`while (response.NextPageLink != null)`
`45`	`45`	`{`
`@@ -51,9 +51,9 @@ public override void ExecuteCmdlet()`
`51`	`51`	`{`
`52`	`52`	`if (ParameterSetName.Equals(Constants.ParameterSetNames.CommandParameterSet))`
`53`	`53`	`{`
`54`		`- if (ReservationId != null)`
	`54`	`+ if (ReservationId != default(Guid))`
`55`	`55`	`{`
`56`		`- var response = new PSReservation(AzureReservationAPIClient.Reservation.Get(ReservationId, ReservationOrderId));`
	`56`	`+ var response = new PSReservation(AzureReservationAPIClient.Reservation.Get(ReservationId.ToString(), ReservationOrderId.ToString()));`
`57`	`57`	`WriteObject(response);`
`58`	`58`	`}`
`59`	`59`	`else`
`@@ -65,27 +65,27 @@ public override void ExecuteCmdlet()`
`65`	`65`	`{`
`66`	`66`	`if (ReservationOrder != null)`
`67`	`67`	`{`
`68`		`- ReservationOrderId = ReservationOrder.Name;`
	`68`	`+ ReservationOrderId = new Guid(ReservationOrder.Name);`
`69`	`69`	`PageResults();`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`else if (ParameterSetName.Equals(Constants.ParameterSetNames.PageObjectParameterSet))`
`73`	`73`	`{`
`74`	`74`	`if (ReservationOrderPage != null)`
`75`	`75`	`{`
`76`		`- foreach (PSReservationOrder ReservationOrder in ReservationOrderPage)`
	`76`	`+ foreach (PSReservationOrder reservationOrder in ReservationOrderPage)`
`77`	`77`	`{`
`78`		`- ReservationOrderId = ReservationOrder.Name;`
	`78`	`+ ReservationOrderId = new Guid(reservationOrder.Name);`
`79`	`79`	`PageResults();`
`80`	`80`	`}`
`81`	`81`	`while (ReservationOrderPage.NextPageLink != null)`
`82`	`82`	`{`
`83`	`83`	`ReservationOrderPage =`
`84`	`84`	`new PSReservationOrderPage(`
`85`	`85`	`AzureReservationAPIClient.ReservationOrder.ListNext(ReservationOrderPage.NextPageLink));`
`86`		`- foreach (PSReservationOrder ReservationOrder in ReservationOrderPage)`
	`86`	`+ foreach (PSReservationOrder reservationOrder in ReservationOrderPage)`
`87`	`87`	`{`
`88`		`- ReservationOrderId = ReservationOrder.Name;`
	`88`	`+ ReservationOrderId = new Guid(reservationOrder.Name);`
`89`	`89`	`PageResults();`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Microsoft.Azure.Commands.Reservations.Common;`
	`1`	`+using System;`
	`2`	`+using Microsoft.Azure.Commands.Reservations.Common;`
`2`	`3`	`using System.Management.Automation;`
`3`	`4`	`using Microsoft.Azure.Management.Reservations;`
`4`	`5`	`using Microsoft.Azure.Commands.Reservations.Models;`
`@@ -11,13 +12,13 @@ public class GetReservationOrder : AzureReservationsCmdletBase`
`11`	`12`	`{`
`12`	`13`	`[Parameter(Mandatory = false)]`
`13`	`14`	`[ValidateNotNull]`
`14`		`- public string ReservationOrderId { get; set; }`
	`15`	`+ public Guid ReservationOrderId { get; set; }`
`15`	`16`
`16`	`17`	`public override void ExecuteCmdlet()`
`17`	`18`	`{`
`18`		`- if (ReservationOrderId != null)`
	`19`	`+ if (ReservationOrderId != default(Guid))`
`19`	`20`	`{`
`20`		`- var response = new PSReservationOrder(AzureReservationAPIClient.ReservationOrder.Get(ReservationOrderId));`
	`21`	`+ var response = new PSReservationOrder(AzureReservationAPIClient.ReservationOrder.Get(ReservationOrderId.ToString()));`
`21`	`22`	`WriteObject(response);`
`22`	`23`	`}`
`23`	`24`	`else`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ public class GetReservationOrderId : AzureReservationsCmdletBase`
`15`	`15`
`16`	`16`	`[Parameter(Mandatory = false)]`
`17`	`17`	`[ValidateNotNull]`
`18`		`- public string SubscriptionId { get; set; }`
	`18`	`+ public Guid SubscriptionId { get; set; }`
`19`	`19`
`20`	`20`	`public override void ExecuteCmdlet()`
`21`	`21`	`{`
`22`		`- if (SubscriptionId != null)`
	`22`	`+ if (SubscriptionId != default(Guid))`
`23`	`23`	`{`
`24`		`- var response = new PSAppliedReservationOrderId(AzureReservationAPIClient.GetAppliedReservationList(SubscriptionId));`
	`24`	`+ var response = new PSAppliedReservationOrderId(AzureReservationAPIClient.GetAppliedReservationList(SubscriptionId.ToString()));`
`25`	`25`	`WriteObject(response);`
`26`	`26`	`}`
`27`	`27`	`else`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ public class MergeReservation : AzureReservationsCmdletBase`
`15`	`15`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`16`	`16`	`Mandatory = true)]`
`17`	`17`	`[ValidateNotNull]`
`18`		`- public string ReservationOrderId { get; set; }`
	`18`	`+ public Guid ReservationOrderId { get; set; }`
`19`	`19`
`20`	`20`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`21`	`21`	`Mandatory = true)]`
`22`	`22`	`[ValidateNotNull]`
`23`	`23`	`[ValidateCount (2, 2)]`
`24`		`- public string[] ReservationId { get; set; }`
	`24`	`+ public Guid[] ReservationId { get; set; }`
`25`	`25`
`26`	`26`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.ObjectParameterSet,`
`27`	`27`	`Mandatory = true)]`
`@@ -33,15 +33,15 @@ public override void ExecuteCmdlet()`
`33`	`33`	`{`
`34`	`34`	`if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))`
`35`	`35`	`{`
`36`		`- ReservationOrderId = Reservation[0].Name.Split('/')[0];`
`37`		`- ReservationId = Reservation.Select(x => x.Name.Split('/')[1]).ToArray();`
	`36`	`+ ReservationOrderId = new Guid(Reservation[0].Name.Split('/')[0]);`
	`37`	`+ ReservationId = Reservation.Select(x => x.Name.Split('/')[1]).Select(x => new Guid(x)).ToArray();`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`var resourceInfo = $"Reservation {ReservationId[0]} and {ReservationId[1]} in order {ReservationOrderId}";`
`41`	`41`	`if (ShouldProcess(resourceInfo, "Merge"))`
`42`	`42`	`{`
`43`	`43`	`MergeRequest Merge = new MergeRequest(ListOfResourceId());`
`44`		`- var response = AzureReservationAPIClient.Reservation.Merge(ReservationOrderId, Merge).Select(x => new PSReservation(x));`
	`44`	`+ var response = AzureReservationAPIClient.Reservation.Merge(ReservationOrderId.ToString(), Merge).Select(x => new PSReservation(x));`
`45`	`45`	`WriteObject(response, true);`
`46`	`46`	`}`
`47`	`47`	`}`
`@@ -51,9 +51,9 @@ private List<string> ListOfResourceId()`
`51`	`51`	`return ReservationId.Select(x => CreateResourceId(ReservationOrderId, x)).ToList();`
`52`	`52`	`}`
`53`	`53`
`54`		`- private string CreateResourceId(string ReservationOrderId, string ReservationId)`
	`54`	`+ private string CreateResourceId(Guid reservationOrderId, Guid reservationId)`
`55`	`55`	`{`
`56`		`- return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", ReservationOrderId, ReservationId);`
	`56`	`+ return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", reservationOrderId, reservationId);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ public class PatchReservation : AzureReservationsCmdletBase`
`21`	`21`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`22`	`22`	`Mandatory = true)]`
`23`	`23`	`[ValidateNotNull]`
`24`		`- public string ReservationOrderId { get; set; }`
	`24`	`+ public Guid ReservationOrderId { get; set; }`
`25`	`25`
`26`	`26`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`27`	`27`	`Mandatory = true)]`
`28`	`28`	`[ValidateNotNull]`
`29`		`- public string ReservationId { get; set; }`
	`29`	`+ public Guid ReservationId { get; set; }`
`30`	`30`
`31`	`31`	`[Parameter(Mandatory = true)]`
`32`	`32`	`[ValidateNotNull]`
`@@ -48,8 +48,8 @@ public override void ExecuteCmdlet()`
`48`	`48`	`if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))`
`49`	`49`	`{`
`50`	`50`	`string[] name = Reservation.Name.Split('/');`
`51`		`- ReservationOrderId = name[0];`
`52`		`- ReservationId = name[1];`
	`51`	`+ ReservationOrderId = new Guid(name[0]);`
	`52`	`+ ReservationId = new Guid(name[1]);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`var resourceInfo = $"Reservation {ReservationId} in order {ReservationOrderId}";`
`@@ -69,7 +69,7 @@ public override void ExecuteCmdlet()`
`69`	`69`	`{`
`70`	`70`	`Patch = new Patch(AppliedScopeType);`
`71`	`71`	`}`
`72`		`- var response = new PSReservation(AzureReservationAPIClient.Reservation.Update(ReservationOrderId, ReservationId, Patch));`
	`72`	`+ var response = new PSReservation(AzureReservationAPIClient.Reservation.Update(ReservationOrderId.ToString(), ReservationId.ToString(), Patch));`
`73`	`73`	`WriteObject(response);`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ public class SplitReservation : AzureReservationsCmdletBase`
`17`	`17`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`18`	`18`	`Mandatory = true)]`
`19`	`19`	`[ValidateNotNull]`
`20`		`- public string ReservationOrderId { get; set; }`
	`20`	`+ public Guid ReservationOrderId { get; set; }`
`21`	`21`
`22`	`22`	`[Parameter(ParameterSetName = Constants.ParameterSetNames.CommandParameterSet,`
`23`	`23`	`Mandatory = true)]`
`24`	`24`	`[ValidateNotNull]`
`25`		`- public string ReservationId { get; set; }`
	`25`	`+ public Guid ReservationId { get; set; }`
`26`	`26`
`27`	`27`	`[Parameter(Mandatory = true)]`
`28`	`28`	`[ValidateNotNull]`
`@@ -40,8 +40,8 @@ public override void ExecuteCmdlet()`
`40`	`40`	`if (ParameterSetName.Equals(Constants.ParameterSetNames.ObjectParameterSet))`
`41`	`41`	`{`
`42`	`42`	`string[] name = Reservation.Name.Split('/');`
`43`		`- ReservationOrderId = name[0];`
`44`		`- ReservationId = name[1];`
	`43`	`+ ReservationOrderId = new Guid(name[0]);`
	`44`	`+ ReservationId = new Guid(name[1]);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`var resourceInfo = $"Reservation {ReservationId} in order {ReservationOrderId}";`
`@@ -52,15 +52,15 @@ public override void ExecuteCmdlet()`
`52`	`52`	`quantityParameter,`
`53`	`53`	`CreateResourceId(ReservationOrderId, ReservationId)`
`54`	`54`	`);`
`55`		`- var response = AzureReservationAPIClient.Reservation.Split(ReservationOrderId, Split).Select(x => new PSReservation(x)).ToList();`
	`55`	`+ var response = AzureReservationAPIClient.Reservation.Split(ReservationOrderId.ToString(), Split).Select(x => new PSReservation(x)).ToList();`
`56`	`56`	`WriteObject(response, true);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`}`
`60`	`60`
`61`		`- private string CreateResourceId(string ReservationOrderId, string ReservationId)`
	`61`	`+ private string CreateResourceId(Guid reservationOrderId, Guid reservationId)`
`62`	`62`	`{`
`63`		`- return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", ReservationOrderId, ReservationId);`
	`63`	`+ return string.Format("/providers/Microsoft.Capacity/reservationOrders/{0}/reservations/{1}", reservationOrderId, reservationId);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`