[Release] Update version to 1.8.0 and nit fixes

Author: priyansh17

src/dataprotection/HISTORY.rst

@@ -2,9 +2,9 @@
 
 Release History
 ===============
-1.7.2
+1.8.0
 +++++
-* `az dataprotection backup-instance update`: New parameters: `--backup-configuration` to update AKS datasource parameters.
+* `az dataprotection backup-instance update`: New parameter: `--backup-configuration` to update AKS datasource parameters.
 * Fix in `helpers.py` to correctly prepare/normalize AKS backup-configuration payloads passed via the CLI.
 
 1.7.1

src/dataprotection/azext_dataprotection/manual/_params.py

@@ -135,7 +135,7 @@ def load_arguments(self, _):
                    help="Enter the container list to modify a vaulted blob backup. The output for "
                    "'az dataprotection backup-instance initialize-backupconfig' needs to be provided as input")
         c.argument('backup_configuration', type=validate_file_or_dict, 
-                    help="Enter the Backup configuration to modify AKS backup datasource parameters. "
+                    help="Enter the backup configuration to modify AKS backup datasource parameters. "
                     "The output for 'az dataprotection backup-instance initialize-backupconfig' needs to be provided as input.")
         c.argument('use_system_assigned_identity', options_list=['--system-assigned', '--use-system-identity', '--use-system-assigned-identity'], arg_type=get_three_state_flag(), help="Use system assigned identity")
         c.argument('user_assigned_identity_arm_url', options_list=['--user-assigned', '--user-assigned-identity-arm-url', '--uami'], type=str, help="ARM ID of the User Assigned Managed Identity")

src/dataprotection/azext_dataprotection/manual/custom.py

@@ -14,6 +14,7 @@
 # pylint: disable=no-else-continue
 # pylint: disable=no-else-raise
 import time
+import json
 from azure.cli.core.azclierror import (
     RequiredArgumentMissingError,
     InvalidArgumentValueError,
@@ -279,20 +280,21 @@ def dataprotection_backup_instance_update(cmd, resource_group_name, vault_name,
             elif backup_configuration is not None:
                 # Allow passing JSON string or already-parsed object
                 if isinstance(backup_configuration, str):
-                    import json
                     try:
                         backup_configuration = json.loads(backup_configuration)
+                    except json.JSONDecodeError:
+                        raise InvalidArgumentValueError("Provided --backup-configuration is not valid JSON.")
                     except Exception:
-                        raise InvalidArgumentValueError("Provided --backup-configuration is not valid JSON")
+                        raise InvalidArgumentValueError("Provided --backup-configuration is not valid.")
                 backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [backup_configuration]
         elif datasource_type == "Microsoft.Storage/storageAccounts/blobServices":
             if backup_configuration is not None:
                 raise InvalidArgumentValueError('Invalid argument --backup-configuration for given datasource type.')
             elif vaulted_blob_container_list is not None:
-                backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [vaulted_blob_container_list,]
+                backup_instance['properties']['policyInfo']['policyParameters']['backupDatasourceParametersList'] = [vaulted_blob_container_list]
         else:
-            raise InvalidArgumentValueError('Setting backup datasource parameters is not supported for given DataSourceType')
-
+            raise InvalidArgumentValueError("Setting backup datasource parameters is not supported for given DataSourceType.\n "
+                                            "Supported datasource types are Microsoft.ContainerService/managedClusters and Microsoft.Storage/storageAccounts/blobServices.")
 
     backup_instance = helper.convert_backup_instance_show_to_input(backup_instance)
 

src/dataprotection/azext_dataprotection/manual/helpers.py

@@ -1005,7 +1005,7 @@ def convert_backup_instance_show_to_input(backup_instance):
                     'resourceProperties' in datasource_info and
                     isinstance(datasource_info['resourceProperties'], dict)):
                     if datasource_info['resourceProperties'].get('objectType') is None:
-                        # Set resourceProperties to None when objectType is null to avoid schema validation error
+                        # Cleaning up resourceProperties when objectType is null to avoid schema validation error
                         del backup_instance['properties'][datasource_property]['resourceProperties']
     return backup_instance
 

src/dataprotection/azext_dataprotection/tests/latest/test_dataprotection_backup_instance_operations.py

@@ -10,7 +10,6 @@
 from azure.cli.testsdk import ScenarioTest, live_only
 from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 import time
-import copy
 
 
 def reset_softdelete_base_state(test):

src/dataprotection/setup.py

@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '1.7.2'
+VERSION = '1.8.0'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers