Export cmdlets and fix bugs

Xynoclafe · Xynoclafe · commit d3743a265ede · 2021-07-01T16:31:02.000-04:00
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStack.cs
@@ -14,12 +14,13 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.DeploymentStacks
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using System;
     using System.Collections.Generic;
     using System.Management.Automation;
     using System.Text;
 
-    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "DeploymentStack",
+    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",
         DefaultParameterSetName = GetAzResourceGroupDeploymentStack.ListDeploymentStack), OutputType(typeof(PSDeploymentStack))]
     public class GetAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStackSnapshot.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStackSnapshot.cs
@@ -14,12 +14,13 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.DeploymentStacks
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using System;
     using System.Collections.Generic;
     using System.Management.Automation;
     using System.Text;
 
-    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "DeploymentStack",
+    [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStackSnapshot",
         DefaultParameterSetName = GetAzResourceGroupDeploymentStackSnapshot.ListDeploymentStack), OutputType(typeof(PSDeploymentStack))]
     public class GetAzResourceGroupDeploymentStackSnapshot : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStackSnapshot.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStackSnapshot.cs
@@ -50,7 +50,7 @@ public override void ExecuteCmdlet()
                         WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(Name, SnapshotName));
                         break;
                     case GetByResourceIdParameterSetName:
-                        WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(ResourceIdUtility.GetResourceName(ResourceId)));
+                        WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(ResourceIdUtility.GetResourceName(ResourceId), SnapshotName));
                         break;
                     case ListParameterSetname:
                         WriteObject(DeploymentStacksSdkClient.ListSubscriptionDeploymentStackSnapshot(Name));
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using System;
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using System;
@@ -10,7 +11,7 @@
     using System.Text;
     using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
-    [Cmdlet("New", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",
+    [Cmdlet("New", Common.AzureRMConstants.AzureRMPrefix + "SubscriptionDeploymentStack",
         SupportsShouldProcess = true, DefaultParameterSetName = NewAzSubscriptionDeploymentStack.ParameterlessTemplateFileParameterSetName), OutputType(typeof(PSDeploymentStack))]
     public class NewAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStackSnapshot.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStackSnapshot.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",
+    [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStackSnapshot",
         SupportsShouldProcess = true, DefaultParameterSetName = RemoveAzResourceGroupDeploymentStackSnapshot.RemoveByResourceIdParameterSetName), OutputType(typeof(bool))]
     public class RemoveAzResourceGroupDeploymentStackSnapshot : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStackSnapshot.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStackSnapshot.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
-    [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",
+    [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "SubscriptionDeploymentStackSnapshot",
         SupportsShouldProcess = true, DefaultParameterSetName = RemoveAzSubscriptionDeploymentStackSnapshot.RemoveByResourceIdParameterSetName), OutputType(typeof(bool))]
     public class RemoveAzSubscriptionDeploymentStackSnapshot : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using System;
diff --git a/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs b/src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs
@@ -1,5 +1,6 @@
 ﻿namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
     using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using System;
@@ -10,7 +11,7 @@
     using System.Text;
     using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
-    [Cmdlet("Set", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",
+    [Cmdlet("Set", Common.AzureRMConstants.AzureRMPrefix + "SubscriptionDeploymentStack",
         SupportsShouldProcess = true, DefaultParameterSetName = SetAzSubscriptionDeploymentStack.ParameterlessTemplateFileParameterSetName), OutputType(typeof(PSDeploymentStack))]
     public class SetAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
     {
diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
-    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.2-stacks" />
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.3-stacks" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
   </ItemGroup>
diff --git a/src/Resources/Resources.Test/Providers/RegisterResourceProviderCmdletTests.cs b/src/Resources/Resources.Test/Providers/RegisterResourceProviderCmdletTests.cs
@@ -110,7 +110,7 @@ public void RegisterResourceProviderTests()
             var registrationResult = provider;
 
             this.providerOperationsMock
-                .Setup(client => client.RegisterWithHttpMessagesAsync(It.IsAny<string>(), null, It.IsAny<CancellationToken>()))
+                .Setup(client => client.RegisterWithHttpMessagesAsync(It.IsAny<string>(), null, null, It.IsAny<CancellationToken>()))
                 .Callback((string providerName, Dictionary<string, List<string>> customHeaders, CancellationToken ignored) =>
                         Assert.Equal(ProviderName, providerName, StringComparer.OrdinalIgnoreCase))
                 .Returns(() => Task.FromResult(new AzureOperationResponse<Provider>() {
@@ -161,7 +161,7 @@ public void RegisterResourceProviderTests()
         /// </summary>
         private void VerifyCallPatternAndReset(bool succeeded)
         {
-            this.providerOperationsMock.Verify(f => f.RegisterWithHttpMessagesAsync(It.IsAny<string>(), null, It.IsAny<CancellationToken>()), Times.Once());
+            this.providerOperationsMock.Verify(f => f.RegisterWithHttpMessagesAsync(It.IsAny<string>(), null, null, It.IsAny<CancellationToken>()), Times.Once());
             this.commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<object>()), succeeded ? Times.Once() : Times.Never());
 
             this.providerOperationsMock.ResetCalls();
diff --git a/src/Resources/Resources.Test/Resources.Test.csproj b/src/Resources/Resources.Test/Resources.Test.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.14.2-stacks" />
+    <PackageReference Update="Microsoft.Azure.Management.ResourceManager" Version="3.14.3-stacks" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.9.0" />
diff --git a/src/Resources/Resources/Az.Resources.psd1 b/src/Resources/Resources/Az.Resources.psd1
@@ -152,7 +152,13 @@ CmdletsToExport = 'Get-AzProviderOperation', 'Remove-AzRoleAssignment',
                'Get-AzManagementGroupDeploymentWhatIfResult', 
                'Get-AzTenantDeploymentWhatIfResult', 'Get-AzTemplateSpec', 
                'New-AzTemplateSpec', 'Set-AzTemplateSpec', 'Export-AzTemplateSpec', 
-               'Remove-AzTemplateSpec'
+               'Remove-AzTemplateSpec', 'Get-AzResourceGroupDeploymentStack',
+               'Get-AzResourceGroupDeploymentStackSnapshot', 'Get-AzSubscriptionDeploymentStack',
+               'Get-AzSubscriptionDeploymentStackSnapshot', 'New-AzResourceGroupDeploymentStack',
+               'New-AzSubscriptionDeploymentStack', 'Remove-AzResourceGroupDeploymentStack',
+               'Remove-AzResourceGroupDeploymentStackSnapshot', 'Remove-AzSubscriptionDeploymentStack',
+               'Remove-AzSubscriptionDeploymentStackSnapshot', 'Set-AzResourceGroupDeploymentStack',
+               'Set-AzSubscriptionDeploymentStack'
 
 # Variables to export from this module
 # VariablesToExport = @()
diff --git a/src/Resources/Resources/Models.ResourceGroups/ResourcesExtensions.cs b/src/Resources/Resources/Models.ResourceGroups/ResourcesExtensions.cs
@@ -68,7 +68,7 @@ public static PSResource ToPSResource(this GenericResource resource, ResourcesCl
             };
         }
 
-        public static PSPermission ToPSPermission(this Permission permission)
+        public static PSPermission ToPSPermission(this Management.Authorization.Models.Permission permission)
         {
             return new PSPermission
             {
diff --git a/src/Resources/Resources/Resources.csproj b/src/Resources/Resources/Resources.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.8.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.12.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ManagementGroups" Version="1.1.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.2-stacks" />
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.14.3-stacks" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,13 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.DeploymentStacks`
`16`	`16`	`{`
	`17`	`+ using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;`
`17`	`18`	`using System;`
`18`	`19`	`using System.Collections.Generic;`
`19`	`20`	`using System.Management.Automation;`
`20`	`21`	`using System.Text;`
`21`	`22`
`22`		`- [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "DeploymentStack",`
	`23`	`+ [Cmdlet("Get", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",`
`23`	`24`	`DefaultParameterSetName = GetAzResourceGroupDeploymentStack.ListDeploymentStack), OutputType(typeof(PSDeploymentStack))]`
`24`	`25`	`public class GetAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`2`	`2`	`{`
	`3`	`+ using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;`
`3`	`4`	`using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;`
`4`	`5`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`5`	`6`	`using System;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation`
`8`	`8`	`{`
`9`		`- [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStack",`
	`9`	`+ [Cmdlet("Remove", Common.AzureRMConstants.AzureRMPrefix + "ResourceGroupDeploymentStackSnapshot",`
`10`	`10`	`SupportsShouldProcess = true, DefaultParameterSetName = RemoveAzResourceGroupDeploymentStackSnapshot.RemoveByResourceIdParameterSetName), OutputType(typeof(bool))]`
`11`	`11`	`public class RemoveAzResourceGroupDeploymentStackSnapshot : DeploymentStacksCmdletBase`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static PSResource ToPSResource(this GenericResource resource, ResourcesCl`
`68`	`68`	`};`
`69`	`69`	`}`
`70`	`70`
`71`		`- public static PSPermission ToPSPermission(this Permission permission)`
	`71`	`+ public static PSPermission ToPSPermission(this Management.Authorization.Models.Permission permission)`
`72`	`72`	`{`
`73`	`73`	`return new PSPermission`
`74`	`74`	`{`