diff --git a/src/azure-cli/azure/cli/command_modules/sql/_help.py b/src/azure-cli/azure/cli/command_modules/sql/_help.py index 2f529c13a7a..a11719c7bfe 100644 --- a/src/azure-cli/azure/cli/command_modules/sql/_help.py +++ b/src/azure-cli/azure/cli/command_modules/sql/_help.py @@ -242,7 +242,7 @@ short-summary: Update long term retention settings for a database. examples: - name: Set long term retention for a database. - text: az sql db ltr-policy set -g mygroup -s myserver -n mydb --weekly-retention "P1W" --monthly-retention "P6M" --yearly-retention "P1Y" --week-of-year 26 --access-tier "Archive" --make-backups-immutable true + text: az sql db ltr-policy set -g mygroup -s myserver -n mydb --weekly-retention "P1W" --monthly-retention "P6M" --yearly-retention "P1Y" --week-of-year 26 --make-backups-immutable true """ helps['sql db ltr-policy show'] = """ diff --git a/src/azure-cli/azure/cli/command_modules/sql/_params.py b/src/azure-cli/azure/cli/command_modules/sql/_params.py index 66073ec2439..b85bf801565 100644 --- a/src/azure-cli/azure/cli/command_modules/sql/_params.py +++ b/src/azure-cli/azure/cli/command_modules/sql/_params.py @@ -1307,8 +1307,7 @@ def _configure_security_policy_storage_params(arg_ctx): 'monthly_retention', 'yearly_retention', 'week_of_year', - 'make_backups_immutable', - 'backup_storage_access_tier']) + 'make_backups_immutable']) c.argument('weekly_retention', help='Retention for the weekly backup. ' @@ -1332,12 +1331,6 @@ def _configure_security_policy_storage_params(arg_ctx): help='Whether to make the LTR backups immutable.', arg_type=get_three_state_flag()) - c.argument('backup_storage_access_tier', - options_list=['--access-tier', '--backup-storage-access-tier'], - arg_type=get_enum_type(["Hot", "Archive"]), - help='The access tier of a LTR backup.' - 'Possible values = [Hot, Archive]') - with self.argument_context('sql db ltr-backup') as c: c.argument('location_name', required=True, diff --git a/src/azure-cli/azure/cli/command_modules/sql/custom.py b/src/azure-cli/azure/cli/command_modules/sql/custom.py index af277f0e2c7..067ec3ade10 100644 --- a/src/azure-cli/azure/cli/command_modules/sql/custom.py +++ b/src/azure-cli/azure/cli/command_modules/sql/custom.py @@ -96,9 +96,6 @@ logger = get_logger(__name__) -BACKUP_STORAGE_ACCESS_TIERS = ["hot", - "archive"] - ############################################### # Common funcs # ############################################### @@ -3080,7 +3077,6 @@ def update_long_term_retention( yearly_retention=None, week_of_year=None, make_backups_immutable=None, - backup_storage_access_tier=None, **kwargs): ''' Updates long term retention for managed database @@ -3098,10 +3094,6 @@ def update_long_term_retention( if not confirmation: return - if backup_storage_access_tier and backup_storage_access_tier.lower() not in BACKUP_STORAGE_ACCESS_TIERS: - raise CLIError('Please specify a valid backup storage access tier type for backup storage access tier.' - 'See \'--help\' for more details.') - kwargs['weekly_retention'] = weekly_retention kwargs['monthly_retention'] = monthly_retention @@ -3112,8 +3104,6 @@ def update_long_term_retention( kwargs['make_backups_immutable'] = make_backups_immutable - kwargs['backup_storage_access_tier'] = backup_storage_access_tier - policy = client.begin_create_or_update( database_name=database_name, server_name=server_name, diff --git a/src/azure-cli/azure/cli/command_modules/sql/tests/latest/test_sql_commands.py b/src/azure-cli/azure/cli/command_modules/sql/tests/latest/test_sql_commands.py index 89ec1f5474f..f84735278a7 100644 --- a/src/azure-cli/azure/cli/command_modules/sql/tests/latest/test_sql_commands.py +++ b/src/azure-cli/azure/cli/command_modules/sql/tests/latest/test_sql_commands.py @@ -1277,7 +1277,6 @@ def test_sql_db_long_term_retention( 'yearly_retention': 'P2M', 'week_of_year': 12, 'make_backups_immutable': 'False', - 'backup_storage_access_tier': 'Archive', 'encryption_protector' : 'https://test123343strehan.vault.azure.net/keys/testk1/604b0e26e2a24eeaab30b80c8d7bb1c1', 'keys' : '"https://test123343strehan.vault.azure.net/keys/k2/66f51a6e70f04067af8eaf77805e88b1" "https://test123343strehan.vault.azure.net/keys/testk1/604b0e26e2a24eeaab30b80c8d7bb1c1" "https://test123343strehan.vault.azure.net/keys/testk1/96151496df864e32aa62a3c1857b2931"', 'umi' : '/subscriptions/e1775f9f-a286-474d-b6f0-29c42ac74554/resourcegroups/ArmTemplate/providers/Microsoft.ManagedIdentity/userAssignedIdentities/shobhittest' @@ -1289,14 +1288,12 @@ def test_sql_db_long_term_retention( ' --weekly-retention {weekly_retention} --monthly-retention {monthly_retention}' ' --yearly-retention {yearly_retention} --week-of-year {week_of_year}' ' --make-backups-immutable {make_backups_immutable}', - ' --access-tier {backup_storage_access_tier}', checks=[ self.check('resourceGroup', '{rg}'), self.check('weeklyRetention', '{weekly_retention}'), self.check('monthlyRetention', '{monthly_retention}'), self.check('yearlyRetention', '{yearly_retention}'), - self.check('makeBackupsImmutable', '{make_backups_immutable}'), - self.check('backupStorageAccessTier', '{backup_storage_access_tier}')]) + self.check('makeBackupsImmutable', '{make_backups_immutable}')]) # test get long term retention policy on live database self.cmd( @@ -1306,8 +1303,7 @@ def test_sql_db_long_term_retention( self.check('weeklyRetention', '{weekly_retention}'), self.check('monthlyRetention', '{monthly_retention}'), self.check('yearlyRetention', '{yearly_retention}'), - self.check('makeBackupsImmutable', '{make_backups_immutable}'), - self.check('backupStorageAccessTier', '{backup_storage_access_tier}')]) + self.check('makeBackupsImmutable', '{make_backups_immutable}')]) # test list long term retention backups for location # with resource group