From 37e743b8f34677b06829eb9f16126375ce516d7e Mon Sep 17 00:00:00 2001 From: "Jason R. Shaver" Date: Fri, 12 Oct 2018 11:05:27 -0700 Subject: [PATCH 1/4] Update _help.py Fixed non-working example with guidance from https://docs.microsoft.com/en-us/azure/mysql/quickstart-create-mysql-server-database-using-azure-cli --- .../azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py index 11cad58bbe3..4555991203d 100644 --- a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py +++ b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py @@ -189,9 +189,9 @@ def add_helps(command_group, server_type): short-summary: Create a {0} database. examples: - name: Create database 'testdb' in the server 'testsvr' with the default parameters. - text: az {1} db create -g testgroup -s testsvr -n testdb + text: az {1} db create -g testgroup -s testsvr -n testdb --admin-user myadmin --admin-password --sku-name GP_Gen4_2 --version 5.7 - name: Create database 'testdb' in server 'testsvr' with a given character set and collation rules. - text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} + text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} --admin-user myadmin --admin-password --sku-name GP_Gen4_2 --version 5.7 """.format(server_type, command_group) helps['{} db delete'.format(command_group)] = """ type: command From 3a61e9cb460ef06f23a4ad1ac07e931917518e9d Mon Sep 17 00:00:00 2001 From: "Jason R. Shaver" Date: Fri, 12 Oct 2018 15:02:19 -0700 Subject: [PATCH 2/4] Update HISTORY.rst --- src/command_modules/azure-cli-rdbms/HISTORY.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/command_modules/azure-cli-rdbms/HISTORY.rst b/src/command_modules/azure-cli-rdbms/HISTORY.rst index f4abdf6d421..2fa789fdc51 100644 --- a/src/command_modules/azure-cli-rdbms/HISTORY.rst +++ b/src/command_modules/azure-cli-rdbms/HISTORY.rst @@ -3,6 +3,10 @@ Release History =============== +0.3.3 ++++++ +* Fixed broken mysql db create example + 0.3.2 +++++ * Add support for MariaDB service From 4d33225f8fe9a19f46eb9916a2cba02c82ba1a9a Mon Sep 17 00:00:00 2001 From: "Jason R. Shaver" Date: Fri, 12 Oct 2018 15:03:07 -0700 Subject: [PATCH 3/4] Update setup.py --- src/command_modules/azure-cli-rdbms/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/command_modules/azure-cli-rdbms/setup.py b/src/command_modules/azure-cli-rdbms/setup.py index 776d63ca960..c5ba4383b2c 100644 --- a/src/command_modules/azure-cli-rdbms/setup.py +++ b/src/command_modules/azure-cli-rdbms/setup.py @@ -12,7 +12,7 @@ logger.warn("Wheel is not available, disabling bdist_wheel hook") cmdclass = {} -VERSION = "0.3.2" +VERSION = "0.3.3" CLASSIFIERS = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', From 5c36526c7b6c795cf4c1413c72107285bc195089 Mon Sep 17 00:00:00 2001 From: Travis Prescott Date: Thu, 25 Oct 2018 08:30:59 -0700 Subject: [PATCH 4/4] Fix placeholder --- .../azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py index 67fdb0cfe06..2059fbc5e1a 100644 --- a/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py +++ b/src/command_modules/azure-cli-rdbms/azure/cli/command_modules/rdbms/_help.py @@ -189,9 +189,9 @@ def add_helps(command_group, server_type): short-summary: Create a {0} database. examples: - name: Create database 'testdb' in the server 'testsvr' with the default parameters. - text: az {1} db create -g testgroup -s testsvr -n testdb --admin-user myadmin --admin-password --sku-name GP_Gen4_2 --version 5.7 + text: az {1} db create -g testgroup -s testsvr -n testdb --admin-user myadmin --admin-password {{server_admin_password}} --sku-name GP_Gen4_2 --version 5.7 - name: Create database 'testdb' in server 'testsvr' with a given character set and collation rules. - text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} --admin-user myadmin --admin-password --sku-name GP_Gen4_2 --version 5.7 + text: az {1} db create -g testgroup -s testsvr -n testdb --charset {{valid_charset}} --collation {{valid_collation}} --admin-user myadmin --admin-password {{server_admin_password}} --sku-name GP_Gen4_2 --version 5.7 """.format(server_type, command_group) helps['{} db delete'.format(command_group)] = """ type: command