[db-up] Release db up with show-connection-string commands (Azure#539)

* update connection string commands and readme/history

* release

src/db-up/HISTORY.rst

@@ -3,6 +3,10 @@
  Release History
 ===============
 
+0.1.6 (2019-2-26)
++++++++++++++++++
+* `az mysql/postgres show-connection-string` commands to show connection strings without server calls.
+
 0.1.5 (2019-2-1)
 ++++++++++++++++
 * Added Spring JDBC connection string to output.

src/db-up/README.md

@@ -31,6 +31,15 @@ az mysql down \
     --delete-group
 ```
 
+Show the connection strings for a database without any server calls.
+```
+az mysql show-connection-string \
+    -s serverName \
+    -d databaseName \
+    -u adminUsername \
+    -p adminPassword
+```
+
 #### PostgreSQL
 Ensures an Azure Database for PostgreSQL server instance is up and running and configured for immediate use with a single command.
 
@@ -54,3 +63,12 @@ Clean up the cache and delete the server. Use the `--delete-group` parameter to
 az postgres down \
     --delete-group
 ```
+
+Show the connection strings for a database without any server calls.
+```
+az postgres show-connection-string \
+    -s serverName \
+    -d databaseName \
+    -u adminUsername \
+    -p adminPassword
+```

src/db-up/azext_db_up/_params.py

@@ -14,8 +14,7 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
         with self.argument_context('{} up'.format(scope)) as c:
             c.argument('sku_name', options_list=['--sku-name'], default='GP_Gen5_4',
                        help='The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.')
-            c.argument('backup_retention', type=int,
-                       help='The number of days a backup is retained.')
+            c.argument('backup_retention', type=int, help='The number of days a backup is retained.')
             c.argument('geo_redundant_backup', arg_type=get_enum_type(GeoRedundantBackup),
                        default=GeoRedundantBackup.disabled.value, help='Enable Geo-redundant or not for server backup.')
             c.argument('storage_mb', options_list=['--storage-size'], type=int,
@@ -35,10 +34,12 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
             c.argument('tags', tags_type)
 
         with self.argument_context('{} show-connection-string'.format(scope)) as c:
-            c.argument('database', help='The database to connect to.')
-            c.argument('host', help='The host name or IP address of the MySQL server.')
-            c.argument('password', help='The login password of the user.')
-            c.argument('user', help='The login username.')
+            c.argument('server_name', options_list=['--server-name', '-s'], help='Name of the server.')
+            c.argument('database_name', options_list=['--database-name', '-d'], help='The name of a database.')
+            c.argument('administrator_login', options_list=['--admin-user', '-u'],
+                       help='The login username of the administrator.')
+            c.argument('administrator_login_password', options_list=['--admin-password', '-p'],
+                       help='The login password of the administrator.')
 
         with self.argument_context('{} down'.format(scope)) as c:
             c.ignore('server_name')

src/db-up/azext_db_up/custom.py

@@ -70,7 +70,7 @@ def mysql_up(cmd, client, resource_group_name=None, server_name=None, location=N
         _run_mysql_commands(host, user, administrator_login_password, database_name)
 
     return {
-        'connectionStrings': create_mysql_connection_string(
+        'connectionStrings': _create_mysql_connection_string(
             host, user, administrator_login_password, database_name),
         'host': host,
         'username': user,
@@ -128,7 +128,7 @@ def postgres_up(cmd, client, resource_group_name=None, server_name=None, locatio
         _run_postgresql_commands(host, user, administrator_login_password, database_name)
 
     return {
-        'connectionStrings': create_postgresql_connection_string(
+        'connectionStrings': _create_postgresql_connection_string(
             host, user, administrator_login_password, database_name),
         'host': host,
         'username': user,
@@ -149,7 +149,23 @@ def server_down(cmd, client, resource_group_name=None, server_name=None, delete_
     return client.delete(resource_group_name, server_name)
 
 
-def create_mysql_connection_string(host, user, password, database):
+def create_mysql_connection_string(
+        server_name='{server}', database_name='{database}', administrator_login='{login}',
+        administrator_login_password='{password}'):
+    user = '{}@{}'.format(administrator_login, server_name)
+    host = '{}.mysql.database.azure.com'.format(server_name)
+    return _create_mysql_connection_string(host, user, administrator_login_password, database_name)
+
+
+def create_postgresql_connection_string(
+        server_name='{server}', database_name='{database}', administrator_login='{login}',
+        administrator_login_password='{password}'):
+    user = '{}@{}'.format(administrator_login, server_name)
+    host = '{}.postgres.database.azure.com'.format(server_name)
+    return _create_postgresql_connection_string(host, user, administrator_login_password, database_name)
+
+
+def _create_mysql_connection_string(host, user, password, database):
     result = {
         'mysql_cmd': "mysql {database} --host {host} --user {user} --password={password}",
         'ado.net': "Server={host}; Port=3306; Database={database}; Uid={user}; Pwd={password};",
@@ -170,7 +186,7 @@ def create_mysql_connection_string(host, user, password, database):
     connection_kwargs = {
         'host': host,
         'user': user,
-        'password': password if password is not None else '{your_password}',
+        'password': password if password is not None else '{password}',
         'database': database
     }
 
@@ -179,7 +195,7 @@ def create_mysql_connection_string(host, user, password, database):
     return result
 
 
-def create_postgresql_connection_string(host, user, password, database):
+def _create_postgresql_connection_string(host, user, password, database):
     result = {
         'psql_cmd': "psql --host={host} --port=5432 --username={user} --dbname={database}",
         'ado.net': "Server={host};Database={database};Port=5432;User Id={user};Password={password};",
@@ -199,7 +215,7 @@ def create_postgresql_connection_string(host, user, password, database):
     connection_kwargs = {
         'host': host,
         'user': user,
-        'password': password if password is not None else '{your_password}',
+        'password': password if password is not None else '{password}',
         'database': database
     }
 

src/db-up/setup.py

@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "0.1.5"
+VERSION = "0.1.6"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',