Skip to content

Commit b3db00c

Browse files
XynoclafeXynoclafe
committed
Added piping support and real time debug/verbose logs. Updated Version to avoid collision. Re-recorded tests
1 parent a5a72bd commit b3db00c

29 files changed

+4870
-32989
lines changed

‎src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCmdletBase.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010

1111
namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
1212
{
13-
public class DeploymentStacksCmdletBase : AzureRMCmdlet
13+
public abstract class DeploymentStacksCmdletBase : ResourceManagerCmdletBase
1414
{
15+
1516
/// <summary>
1617
/// Deployment stacks client instance field
1718
/// </summary>
@@ -28,6 +29,11 @@ public DeploymentStacksSdkClient DeploymentStacksSdkClient
2829
{
2930
this.deploymentStacksSdkClient = new DeploymentStacksSdkClient(DefaultContext);
3031
}
32+
33+
this.deploymentStacksSdkClient.VerboseLogger = WriteVerboseWithTimestamp;
34+
this.deploymentStacksSdkClient.ErrorLogger = WriteErrorWithTimestamp;
35+
this.deploymentStacksSdkClient.WarningLogger = WriteWarningWithTimestamp;
36+
3137
return this.deploymentStacksSdkClient;
3238
}
3339

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStack.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ public class GetAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
4444
[ValidateNotNullOrEmpty]
4545
public string Name { get; set; }
4646

47-
public override void ExecuteCmdlet()
47+
protected override void OnProcessRecord()
4848
{
4949
try
5050
{
5151
switch (ParameterSetName)
5252
{
5353
case GetByResourceIdParameterSetName:
54-
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStack(ResourceIdUtility.GetResourceGroupName(ResourceId), ResourceIdUtility.GetDeploymentName(ResourceId)));
54+
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStack(ResourceIdUtility.GetResourceGroupName(ResourceId), ResourceIdUtility.GetDeploymentName(ResourceId)), true);
5555
break;
5656
case ListByResourceGroupNameParameterSetName:
57-
WriteObject(DeploymentStacksSdkClient.ListResourceGroupDeploymentStack(ResourceGroupName));
57+
WriteObject(DeploymentStacksSdkClient.ListResourceGroupDeploymentStack(ResourceGroupName), true);
5858
break;
5959
case GetByDeploymentStackName:
60-
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStack(ResourceGroupName, Name));
60+
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStack(ResourceGroupName, Name), true);
6161
break;
6262
default:
6363
throw new PSInvalidOperationException();

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzResourceGroupDeploymentStackSnapshot.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class GetAzResourceGroupDeploymentStackSnapshot : DeploymentStacksCmdletB
5353
#endregion
5454

5555
#region Cmdlet Overrides
56-
public override void ExecuteCmdlet()
56+
protected override void OnProcessRecord()
5757
{
5858
try
5959
{
@@ -63,13 +63,13 @@ public override void ExecuteCmdlet()
6363
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(ResourceId);
6464
StackName = ResourceIdUtility.GetResourceName(ResourceId).Split('/')[0];
6565
Name = resourceIdentifier.ResourceName;
66-
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStackSnapshot(ResourceIdUtility.GetResourceGroupName(ResourceId), StackName, Name));
66+
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStackSnapshot(ResourceIdUtility.GetResourceGroupName(ResourceId), StackName, Name), true);
6767
break;
6868
case ListByResourceGroupNameParameterSetName:
69-
WriteObject(DeploymentStacksSdkClient.ListResourceGroupDeploymentStackSnapshot(ResourceGroupName, StackName));
69+
WriteObject(DeploymentStacksSdkClient.ListResourceGroupDeploymentStackSnapshot(ResourceGroupName, StackName), true);
7070
break;
7171
case GetByDeploymentStackName:
72-
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStackSnapshot(ResourceGroupName, StackName, Name));
72+
WriteObject(DeploymentStacksSdkClient.GetResourceGroupDeploymentStackSnapshot(ResourceGroupName, StackName, Name), true);
7373
break;
7474
default:
7575
throw new PSInvalidOperationException();

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStack.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ public class GetAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
4747

4848
#region Cmdlet Overrides
4949

50-
public override void ExecuteCmdlet()
50+
protected override void OnProcessRecord()
5151
{
5252
try
5353
{
5454
switch (ParameterSetName)
5555
{
5656
case GetByStackNameParameterSetname:
57-
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStack(Name));
57+
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStack(Name), true);
5858
break;
5959
case GetByResourceIdParameterSetName:
60-
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStack(ResourceIdUtility.GetResourceName(ResourceId)));
60+
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStack(ResourceIdUtility.GetResourceName(ResourceId)), true);
6161
break;
6262
case ListParameterSetname:
63-
WriteObject(DeploymentStacksSdkClient.ListSubscriptionDeploymentStack());
63+
WriteObject(DeploymentStacksSdkClient.ListSubscriptionDeploymentStack(), true);
6464
break;
6565
default:
6666
throw new PSInvalidOperationException();

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/GetAzSubscriptionDeploymentStackSnapshot.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,23 @@ public class GetAzSubscriptionDeploymentStackSnapshot : DeploymentStacksCmdletBa
5454

5555
#region Cmdlet Overrides
5656

57-
public override void ExecuteCmdlet()
57+
protected override void OnProcessRecord()
5858
{
5959
try
6060
{
6161
switch (ParameterSetName)
6262
{
6363
case GetByStackNameParameterSetname:
64-
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(StackName, Name));
64+
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(StackName, Name), true);
6565
break;
6666
case GetByResourceIdParameterSetName:
6767
ResourceIdentifier resourceIdentifier = new ResourceIdentifier(ResourceId);
6868
StackName = ResourceIdUtility.GetResourceName(ResourceId).Split('/')[0];
6969
Name = resourceIdentifier.ResourceName;
70-
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(StackName, Name));
70+
WriteObject(DeploymentStacksSdkClient.GetSubscriptionDeploymentStackSnapshot(StackName, Name), true);
7171
break;
7272
case ListParameterSetname:
73-
WriteObject(DeploymentStacksSdkClient.ListSubscriptionDeploymentStackSnapshot(StackName));
73+
WriteObject(DeploymentStacksSdkClient.ListSubscriptionDeploymentStackSnapshot(StackName), true);
7474
break;
7575
default:
7676
throw new PSInvalidOperationException();

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzResourceGroupDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public enum updateBehvaiorEnum { detachResources, purgeResources }
137137

138138
#region Cmdlet Overrides
139139

140-
public override void ExecuteCmdlet()
140+
protected override void OnProcessRecord()
141141
{
142142
try
143143
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/NewAzSubscriptionDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public enum updateBehvaiorEnum { detachResources, purgeResources }
139139

140140
#region Cmdlet Overrides
141141

142-
public override void ExecuteCmdlet()
142+
protected override void OnProcessRecord()
143143
{
144144
try
145145
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class RemoveAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
5454

5555
#region Cmdlet Overrides
5656

57-
public override void ExecuteCmdlet()
57+
protected override void OnProcessRecord()
5858
{
5959
try
6060
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStackSnapshot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class RemoveAzResourceGroupDeploymentStackSnapshot : DeploymentStacksCmdl
6060

6161
#region Cmdlet Overrides
6262

63-
public override void ExecuteCmdlet()
63+
protected override void OnProcessRecord()
6464
{
6565
try
6666
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class RemoveAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
4949

5050
#region Cmdlet Overrides
5151

52-
public override void ExecuteCmdlet()
52+
protected override void OnProcessRecord()
5353
{
5454
try
5555
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStackSnapshot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class RemoveAzSubscriptionDeploymentStackSnapshot : DeploymentStacksCmdle
5454

5555
#region Cmdlet Overrides
5656

57-
public override void ExecuteCmdlet()
57+
protected override void OnProcessRecord()
5858
{
5959
try
6060
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzResourceGroupDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public enum updateBehvaiorEnum {detachResources,purgeResources}
137137

138138
#region Cmdlet Overrides
139139

140-
public override void ExecuteCmdlet()
140+
protected override void OnProcessRecord()
141141
{
142142
try
143143
{

‎src/Resources/ResourceManager/Implementation/DeploymentStacks/SetAzSubscriptionDeploymentStack.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public enum updateBehvaiorEnum { detachResources, purgeResources }
139139

140140
#region Cmdlet Overrides
141141

142-
public override void ExecuteCmdlet()
142+
protected override void OnProcessRecord()
143143
{
144144
try
145145
{

‎src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
77
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
88
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkModels;
9+
using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
910
using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
1011
using Microsoft.WindowsAzure.Commands.Common;
1112
using Microsoft.Azure.Management.ResourceManager;
@@ -26,10 +27,14 @@ public class DeploymentStacksSdkClient
2627
{
2728
public IDeploymentStacksClient DeploymentStacksClient { get; set; }
2829

29-
private IAzureContext azureContext;
30-
3130
public Action<string> VerboseLogger { get; set; }
3231

32+
public Action<string> ErrorLogger { get; set; }
33+
34+
public Action<string> WarningLogger { get; set; }
35+
36+
private IAzureContext azureContext;
37+
3338
public DeploymentStacksSdkClient(IDeploymentStacksClient deploymentStacksClient)
3439
{
3540
this.DeploymentStacksClient = deploymentStacksClient;
@@ -84,7 +89,7 @@ public PSDeploymentStack GetResourceGroupDeploymentStack(
8489
}
8590
}
8691

87-
public IEnumerable<PSDeploymentStack> ListResourceGroupDeploymentStack(string resourceGroupName, bool throwIfNotExists = true)
92+
public IList<PSDeploymentStack> ListResourceGroupDeploymentStack(string resourceGroupName, bool throwIfNotExists = true)
8893
{
8994
try
9095
{
@@ -109,7 +114,7 @@ public IEnumerable<PSDeploymentStack> ListResourceGroupDeploymentStack(string re
109114

110115
if (ex is DeploymentStacksErrorException dex)
111116
throw new PSArgumentException(dex.Body.Error.Message);
112-
117+
113118
throw ex;
114119
}
115120
}
@@ -618,5 +623,21 @@ private void WriteVerbose(string progress)
618623
VerboseLogger(progress);
619624
}
620625
}
626+
627+
private void WriteWarning(string warning)
628+
{
629+
if (WarningLogger != null)
630+
{
631+
WarningLogger(warning);
632+
}
633+
}
634+
635+
private void WriteError(string error)
636+
{
637+
if (ErrorLogger != null)
638+
{
639+
ErrorLogger(error);
640+
}
641+
}
621642
}
622643
}

0 commit comments

Comments
 (0)