Skip to content

Commit 05f335a

Browse files
authored
Merge pull request Azure#5153 from maddieclayton/AsJob1
Add -AsJob to Resources cmdlets and fix base cmdlets
2 parents d257f3d + f4634bb commit 05f335a

File tree

22 files changed

+89
-102
lines changed

22 files changed

+89
-102
lines changed

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/ApplicationInsights/ApplicationInsightsBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,11 @@ public IApplicationInsightsManagementClient AppInsightsManagementClient
9999
{
100100
if (appInsightsManagementClientWrapper == null)
101101
{
102-
appInsightsManagementClientWrapper = new ApplicationInsightsManagementClientWrapper(DefaultProfile.DefaultContext)
103-
{
104-
VerboseLogger = WriteVerboseWithTimestamp,
105-
ErrorLogger = WriteErrorWithTimestamp
106-
};
102+
appInsightsManagementClientWrapper = new ApplicationInsightsManagementClientWrapper(DefaultProfile.DefaultContext);
107103
}
108104

105+
this.appInsightsManagementClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
106+
this.appInsightsManagementClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
109107
return appInsightsManagementClientWrapper.appInsightsManagementClient;
110108
}
111109

src/ResourceManager/AzureBatch/Commands.Batch/BatchCmdletBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ public BatchClient BatchClient
3434
if (batchClient == null)
3535
{
3636
batchClient = new BatchClient(DefaultContext);
37-
batchClient.VerboseLogger = WriteVerboseWithTimestamp;
3837
}
38+
39+
this.batchClient.VerboseLogger = WriteVerboseWithTimestamp;
3940
return batchClient;
4041
}
4142

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/CognitiveServicesAccount/CognitiveServicesAccountBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,11 @@ public ICognitiveServicesManagementClient CognitiveServicesClient
8585
{
8686
if (cognitiveServicesClientWrapper == null)
8787
{
88-
cognitiveServicesClientWrapper = new CognitiveServicesManagementClientWrapper(DefaultProfile.DefaultContext)
89-
{
90-
VerboseLogger = WriteVerboseWithTimestamp,
91-
ErrorLogger = WriteErrorWithTimestamp
92-
};
88+
cognitiveServicesClientWrapper = new CognitiveServicesManagementClientWrapper(DefaultProfile.DefaultContext);
9389
}
9490

91+
this.cognitiveServicesClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
92+
this.cognitiveServicesClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
9593
return cognitiveServicesClientWrapper.CognitiveServicesManagementClient;
9694
}
9795

src/ResourceManager/Compute/Commands.Compute/Common/ComputeClientBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ public ComputeClient ComputeClient
3232
{
3333
if (computeClient == null)
3434
{
35-
computeClient = new ComputeClient(DefaultProfile.DefaultContext)
36-
{
37-
VerboseLogger = WriteVerboseWithTimestamp,
38-
ErrorLogger = WriteErrorWithTimestamp
39-
};
35+
computeClient = new ComputeClient(DefaultProfile.DefaultContext);
4036
}
4137

38+
this.computeClient.VerboseLogger = WriteVerboseWithTimestamp;
39+
this.computeClient.ErrorLogger = WriteErrorWithTimestamp;
4240
return computeClient;
4341
}
4442

src/ResourceManager/Compute/Commands.Compute/RemoteDesktop/VirtualMachineRemoteDesktopBaseCmdlet.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ public NetworkClient NetworkClient
2626
{
2727
if (networkClient == null)
2828
{
29-
networkClient = new NetworkClient(DefaultProfile.DefaultContext)
30-
{
31-
VerboseLogger = WriteVerboseWithTimestamp,
32-
ErrorLogger = WriteErrorWithTimestamp,
33-
WarningLogger = WriteWarningWithTimestamp
34-
};
29+
networkClient = new NetworkClient(DefaultProfile.DefaultContext);
3530
}
31+
32+
this.networkClient.VerboseLogger = WriteVerboseWithTimestamp;
33+
this.networkClient.ErrorLogger = WriteErrorWithTimestamp;
34+
this.networkClient.WarningLogger = WriteWarningWithTimestamp;
3635
return networkClient;
3736
}
3837

src/ResourceManager/Compute/Stack/Commands.Compute/Common/ComputeClientBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ public ComputeClient ComputeClient
3434
{
3535
if (computeClient == null)
3636
{
37-
computeClient = new ComputeClient(DefaultProfile.DefaultContext)
38-
{
39-
VerboseLogger = WriteVerboseWithTimestamp,
40-
ErrorLogger = WriteErrorWithTimestamp
41-
};
37+
computeClient = new ComputeClient(DefaultProfile.DefaultContext);
4238
}
4339

40+
this.computeClient.VerboseLogger = WriteVerboseWithTimestamp;
41+
this.computeClient.ErrorLogger = WriteErrorWithTimestamp;
4442
return computeClient;
4543
}
4644

src/ResourceManager/Compute/Stack/Commands.Compute/RemoteDesktop/VirtualMachineRemoteDesktopBaseCmdlet.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ public NetworkClient NetworkClient
2727
{
2828
if (networkClient == null)
2929
{
30-
networkClient = new NetworkClient(DefaultProfile.DefaultContext)
31-
{
32-
VerboseLogger = WriteVerboseWithTimestamp,
33-
ErrorLogger = WriteErrorWithTimestamp,
34-
WarningLogger = WriteWarningWithTimestamp
35-
};
30+
networkClient = new NetworkClient(DefaultProfile.DefaultContext);
3631
}
32+
33+
this.networkClient.VerboseLogger = WriteVerboseWithTimestamp;
34+
this.networkClient.ErrorLogger = WriteErrorWithTimestamp;
35+
this.networkClient.WarningLogger = WriteWarningWithTimestamp;
3736
return networkClient;
3837
}
3938

src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Models/ContainerRegistryCmdletBase.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,12 @@ public ContainerRegistryClient RegistryClient
9090
{
9191
if (_RegistryClient == null)
9292
{
93-
_RegistryClient = new ContainerRegistryClient(DefaultContext)
94-
{
95-
VerboseLogger = WriteVerboseWithTimestamp,
96-
ErrorLogger = WriteErrorWithTimestamp,
97-
WarningLogger = WriteWarningWithTimestamp
98-
};
93+
_RegistryClient = new ContainerRegistryClient(DefaultContext);
9994
}
95+
96+
this._RegistryClient.VerboseLogger = WriteVerboseWithTimestamp;
97+
this._RegistryClient.ErrorLogger = WriteErrorWithTimestamp;
98+
this._RegistryClient.WarningLogger = WriteWarningWithTimestamp;
10099
return _RegistryClient;
101100
}
102101

src/ResourceManager/LogicApp/Commands.LogicApp/Utilities/LogicAppBaseCmdlet.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public IntegrationAccountClient IntegrationAccountClient
3535
{
3636
get
3737
{
38-
this._integartionAccountClient = new IntegrationAccountClient(DefaultProfile.DefaultContext)
39-
{
40-
VerboseLogger = WriteVerboseWithTimestamp,
41-
ErrorLogger = WriteErrorWithTimestamp
42-
};
38+
this._integartionAccountClient = new IntegrationAccountClient(DefaultProfile.DefaultContext);
39+
40+
this._integartionAccountClient.VerboseLogger = WriteVerboseWithTimestamp;
41+
this._integartionAccountClient.ErrorLogger = WriteErrorWithTimestamp;
42+
4343
return _integartionAccountClient;
4444
}
4545

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/CommitmentPlans/CommitmentPlansCmdletBase.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ public CommitmentPlansClient CommitmentPlansClient
3232
{
3333
if (this.commitmentPlansClient == null)
3434
{
35-
this.commitmentPlansClient = new CommitmentPlansClient(DefaultProfile.DefaultContext)
36-
{
37-
VerboseLogger = WriteVerboseWithTimestamp,
38-
ErrorLogger = WriteErrorWithTimestamp,
39-
WarningLogger = WriteWarningWithTimestamp
40-
};
35+
this.commitmentPlansClient = new CommitmentPlansClient(DefaultProfile.DefaultContext);
4136
}
37+
38+
this.commitmentPlansClient.VerboseLogger = WriteVerboseWithTimestamp;
39+
this.commitmentPlansClient.ErrorLogger = WriteErrorWithTimestamp;
40+
this.commitmentPlansClient.WarningLogger = WriteWarningWithTimestamp;
4241
return this.commitmentPlansClient;
4342
}
4443
set { this.commitmentPlansClient = value; }

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/WebServices/WebServicesCmdletBase.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ public WebServicesClient WebServicesClient
2828
{
2929
if (this.webServicesClient == null)
3030
{
31-
this.webServicesClient = new WebServicesClient(DefaultProfile.DefaultContext)
32-
{
33-
VerboseLogger = WriteVerboseWithTimestamp,
34-
ErrorLogger = WriteErrorWithTimestamp,
35-
WarningLogger = WriteWarningWithTimestamp
36-
};
31+
this.webServicesClient = new WebServicesClient(DefaultProfile.DefaultContext);
3732
}
33+
34+
this.webServicesClient.VerboseLogger = WriteVerboseWithTimestamp;
35+
this.webServicesClient.ErrorLogger = WriteErrorWithTimestamp;
36+
this.webServicesClient.WarningLogger = WriteWarningWithTimestamp;
3837
return this.webServicesClient;
3938
}
4039
set { this.webServicesClient = value; }

src/ResourceManager/Network/Commands.Network/Common/NetworkBaseCmdlet.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ public NetworkClient NetworkClient
3030
{
3131
if (_networkClient == null)
3232
{
33-
_networkClient = new NetworkClient(DefaultProfile.DefaultContext)
34-
{
35-
VerboseLogger = WriteVerboseWithTimestamp,
36-
ErrorLogger = WriteErrorWithTimestamp,
37-
WarningLogger = WriteWarningWithTimestamp
38-
};
33+
_networkClient = new NetworkClient(DefaultProfile.DefaultContext);
3934
}
35+
36+
this._networkClient.VerboseLogger = WriteVerboseWithTimestamp;
37+
this._networkClient.ErrorLogger = WriteErrorWithTimestamp;
38+
this._networkClient.WarningLogger = WriteWarningWithTimestamp;
4039
return _networkClient;
4140
}
4241

src/ResourceManager/Network/Stack/Commands.Network/Common/NetworkBaseCmdlet.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ public NetworkClient NetworkClient
2929
{
3030
if (_networkClient == null)
3131
{
32-
_networkClient = new NetworkClient(DefaultProfile.DefaultContext)
33-
{
34-
VerboseLogger = WriteVerboseWithTimestamp,
35-
ErrorLogger = WriteErrorWithTimestamp,
36-
WarningLogger = WriteWarningWithTimestamp
37-
};
32+
_networkClient = new NetworkClient(DefaultProfile.DefaultContext);
3833
}
34+
35+
this._networkClient.VerboseLogger = WriteVerboseWithTimestamp;
36+
this._networkClient.ErrorLogger = WriteErrorWithTimestamp;
37+
this._networkClient.WarningLogger = WriteWarningWithTimestamp;
3938
return _networkClient;
4039
}
4140

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,13 @@ public ResourceManagerSdkClient ResourceManagerSdkClient
293293
{
294294
if (this.resourceManagerSdkClient == null)
295295
{
296-
this.resourceManagerSdkClient = new ResourceManagerSdkClient(DefaultContext)
297-
{
298-
VerboseLogger = WriteVerboseWithTimestamp,
299-
ErrorLogger = WriteErrorWithTimestamp,
300-
WarningLogger = WriteWarningWithTimestamp
301-
};
296+
this.resourceManagerSdkClient = new ResourceManagerSdkClient(DefaultContext);
302297
}
298+
299+
this.resourceManagerSdkClient.VerboseLogger = WriteVerboseWithTimestamp;
300+
this.resourceManagerSdkClient.ErrorLogger = WriteErrorWithTimestamp;
301+
this.resourceManagerSdkClient.WarningLogger = WriteWarningWithTimestamp;
302+
303303
return this.resourceManagerSdkClient;
304304
}
305305

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCmdlet.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class NewAzureResourceGroupDeploymentCmdlet : ResourceWithParameterCmdlet
4949
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
5050
public SwitchParameter Force { get; set; }
5151

52+
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
53+
public SwitchParameter AsJob { get; set; }
54+
5255
public NewAzureResourceGroupDeploymentCmdlet()
5356
{
5457
this.Mode = DeploymentMode.Incremental;

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ResourceGroups/RemoveAzureResourceGroupCmdlet.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public class RemoveAzureResourceGroupCmdlet : ResourceManagerCmdletBase
5151
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
5252
public SwitchParameter Force { get; set; }
5353

54+
[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
55+
public SwitchParameter AsJob { get; set; }
56+
5457
public override void ExecuteCmdlet()
5558
{
5659
Name = Name ?? ResourceIdentifier.FromResourceGroupIdentifier(this.Id).ResourceGroupName;

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ function Test-CreatesAndRemoveResourceGroupViaPiping
8888
New-AzureRmResourceGroup -Name $rgname1 -Location $location
8989
New-AzureRmResourceGroup -Name $rgname2 -Location $location
9090

91-
Get-AzureRmResourceGroup | where {$_.ResourceGroupName -eq $rgname1 -or $_.ResourceGroupName -eq $rgname2} | Remove-AzureRmResourceGroup -Force
91+
$job = Get-AzureRmResourceGroup | where {$_.ResourceGroupName -eq $rgname1 -or $_.ResourceGroupName -eq $rgname2} | Remove-AzureRmResourceGroup -Force -AsJob
92+
Wait-Job $job
9293

9394
# Assert
9495
Get-AzureRmResourceGroup -Name $rgname1 -ErrorAction SilentlyContinue
@@ -249,7 +250,9 @@ function Test-RemoveDeployment
249250
{
250251
# Test
251252
New-AzureRmResourceGroup -Name $rgName -Location "East US"
252-
$deployment = New-AzureRmResourceGroupDeployment -ResourceGroupName $rgName -Name $deploymentName -TemplateUri $templateUri
253+
$job = New-AzureRmResourceGroupDeployment -ResourceGroupName $rgName -Name $deploymentName -TemplateUri $templateUri -AsJob
254+
Wait-Job $job
255+
$deployment = Receive-Job $job
253256
Assert-True { Remove-AzureRmResourceGroupDeployment -ResourceGroupName $deployment.ResourceGroupName -Name $deployment.DeploymentName }
254257
}
255258
finally

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,11 @@ public IStorageManagementClient StorageClient
8080
{
8181
if (storageClientWrapper == null)
8282
{
83-
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext)
84-
{
85-
VerboseLogger = WriteVerboseWithTimestamp,
86-
ErrorLogger = WriteErrorWithTimestamp
87-
};
83+
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext);
8884
}
8985

86+
this.storageClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
87+
this.storageClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
9088
return storageClientWrapper.StorageManagementClient;
9189
}
9290

src/ResourceManager/Storage/Stack/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,11 @@ public IStorageManagementClient StorageClient
5757
{
5858
if (storageClientWrapper == null)
5959
{
60-
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext)
61-
{
62-
VerboseLogger = WriteVerboseWithTimestamp,
63-
ErrorLogger = WriteErrorWithTimestamp
64-
};
60+
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext);
6561
}
6662

63+
this.storageClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
64+
this.storageClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
6765
return storageClientWrapper.StorageManagementClient;
6866
}
6967

src/ResourceManager/Tags/Commands.Tags/Model/TagBaseCmdlet.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ public TagsClient TagsClient
2626
{
2727
if (tagsClient == null)
2828
{
29-
tagsClient = new TagsClient(DefaultContext)
30-
{
31-
VerboseLogger = WriteVerboseWithTimestamp,
32-
ErrorLogger = WriteErrorWithTimestamp
33-
};
29+
tagsClient = new TagsClient(DefaultContext);
3430
}
31+
32+
this.tagsClient.VerboseLogger = WriteVerboseWithTimestamp;
33+
this.tagsClient.ErrorLogger = WriteErrorWithTimestamp;
3534
return tagsClient;
3635
}
3736

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerBaseCmdlet.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ public TrafficManagerClient TrafficManagerClient
2626
{
2727
if (this.trafficManagerClient == null)
2828
{
29-
this.trafficManagerClient = new TrafficManagerClient(DefaultProfile.DefaultContext)
30-
{
31-
VerboseLogger = WriteVerboseWithTimestamp,
32-
ErrorLogger = WriteErrorWithTimestamp
33-
};
29+
this.trafficManagerClient = new TrafficManagerClient(DefaultProfile.DefaultContext);
3430
}
3531

32+
this.trafficManagerClient.VerboseLogger = WriteVerboseWithTimestamp;
33+
this.trafficManagerClient.ErrorLogger = WriteErrorWithTimestamp;
3634
return this.trafficManagerClient;
3735
}
3836

src/ResourceManager/Websites/Commands.Websites/Models.WebApp/WebAppBaseClient.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ public ResourceClient ResourcesClient
2828
{
2929
if (_resourcesClient == null)
3030
{
31-
_resourcesClient = new ResourceClient(DefaultProfile.DefaultContext)
32-
{
33-
VerboseLogger = WriteVerboseWithTimestamp,
34-
ErrorLogger = WriteErrorWithTimestamp,
35-
WarningLogger = WriteWarningWithTimestamp
36-
};
31+
_resourcesClient = new ResourceClient(DefaultProfile.DefaultContext);
3732
}
33+
34+
this._resourcesClient.VerboseLogger = WriteVerboseWithTimestamp;
35+
this._resourcesClient.ErrorLogger = WriteErrorWithTimestamp;
36+
this._resourcesClient.WarningLogger = WriteWarningWithTimestamp;
3837
return _resourcesClient;
3938
}
4039
set { _resourcesClient = value; }

0 commit comments

Comments
 (0)