From ee89b8d3f17624f8d8700d48996b1bea4e453a1c Mon Sep 17 00:00:00 2001 From: Aditi Date: Thu, 9 Jul 2020 22:40:08 -0700 Subject: [PATCH 1/3] Added new reservedResourceTypes --- src/Reservations/Reservations/Cmdlets/Calculate.cs | 4 +++- src/Reservations/Reservations/Cmdlets/GetCatalog.cs | 4 +++- src/Reservations/Reservations/Cmdlets/Purchase.cs | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Reservations/Reservations/Cmdlets/Calculate.cs b/src/Reservations/Reservations/Cmdlets/Calculate.cs index 633f85580571..b69d6bd0fe18 100644 --- a/src/Reservations/Reservations/Cmdlets/Calculate.cs +++ b/src/Reservations/Reservations/Cmdlets/Calculate.cs @@ -12,7 +12,9 @@ namespace Microsoft.Azure.Commands.Reservations.Cmdlets public class Calculate : AzureReservationsCmdletBase { [Parameter(Mandatory = true)] - [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", "VMwareCloudSimple", "RedHatOsa")] + [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", + "VMwareCloudSimple", "RedHatOsa", "Databricks", "AppService", "ManagedDisk", "BlockBlob", "RedisCache", + "AzureDataExplorer", "MySql", "MariaDb", "PostgreSql", "DedicatedHost", "SapHana")] [ValidateNotNullOrEmpty] public string ReservedResourceType { get; set; } diff --git a/src/Reservations/Reservations/Cmdlets/GetCatalog.cs b/src/Reservations/Reservations/Cmdlets/GetCatalog.cs index c38bf44ea739..449ecdb11bba 100644 --- a/src/Reservations/Reservations/Cmdlets/GetCatalog.cs +++ b/src/Reservations/Reservations/Cmdlets/GetCatalog.cs @@ -17,7 +17,9 @@ public class GetCatalog : AzureReservationsCmdletBase public Guid SubscriptionId { get; set; } [Parameter(Mandatory = true)] - [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb")] + [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", + "VMwareCloudSimple", "RedHatOsa", "Databricks", "AppService", "ManagedDisk", "BlockBlob", "RedisCache", + "AzureDataExplorer", "MySql", "MariaDb", "PostgreSql", "DedicatedHost", "SapHana")] [ValidateNotNullOrEmpty] public string ReservedResourceType { get; set; } diff --git a/src/Reservations/Reservations/Cmdlets/Purchase.cs b/src/Reservations/Reservations/Cmdlets/Purchase.cs index 86fcb7501312..87d99dbf67d7 100644 --- a/src/Reservations/Reservations/Cmdlets/Purchase.cs +++ b/src/Reservations/Reservations/Cmdlets/Purchase.cs @@ -17,7 +17,8 @@ public class Purchase : AzureReservationsCmdletBase public string ReservationOrderId { get; set; } [Parameter(Mandatory = true)] - [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", "VMwareCloudSimple", "RedHatOsa")] + [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", "VMwareCloudSimple", "RedHatOsa", "Databricks", + "AppService", "ManagedDisk", "BlockBlob", "RedisCache", "AzureDataExplorer", "MySql", "MariaDb", "PostgreSql", "DedicatedHost", "SapHana")] [ValidateNotNullOrEmpty] public string ReservedResourceType { get; set; } From 39e42a9440cbbe44a0d3a8ecadf659a322e248c0 Mon Sep 17 00:00:00 2001 From: Aditi Date: Thu, 9 Jul 2020 22:44:26 -0700 Subject: [PATCH 2/3] Updated changelog --- src/Reservations/Reservations/ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Reservations/Reservations/ChangeLog.md b/src/Reservations/Reservations/ChangeLog.md index f51488d65ca4..b402a709c3d1 100644 --- a/src/Reservations/Reservations/ChangeLog.md +++ b/src/Reservations/Reservations/ChangeLog.md @@ -19,6 +19,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Added new reserved resource types. ## Version 0.8.2 * Spelling fix in the docs. From 1c3ab30fc18e85bd0afdc41695754e98b99ba8e7 Mon Sep 17 00:00:00 2001 From: Aditi Date: Thu, 9 Jul 2020 23:02:14 -0700 Subject: [PATCH 3/3] changed formatting --- src/Reservations/Reservations/Cmdlets/Purchase.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Reservations/Reservations/Cmdlets/Purchase.cs b/src/Reservations/Reservations/Cmdlets/Purchase.cs index 87d99dbf67d7..32b73f19366f 100644 --- a/src/Reservations/Reservations/Cmdlets/Purchase.cs +++ b/src/Reservations/Reservations/Cmdlets/Purchase.cs @@ -17,8 +17,9 @@ public class Purchase : AzureReservationsCmdletBase public string ReservationOrderId { get; set; } [Parameter(Mandatory = true)] - [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", "VMwareCloudSimple", "RedHatOsa", "Databricks", - "AppService", "ManagedDisk", "BlockBlob", "RedisCache", "AzureDataExplorer", "MySql", "MariaDb", "PostgreSql", "DedicatedHost", "SapHana")] + [PSArgumentCompleter("VirtualMachines", "SqlDatabases", "SuseLinux", "CosmosDb", "RedHat", "SqlDataWarehouse", + "VMwareCloudSimple", "RedHatOsa", "Databricks", "AppService", "ManagedDisk", "BlockBlob", "RedisCache", + "AzureDataExplorer", "MySql", "MariaDb", "PostgreSql", "DedicatedHost", "SapHana")] [ValidateNotNullOrEmpty] public string ReservedResourceType { get; set; }