Merge branch 'dev' of https://github.com/Azure/azure-cli into change-default-values-for-mysql

Author: linyudoa

src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py

@@ -86,6 +86,8 @@ def firewall_rule_create_func(cmd, client, resource_group_name, server_name, fir
         end_ip_address = start_ip_address
     elif start_ip_address is None and end_ip_address is not None:
         start_ip_address = end_ip_address
+    elif start_ip_address is None and end_ip_address is None:
+        raise CLIError("Incorrect Usage : Need to pass in value for either \'--start-ip-address\' or \'--end-ip-address\'.")
 
     if firewall_rule_name is None:
         now = datetime.now()

src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py

@@ -481,23 +481,29 @@ def flexible_server_postgresql_get(cmd, resource_group_name, server_name):
 
 def flexible_parameter_update(client, server_name, configuration_name, resource_group_name, source=None, value=None):
     validate_resource_group(resource_group_name)
-    if source is None and value is None:
+    parameter_value = value
+    parameter_source = source
+    try:
+        # validate configuration name
+        parameter = client.get(resource_group_name, server_name, configuration_name)
+
         # update the command with system default
-        try:
-            parameter = client.get(resource_group_name, server_name, configuration_name)
-            value = parameter.default_value  # reset value to default
+        if parameter_value is None and parameter_source is None:
+            parameter_value = parameter.default_value  # reset value to default
 
-            # this should be 'system-default' but there is currently a bug in PG, so keeping as what it is for now
+            # this should be 'system-default' but there is currently a bug in PG
             # this will reset source to be 'system-default' anyway
-            source = parameter.source
-        except HttpResponseError as e:
+            parameter_source = "user-override"
+        elif parameter_source is None:
+            parameter_source = "user-override"
+    except HttpResponseError as e:
+        if parameter_value is None and parameter_source is None:
             raise CLIError('Unable to get default parameter value: {}.'.format(str(e)))
-    elif source is None:
-        source = "user-override"
+        raise CLIError(str(e))
 
     parameters = postgresql_flexibleservers.models.Configuration(
-        value=value,
-        source=source
+        value=parameter_value,
+        source=parameter_source
     )
 
     return client.begin_update(resource_group_name, server_name, configuration_name, parameters)

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_logs_mgmt.yaml

@@ -841,7 +841,8 @@ def validate_public_access_server(cmd, client, resource_group_name, server_name)
 
     server = server_operations_client.get(resource_group_name, server_name)
     if server.network.public_network_access == 'Disabled':
-        raise ValidationError("Firewall rule operations cannot be requested for a private access enabled server.")
+        raise ValidationError("Firewall rule operations cannot be requested for "
+                              "a server that doesn't have public access enabled.")
 
 
 def _validate_identity(cmd, namespace, identity):