Skip to content

Commit 0c89f74

Browse files
[AppService]: fix #5833 Edit-AzureRmWebAppBackupConfiguration always sets Enabled to True (#21221)
* [AppService]: fix #5833 Edit-AzureRmWebAppBackupConfiguration always sets Enabled to True * Fixed build issues * Updated Synopsis --------- Co-authored-by: Yabo Hu <[email protected]>
1 parent 11bdb8c commit 0c89f74

File tree

6 files changed

+806
-951
lines changed

6 files changed

+806
-951
lines changed

src/Websites/Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function Test-EditAndGetWebAppBackupConfiguration
223223
-ResourceGroupName $rgName -Name $wName -StorageAccountUrl $sasUri `
224224
-FrequencyInterval $frequencyInterval -FrequencyUnit $frequencyUnit `
225225
-RetentionPeriodInDays $retentionPeriod -StartTime $startTime `
226-
-KeepAtLeastOneBackup
226+
-KeepAtLeastOneBackup -Enabled
227227

228228
# Assert
229229
Assert-True { $config.Enabled }

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestEditAndGetWebAppBackupConfiguration.json

Lines changed: 408 additions & 573 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestEditAndGetWebAppBackupConfigurationPiping.json

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

src/Websites/Websites/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed `Edit-AzWebAppBackupConfiguration` to pass backup configuration enabled or not
2122
* Added a new parametre `-SoftRestart` for `Restart-AzWebApp` and `Restart-AzWebApp` to perform a soft restart
2223
* Updated `Get-AzWebApp` and `Get-AzWebAppSlot` to expose `VirtualNetwork Integration Info` [#10665]
2324
* Added a new parameter `-CopyIdentity` for `New-AzWebAppSlot` to copy the identity from the parent app to the slot.

src/Websites/Websites/Cmdlets/BackupRestore/EditAzureWebAppBackupConfiguration.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class EditAzureWebAppBackupConfiguration : WebAppOptionalSlotBaseCmdlet
4949
[Parameter(Position = 9, Mandatory = false, HelpMessage = "True if one backup should always be kept in the storage account, regardless of how old it is.", ValueFromPipelineByPropertyName = true)]
5050
public SwitchParameter KeepAtLeastOneBackup { get; set; }
5151

52+
[Parameter(Position = 10, Mandatory = false, HelpMessage = "To enable backup configuration.", ValueFromPipelineByPropertyName = true)]
53+
public SwitchParameter Enabled { get; set; }
54+
5255
public override void ExecuteCmdlet()
5356
{
5457
base.ExecuteCmdlet();
@@ -59,7 +62,7 @@ public override void ExecuteCmdlet()
5962
RetentionPeriodInDays, StartTime);
6063
BackupRequest request = new BackupRequest()
6164
{
62-
Enabled = true,
65+
Enabled = this.Enabled.IsPresent,
6366
StorageAccountUrl = this.StorageAccountUrl,
6467
BackupSchedule = schedule,
6568
Databases = this.Databases,
@@ -76,7 +79,7 @@ public override void ExecuteCmdlet()
7679
StartTime = this.StartTime,
7780
KeepAtLeastOneBackup = this.KeepAtLeastOneBackup.IsPresent,
7881
Databases = this.Databases,
79-
Enabled = true
82+
Enabled = this.Enabled.IsPresent
8083
};
8184
WriteObject(config);
8285
}

src/Websites/Websites/help/Edit-AzWebAppBackupConfiguration.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ schema: 2.0.0
99
# Edit-AzWebAppBackupConfiguration
1010

1111
## SYNOPSIS
12+
Edits the current configuration backup for an Azure Web App
1213

1314
## SYNTAX
1415

1516
### FromResourceName
1617
```
1718
Edit-AzWebAppBackupConfiguration [-FrequencyInterval] <Int32> [-FrequencyUnit] <String>
18-
[-RetentionPeriodInDays] <Int32> [[-StartTime] <DateTime>] [-KeepAtLeastOneBackup]
19+
[-RetentionPeriodInDays] <Int32> [[-StartTime] <DateTime>] [-KeepAtLeastOneBackup] [Enabled]
1920
[-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>] [-DefaultProfile <IAzureContextContainer>]
2021
[-StorageAccountUrl] <String> [[-Databases] <DatabaseBackupSetting[]>] [<CommonParameters>]
2122
```
2223

2324
### FromWebApp
2425
```
2526
Edit-AzWebAppBackupConfiguration [-FrequencyInterval] <Int32> [-FrequencyUnit] <String>
26-
[-RetentionPeriodInDays] <Int32> [[-StartTime] <DateTime>] [-KeepAtLeastOneBackup] [-WebApp] <PSSite>
27+
[-RetentionPeriodInDays] <Int32> [[-StartTime] <DateTime>] [-KeepAtLeastOneBackup] [Enabled] [-WebApp] <PSSite>
2728
[-DefaultProfile <IAzureContextContainer>] [-StorageAccountUrl] <String>
2829
[[-Databases] <DatabaseBackupSetting[]>] [<CommonParameters>]
2930
```
@@ -74,6 +75,21 @@ Accept pipeline input: False
7475
Accept wildcard characters: False
7576
```
7677
78+
### -Enabled
79+
Keep At Least One Backup Option
80+
81+
```yaml
82+
Type: System.Management.Automation.SwitchParameter
83+
Parameter Sets: (All)
84+
Aliases:
85+
86+
Required: False
87+
Position: 10
88+
Default value: None
89+
Accept pipeline input: True (ByPropertyName)
90+
Accept wildcard characters: False
91+
```
92+
7793
### -FrequencyInterval
7894
Frequency Interval
7995

0 commit comments

Comments
 (0)