From 987d2f5552c80172986d1f1f944066644889fb71 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam Date: Wed, 3 Mar 2021 16:36:56 -0800 Subject: [PATCH 1/4] add placeholders as directed --- doc/documentation_page.md | 2 +- doc/usage_guide.md | 2 +- mssqlscripter/tests/test_argparser.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/documentation_page.md b/doc/documentation_page.md index 5d93df3..acb476b 100644 --- a/doc/documentation_page.md +++ b/doc/documentation_page.md @@ -79,7 +79,7 @@ You can set environment variables for your connection string through the followi mssql-scripter # set environment variable MSSQL_SCRIPTER_PASSWORD so no password input is required. - export MSSQL_SCRIPTER_PASSWORD='ABC123' + export MSSQL_SCRIPTER_PASSWORD='[PLACEHOLDER]' mssql-scripter -S localhost -d AdventureWorks -U sa ## Generate and run scripts diff --git a/doc/usage_guide.md b/doc/usage_guide.md index c9ad644..e89a9b5 100644 --- a/doc/usage_guide.md +++ b/doc/usage_guide.md @@ -225,5 +225,5 @@ You can set environment variables for your connection string through the followi $ mssql-scripter # set environment variable MSSQL_SCRIPTER_PASSWORD so no password input is required. - $ export MSSQL_SCRIPTER_PASSWORD='ABC123' + $ export MSSQL_SCRIPTER_PASSWORD='[PLACEHOLDER]' $ mssql-scripter -S localhost -d AdventureWorks -U sa diff --git a/mssqlscripter/tests/test_argparser.py b/mssqlscripter/tests/test_argparser.py index 74af7a0..22d8880 100644 --- a/mssqlscripter/tests/test_argparser.py +++ b/mssqlscripter/tests/test_argparser.py @@ -29,20 +29,20 @@ def test_connection_string_builder(self): standard_connection = [u'-S', u'TestServer', u'-d', u'mydatabase', u'-U', 'my_username', u'-P', 'secret'] parameters = parser.parse_arguments(standard_connection) - self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=secret;') + self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') def test_connection_string_with_environment(self): """ Verify parser picks up connection string and password from environment variable. """ - os.environ[parser.MSSQL_SCRIPTER_CONNECTION_STRING] = u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=secret;' + os.environ[parser.MSSQL_SCRIPTER_CONNECTION_STRING] = u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;' parameters = parser.parse_arguments(['--append']) - self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=secret;') + self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') standard_connection = [u'-S', u'TestServer', u'-d', u'mydatabase', u'-U', 'my_username'] os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'secret123ABC' parameters = parser.parse_arguments(standard_connection) - self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=secret123ABC;') + self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') if __name__ == u'__main__': From c38bb4b00f0d922b64728c7bc7296bd6481fc466 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam Date: Wed, 3 Mar 2021 16:46:10 -0800 Subject: [PATCH 2/4] missed a spot for password --- mssqlscripter/tests/test_argparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mssqlscripter/tests/test_argparser.py b/mssqlscripter/tests/test_argparser.py index 22d8880..6c46fca 100644 --- a/mssqlscripter/tests/test_argparser.py +++ b/mssqlscripter/tests/test_argparser.py @@ -40,7 +40,7 @@ def test_connection_string_with_environment(self): self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') standard_connection = [u'-S', u'TestServer', u'-d', u'mydatabase', u'-U', 'my_username'] - os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'secret123ABC' + os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'PLACEHOLDER' parameters = parser.parse_arguments(standard_connection) self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') From 165403fb1d7f3fca32b2eebcff490f2099ea2033 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam Date: Wed, 3 Mar 2021 19:18:16 -0800 Subject: [PATCH 3/4] Trying a placeholder variation --- mssqlscripter/tests/test_argparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mssqlscripter/tests/test_argparser.py b/mssqlscripter/tests/test_argparser.py index 6c46fca..470b3ee 100644 --- a/mssqlscripter/tests/test_argparser.py +++ b/mssqlscripter/tests/test_argparser.py @@ -40,9 +40,9 @@ def test_connection_string_with_environment(self): self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') standard_connection = [u'-S', u'TestServer', u'-d', u'mydatabase', u'-U', 'my_username'] - os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'PLACEHOLDER' + os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'TestPLACEHOLDER' parameters = parser.parse_arguments(standard_connection) - self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') + self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=TestPLACEHOLDER;') if __name__ == u'__main__': From 1c5ff3c842537acefb6a91405a7eb945d3755c07 Mon Sep 17 00:00:00 2001 From: Udeesha Gautam Date: Wed, 3 Mar 2021 19:59:49 -0800 Subject: [PATCH 4/4] reverting the last trial change --- mssqlscripter/tests/test_argparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mssqlscripter/tests/test_argparser.py b/mssqlscripter/tests/test_argparser.py index 470b3ee..6c46fca 100644 --- a/mssqlscripter/tests/test_argparser.py +++ b/mssqlscripter/tests/test_argparser.py @@ -40,9 +40,9 @@ def test_connection_string_with_environment(self): self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') standard_connection = [u'-S', u'TestServer', u'-d', u'mydatabase', u'-U', 'my_username'] - os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'TestPLACEHOLDER' + os.environ[parser.MSSQL_SCRIPTER_PASSWORD] = u'PLACEHOLDER' parameters = parser.parse_arguments(standard_connection) - self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=TestPLACEHOLDER;') + self.assertEqual(parameters.ConnectionString, u'Server=TestServer;Database=mydatabase;User Id=my_username;Password=PLACEHOLDER;') if __name__ == u'__main__':