Update existing tests for new MaskString

Author: Timmy Welch

tests/facts/mysql.MysqlDatabases/multiple_custom_connection.json

@@ -1,8 +1,8 @@
 {
     "arg": ["myuser", "mypassword", "myhost", "myport"],
     "command": {
-        "raw": "mysql -u\"myuser\" -p\"mypassword\" -hmyhost -Pmyport -Be 'SELECT * FROM information_schema.SCHEMATA'",
-        "masked": "mysql -u\"myuser\" *** -hmyhost -Pmyport -Be 'SELECT * FROM information_schema.SCHEMATA'"
+        "raw": "mysql -u\"myuser\" -pmypassword -hmyhost -Pmyport -Be 'SELECT * FROM information_schema.SCHEMATA'",
+        "masked": "mysql -u\"myuser\" -p'*MASKED*' -hmyhost -Pmyport -Be 'SELECT * FROM information_schema.SCHEMATA'"
     },
     "requires_command": "mysql",
     "output": [

tests/facts/postgresql.PostgresqlRoles/multiple_custom_connection.json

@@ -1,8 +1,8 @@
 {
     "arg": ["myuser", "mypassword", "myhost", "myport"],
     "command": {
-        "raw": "PGPASSWORD=\"mypassword\" psql -U myuser -h myhost -p myport -Ac 'SELECT * FROM pg_catalog.pg_roles'",
-        "masked": "*** psql -U myuser -h myhost -p myport -Ac 'SELECT * FROM pg_catalog.pg_roles'"
+        "raw": "PGPASSWORD=mypassword psql -U myuser -h myhost -p myport -Ac 'SELECT * FROM pg_catalog.pg_roles'",
+        "masked": "PGPASSWORD='*MASKED*' psql -U myuser -h myhost -p myport -Ac 'SELECT * FROM pg_catalog.pg_roles'"
     },
     "requires_command": "psql",
     "output": [

tests/operations/mysql.dump/dump.json

@@ -7,8 +7,8 @@
     },
     "commands": [
         {
-            "raw": "mysqldump somedb -u\"root\" -p\"somepass\" > somefile",
-            "masked": "mysqldump somedb -u\"root\" *** > somefile"
+            "raw": "mysqldump somedb -u\"root\" -psomepass > somefile",
+            "masked": "mysqldump somedb -u\"root\" -p'*MASKED*' > somefile"
         }
     ],
     "idempotent": false

tests/operations/mysql.sql/execute_mysql_kwargs.json

@@ -8,8 +8,8 @@
     },
     "commands": [
         {
-            "raw": "mysql -u\"someuser\" -p\"somepass\" -h127.0.0.1 -P100 -Be 'SELECT 1'",
-            "masked": "mysql -u\"someuser\" *** -h127.0.0.1 -P100 -Be 'SELECT 1'"
+            "raw": "mysql -u\"someuser\" -psomepass -h127.0.0.1 -P100 -Be 'SELECT 1'",
+            "masked": "mysql -u\"someuser\" -p'*MASKED*' -h127.0.0.1 -P100 -Be 'SELECT 1'"
         }
     ],
     "idempotent": false

tests/operations/mysql.user/add_password.json

@@ -12,7 +12,7 @@
     "commands": [
         {
             "raw": "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" IDENTIFIED BY \"mypass\"'",
-            "masked": "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" ***'"
+            "masked": "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" IDENTIFIED BY \"*MASKED*\"'"
         }
     ]
 }

tests/operations/postgresql.dump/dump.json

@@ -9,8 +9,8 @@
     },
     "commands": [
         {
-            "raw": "PGPASSWORD=\"somepass\" pg_dump -d somedb -U root -h localhost -p 3306 > somefile",
-            "masked": "*** pg_dump -d somedb -U root -h localhost -p 3306 > somefile"
+            "raw": "PGPASSWORD=somepass pg_dump -d somedb -U root -h localhost -p 3306 > somefile",
+            "masked": "PGPASSWORD='*MASKED*' pg_dump -d somedb -U root -h localhost -p 3306 > somefile"
         }
     ],
     "idempotent": false

tests/operations/postgresql.load/load.json

@@ -7,8 +7,8 @@
     },
     "commands": [
         {
-            "raw": "PGPASSWORD=\"somepass\" psql -d somedb -U root < somefile",
-            "masked": "*** psql -d somedb -U root < somefile"
+            "raw": "PGPASSWORD=somepass psql -d somedb -U root < somefile",
+            "masked": "PGPASSWORD='*MASKED*' psql -d somedb -U root < somefile"
         }
     ],
     "idempotent": false

tests/operations/postgresql.role/role_update.json

@@ -16,7 +16,7 @@
     "commands": [
         {
             "raw": "psql -Ac 'ALTER ROLE \"testuser\" CONNECTION LIMIT 15 PASSWORD '\"'\"'abc'\"'\"''",
-            "masked":"psql -Ac 'ALTER ROLE \"testuser\" CONNECTION LIMIT 15 ***'"
+            "masked":"psql -Ac 'ALTER ROLE \"testuser\" CONNECTION LIMIT 15 PASSWORD '\"'\"'*MASKED*'\"'\"''"
         }
     ]
 

tests/operations/postgresql.role/user_add.json

@@ -12,7 +12,7 @@
     "commands": [
         {
             "raw": "psql -Ac 'CREATE ROLE \"testuser\" LOGIN CONNECTION LIMIT 15 PASSWORD '\"'\"'abc'\"'\"''",
-            "masked":"psql -Ac 'CREATE ROLE \"testuser\" LOGIN CONNECTION LIMIT 15 ***'"
+            "masked":"psql -Ac 'CREATE ROLE \"testuser\" LOGIN CONNECTION LIMIT 15 PASSWORD '\"'\"'*MASKED*'\"'\"''"
         }
     ]
 }

tests/test_api/test_api_command.py

@@ -36,12 +36,12 @@ def test_normal(self):
     def test_masked(self):
         cmd = StringCommand(MaskString("adsfg"))
         assert cmd.get_raw_value() == "adsfg"
-        assert str(cmd) == "***"
+        assert str(cmd) == "*MASKED*"
 
     def test_mixed_masked(self):
         cmd = StringCommand("some", "stuff", MaskString("mask me"), "other", "stuff")
         assert cmd.get_raw_value() == "some stuff mask me other stuff"
-        assert str(cmd) == "some stuff *** other stuff"
+        assert str(cmd) == "some stuff *MASKED* other stuff"
 
     def test_nested(self):
         nested_cmd = StringCommand("some", "stuff")
@@ -130,7 +130,7 @@ def test_quoted_arg(self):
     def test_masked_arg(self):
         cmd = make_formatted_string_command("echo {0}", MaskString("secret"))
         assert cmd.get_raw_value() == "echo secret"
-        assert str(cmd) == "echo ***"
+        assert str(cmd) == "echo *MASKED*"
 
     def test_path_with_multiple_segments(self):
         cmd = make_formatted_string_command("ls /{0}/{1}/{2}", "home", "user", "docs")