Skip to content

Commit 7b68dd9

Browse files
committed
Follow-up fixes for Azure#13275
1 parent 8190a99 commit 7b68dd9

File tree

4 files changed

+612
-620
lines changed

4 files changed

+612
-620
lines changed

src/Resources/ResourceManager/Implementation/ResourceGroups/ExportAzureResourceGroupCmdlet.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
3737
[Cmdlet("Export", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ResourceGroup", SupportsShouldProcess = true), OutputType(typeof(PSObject))]
3838
public class ExportAzureResourceGroupCmdlet : ResourceManagerCmdletBaseWithApiVersion
3939
{
40-
/// <summary>
41-
/// Adding a hard-coded API version to be used when there is no value provided for 'ApiVersion' parameter.
42-
/// This is a temporary change until we update the cmdlet to use .NET SDK based client.
43-
/// </summary>
44-
private const string DefaultApiVersion = "2020-06-01";
45-
4640
/// <summary>
4741
/// Gets or sets the resource group name parameter.
4842
/// </summary>
@@ -116,9 +110,9 @@ protected override void OnProcessRecord()
116110

117111
var resourceGroupId = this.GetResourceGroupId();
118112

119-
if (this.IsParameterBound(c => c.ApiVersion))
113+
if (! this.IsParameterBound(c => c.ApiVersion))
120114
{
121-
var parameters = new Management.ResourceManager.Models.ExportTemplateRequest
115+
var parameters = new ExportTemplateRequest
122116
{
123117
Resources = this.GetResourcesFilter(resourceGroupId: resourceGroupId),
124118
Options = this.GetExportOptions(),
@@ -147,7 +141,7 @@ protected override void OnProcessRecord()
147141
Resources = this.GetResourcesFilter(resourceGroupId: resourceGroupId),
148142
Options = this.GetExportOptions(),
149143
};
150-
var apiVersion = this.ApiVersion ?? DefaultApiVersion;
144+
var apiVersion = this.ApiVersion;
151145
var operationResult = this.GetResourcesClient()
152146
.InvokeActionOnResource<JObject>(
153147
resourceId: resourceGroupId,

src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestExportResourceGroup.json

Lines changed: 123 additions & 121 deletions
Large diffs are not rendered by default.

src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestExportResourceGroupAsyncRoute.json

Lines changed: 351 additions & 357 deletions
Large diffs are not rendered by default.

src/Resources/Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestExportResourceGroupWithFiltering.json

Lines changed: 135 additions & 133 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)