Skip to content

Add -AsJob to Resources cmdlets and fix base cmdlets #5153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 20, 2017
Merged

Add -AsJob to Resources cmdlets and fix base cmdlets #5153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b6fd8f
resources cmdlets
azdevxps Dec 15, 2017
eeb86d9
Make necessary changes to BaseCmdlets
azdevxps Dec 15, 2017
f4634bb
Address PR comments
azdevxps Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...nsights/Commands.ApplicationInsights/ApplicationInsights/ApplicationInsightsBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,11 @@ public IApplicationInsightsManagementClient AppInsightsManagementClient
{
if (appInsightsManagementClientWrapper == null)
{
appInsightsManagementClientWrapper = new ApplicationInsightsManagementClientWrapper(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
appInsightsManagementClientWrapper = new ApplicationInsightsManagementClientWrapper(DefaultProfile.DefaultContext);
}

this.appInsightsManagementClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
this.appInsightsManagementClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
return appInsightsManagementClientWrapper.appInsightsManagementClient;
}

Expand Down
3 changes: 2 additions & 1 deletion src/ResourceManager/AzureBatch/Commands.Batch/BatchCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ public BatchClient BatchClient
if (batchClient == null)
{
batchClient = new BatchClient(DefaultContext);
batchClient.VerboseLogger = WriteVerboseWithTimestamp;
}

this.batchClient.VerboseLogger = WriteVerboseWithTimestamp;
return batchClient;
}

Expand Down
8 changes: 3 additions & 5 deletions ...nagement.CognitiveServices/CognitiveServicesAccount/CognitiveServicesAccountBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,11 @@ public ICognitiveServicesManagementClient CognitiveServicesClient
{
if (cognitiveServicesClientWrapper == null)
{
cognitiveServicesClientWrapper = new CognitiveServicesManagementClientWrapper(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
cognitiveServicesClientWrapper = new CognitiveServicesManagementClientWrapper(DefaultProfile.DefaultContext);
}

this.cognitiveServicesClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
this.cognitiveServicesClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
return cognitiveServicesClientWrapper.CognitiveServicesManagementClient;
}

Expand Down
8 changes: 3 additions & 5 deletions src/ResourceManager/Compute/Commands.Compute/Common/ComputeClientBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ public ComputeClient ComputeClient
{
if (computeClient == null)
{
computeClient = new ComputeClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
computeClient = new ComputeClient(DefaultProfile.DefaultContext);
}

this.computeClient.VerboseLogger = WriteVerboseWithTimestamp;
this.computeClient.ErrorLogger = WriteErrorWithTimestamp;
return computeClient;
}

Expand Down
11 changes: 5 additions & 6 deletions ...ceManager/Compute/Commands.Compute/RemoteDesktop/VirtualMachineRemoteDesktopBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ public NetworkClient NetworkClient
{
if (networkClient == null)
{
networkClient = new NetworkClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
networkClient = new NetworkClient(DefaultProfile.DefaultContext);
}

this.networkClient.VerboseLogger = WriteVerboseWithTimestamp;
this.networkClient.ErrorLogger = WriteErrorWithTimestamp;
this.networkClient.WarningLogger = WriteWarningWithTimestamp;
return networkClient;
}

Expand Down
8 changes: 3 additions & 5 deletions src/ResourceManager/Compute/Stack/Commands.Compute/Common/ComputeClientBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ public ComputeClient ComputeClient
{
if (computeClient == null)
{
computeClient = new ComputeClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
computeClient = new ComputeClient(DefaultProfile.DefaultContext);
}

this.computeClient.VerboseLogger = WriteVerboseWithTimestamp;
this.computeClient.ErrorLogger = WriteErrorWithTimestamp;
return computeClient;
}

Expand Down
11 changes: 5 additions & 6 deletions ...ger/Compute/Stack/Commands.Compute/RemoteDesktop/VirtualMachineRemoteDesktopBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ public NetworkClient NetworkClient
{
if (networkClient == null)
{
networkClient = new NetworkClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
networkClient = new NetworkClient(DefaultProfile.DefaultContext);
}

this.networkClient.VerboseLogger = WriteVerboseWithTimestamp;
this.networkClient.ErrorLogger = WriteErrorWithTimestamp;
this.networkClient.WarningLogger = WriteWarningWithTimestamp;
return networkClient;
}

Expand Down
11 changes: 5 additions & 6 deletions ...anager/ContainerRegistry/Commands.ContainerRegistry/Models/ContainerRegistryCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ public ContainerRegistryClient RegistryClient
{
if (_RegistryClient == null)
{
_RegistryClient = new ContainerRegistryClient(DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
_RegistryClient = new ContainerRegistryClient(DefaultContext);
}

this._RegistryClient.VerboseLogger = WriteVerboseWithTimestamp;
this._RegistryClient.ErrorLogger = WriteErrorWithTimestamp;
this._RegistryClient.WarningLogger = WriteWarningWithTimestamp;
return _RegistryClient;
}

Expand Down
10 changes: 5 additions & 5 deletions src/ResourceManager/LogicApp/Commands.LogicApp/Utilities/LogicAppBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ public IntegrationAccountClient IntegrationAccountClient
{
get
{
this._integartionAccountClient = new IntegrationAccountClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
this._integartionAccountClient = new IntegrationAccountClient(DefaultProfile.DefaultContext);

this._integartionAccountClient.VerboseLogger = WriteVerboseWithTimestamp;
this._integartionAccountClient.ErrorLogger = WriteErrorWithTimestamp;

return _integartionAccountClient;
}

Expand Down
11 changes: 5 additions & 6 deletions ...ineLearning/Commands.MachineLearning/Cmdlets/CommitmentPlans/CommitmentPlansCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ public CommitmentPlansClient CommitmentPlansClient
{
if (this.commitmentPlansClient == null)
{
this.commitmentPlansClient = new CommitmentPlansClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
this.commitmentPlansClient = new CommitmentPlansClient(DefaultProfile.DefaultContext);
}

this.commitmentPlansClient.VerboseLogger = WriteVerboseWithTimestamp;
this.commitmentPlansClient.ErrorLogger = WriteErrorWithTimestamp;
this.commitmentPlansClient.WarningLogger = WriteWarningWithTimestamp;
return this.commitmentPlansClient;
}
set { this.commitmentPlansClient = value; }
Expand Down
11 changes: 5 additions & 6 deletions ...ger/MachineLearning/Commands.MachineLearning/Cmdlets/WebServices/WebServicesCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ public WebServicesClient WebServicesClient
{
if (this.webServicesClient == null)
{
this.webServicesClient = new WebServicesClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
this.webServicesClient = new WebServicesClient(DefaultProfile.DefaultContext);
}

this.webServicesClient.VerboseLogger = WriteVerboseWithTimestamp;
this.webServicesClient.ErrorLogger = WriteErrorWithTimestamp;
this.webServicesClient.WarningLogger = WriteWarningWithTimestamp;
return this.webServicesClient;
}
set { this.webServicesClient = value; }
Expand Down
11 changes: 5 additions & 6 deletions src/ResourceManager/Network/Commands.Network/Common/NetworkBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ public NetworkClient NetworkClient
{
if (_networkClient == null)
{
_networkClient = new NetworkClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
_networkClient = new NetworkClient(DefaultProfile.DefaultContext);
}

this._networkClient.VerboseLogger = WriteVerboseWithTimestamp;
this._networkClient.ErrorLogger = WriteErrorWithTimestamp;
this._networkClient.WarningLogger = WriteWarningWithTimestamp;
return _networkClient;
}

Expand Down
11 changes: 5 additions & 6 deletions src/ResourceManager/Network/Stack/Commands.Network/Common/NetworkBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@ public NetworkClient NetworkClient
{
if (_networkClient == null)
{
_networkClient = new NetworkClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
_networkClient = new NetworkClient(DefaultProfile.DefaultContext);
}

this._networkClient.VerboseLogger = WriteVerboseWithTimestamp;
this._networkClient.ErrorLogger = WriteErrorWithTimestamp;
this._networkClient.WarningLogger = WriteWarningWithTimestamp;
return _networkClient;
}

Expand Down
12 changes: 6 additions & 6 deletions ...s/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceManagerCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,13 @@ public ResourceManagerSdkClient ResourceManagerSdkClient
{
if (this.resourceManagerSdkClient == null)
{
this.resourceManagerSdkClient = new ResourceManagerSdkClient(DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
this.resourceManagerSdkClient = new ResourceManagerSdkClient(DefaultContext);
}

this.resourceManagerSdkClient.VerboseLogger = WriteVerboseWithTimestamp;
this.resourceManagerSdkClient.ErrorLogger = WriteErrorWithTimestamp;
this.resourceManagerSdkClient.WarningLogger = WriteWarningWithTimestamp;

return this.resourceManagerSdkClient;
}

Expand Down
3 changes: 3 additions & 0 deletions .../Cmdlets/Implementation/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public class NewAzureResourceGroupDeploymentCmdlet : ResourceWithParameterCmdlet
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
public SwitchParameter Force { get; set; }

[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
public SwitchParameter AsJob { get; set; }

public NewAzureResourceGroupDeploymentCmdlet()
{
this.Mode = DeploymentMode.Incremental;
Expand Down
3 changes: 3 additions & 0 deletions ...s.ResourceManager/Cmdlets/Implementation/ResourceGroups/RemoveAzureResourceGroupCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ public class RemoveAzureResourceGroupCmdlet : ResourceManagerCmdletBase
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
public SwitchParameter Force { get; set; }

[Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
public SwitchParameter AsJob { get; set; }

public override void ExecuteCmdlet()
{
Name = Name ?? ResourceIdentifier.FromResourceGroupIdentifier(this.Id).ResourceGroupName;
Expand Down
7 changes: 5 additions & 2 deletions src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ function Test-CreatesAndRemoveResourceGroupViaPiping
New-AzureRmResourceGroup -Name $rgname1 -Location $location
New-AzureRmResourceGroup -Name $rgname2 -Location $location

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

# Assert
Get-AzureRmResourceGroup -Name $rgname1 -ErrorAction SilentlyContinue
Expand Down Expand Up @@ -249,7 +250,9 @@ function Test-RemoveDeployment
{
# Test
New-AzureRmResourceGroup -Name $rgName -Location "East US"
$deployment = New-AzureRmResourceGroupDeployment -ResourceGroupName $rgName -Name $deploymentName -TemplateUri $templateUri
$job = New-AzureRmResourceGroupDeployment -ResourceGroupName $rgName -Name $deploymentName -TemplateUri $templateUri -AsJob
Wait-Job $job
$deployment = Receive-Job $job
Assert-True { Remove-AzureRmResourceGroupDeployment -ResourceGroupName $deployment.ResourceGroupName -Name $deployment.DeploymentName }
}
finally
Expand Down
8 changes: 3 additions & 5 deletions ...rceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,11 @@ public IStorageManagementClient StorageClient
{
if (storageClientWrapper == null)
{
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext);
}

this.storageClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
this.storageClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
return storageClientWrapper.StorageManagementClient;
}

Expand Down
8 changes: 3 additions & 5 deletions ...ager/Storage/Stack/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,11 @@ public IStorageManagementClient StorageClient
{
if (storageClientWrapper == null)
{
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
storageClientWrapper = new StorageManagementClientWrapper(DefaultProfile.DefaultContext);
}

this.storageClientWrapper.VerboseLogger = WriteVerboseWithTimestamp;
this.storageClientWrapper.ErrorLogger = WriteErrorWithTimestamp;
return storageClientWrapper.StorageManagementClient;
}

Expand Down
9 changes: 4 additions & 5 deletions src/ResourceManager/Tags/Commands.Tags/Model/TagBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ public TagsClient TagsClient
{
if (tagsClient == null)
{
tagsClient = new TagsClient(DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
tagsClient = new TagsClient(DefaultContext);
}

this.tagsClient.VerboseLogger = WriteVerboseWithTimestamp;
this.tagsClient.ErrorLogger = WriteErrorWithTimestamp;
return tagsClient;
}

Expand Down
8 changes: 3 additions & 5 deletions ...urceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ public TrafficManagerClient TrafficManagerClient
{
if (this.trafficManagerClient == null)
{
this.trafficManagerClient = new TrafficManagerClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp
};
this.trafficManagerClient = new TrafficManagerClient(DefaultProfile.DefaultContext);
}

this.trafficManagerClient.VerboseLogger = WriteVerboseWithTimestamp;
this.trafficManagerClient.ErrorLogger = WriteErrorWithTimestamp;
return this.trafficManagerClient;
}

Expand Down
11 changes: 5 additions & 6 deletions src/ResourceManager/Websites/Commands.Websites/Models.WebApp/WebAppBaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ public ResourceClient ResourcesClient
{
if (_resourcesClient == null)
{
_resourcesClient = new ResourceClient(DefaultProfile.DefaultContext)
{
VerboseLogger = WriteVerboseWithTimestamp,
ErrorLogger = WriteErrorWithTimestamp,
WarningLogger = WriteWarningWithTimestamp
};
_resourcesClient = new ResourceClient(DefaultProfile.DefaultContext);
}

this._resourcesClient.VerboseLogger = WriteVerboseWithTimestamp;
this._resourcesClient.ErrorLogger = WriteErrorWithTimestamp;
this._resourcesClient.WarningLogger = WriteWarningWithTimestamp;
return _resourcesClient;
}
set { _resourcesClient = value; }
Expand Down