Update connectors, facts and operations for new MaskString

Author: Timmy Welch

src/pyinfra/connectors/util.py

@@ -409,11 +409,10 @@ def make_unix_command(
             [
                 "env",
                 StringCommand("SUDO_ASKPASS=", QuoteString(_sudo_askpass_path), _separator=""),
-                MaskString(
-                    "{0}={1}".format(
-                        SUDO_ASKPASS_ENV_VAR,
-                        StringCommand(QuoteString(_sudo_password)).get_raw_value(),
-                    )
+                StringCommand(
+                    SUDO_ASKPASS_ENV_VAR,
+                    StringCommand(QuoteString(MaskString(_sudo_password))).get_raw_value(),
+                    _separator="=",
                 ),
             ],
         )
@@ -440,11 +439,10 @@ def make_unix_command(
             command_bits.extend(
                 [
                     "env",
-                    MaskString(
-                        "{0}={1}".format(
-                            SU_ASKPASS_ENV_VAR,
-                            StringCommand(QuoteString(_su_password)).get_raw_value(),
-                        )
+                    StringCommand(
+                        SU_ASKPASS_ENV_VAR,
+                        StringCommand(QuoteString(MaskString(_su_password))).get_raw_value(),
+                        _separator="=",
                     ),
                     QuoteString(_su_askpass_path),
                     "|",

src/pyinfra/facts/mysql.py

@@ -30,7 +30,7 @@ def make_mysql_command(
 
     if password:
         # Quote the password as it may contain special characters
-        target_bits.append(MaskString('-p"{0}"'.format(password)))
+        target_bits.append(StringCommand("-p", QuoteString(MaskString(password)), _separator=""))
 
     if host:
         target_bits.append("-h{0}".format(host))

src/pyinfra/facts/postgres.py

@@ -16,10 +16,16 @@ def make_psql_command(
     port: str | int | None = None,
     executable="psql",
 ) -> StringCommand:
-    target_bits: list[str] = []
+    target_bits: list[str | StringCommand] = []
 
     if password:
-        target_bits.append(MaskString('PGPASSWORD="{0}"'.format(password)))
+        target_bits.append(
+            StringCommand(
+                "PGPASSWORD",
+                QuoteString(MaskString(password)),
+                _separator="=",
+            )
+        )
 
     target_bits.append(executable)
 

src/pyinfra/operations/mysql.py

@@ -171,9 +171,15 @@ def user(
         return
 
     if present and not is_present:
-        sql_bits = ['CREATE USER "{0}"@"{1}"'.format(user, user_hostname)]
+        sql_bits: list[str | StringCommand] = [
+            'CREATE USER "{0}"@"{1}"'.format(user, user_hostname)
+        ]
         if password:
-            sql_bits.append(MaskString('IDENTIFIED BY "{0}"'.format(password)))
+            sql_bits.append(
+                StringCommand(
+                    "IDENTIFIED BY", StringCommand('"', MaskString(password), '"', _separator="")
+                )
+            )
 
         if require == "SSL":
             sql_bits.append("REQUIRE SSL")

src/pyinfra/operations/postgres.py

@@ -141,7 +141,7 @@ def role(
 
     # If we want the user and they don't exist
     if not is_present:
-        sql_bits = ['CREATE ROLE "{0}"'.format(role)]
+        sql_bits: list[str | StringCommand] = ['CREATE ROLE "{0}"'.format(role)]
 
         for key, value in (
             ("LOGIN", login),
@@ -158,7 +158,11 @@ def role(
             sql_bits.append("CONNECTION LIMIT {0}".format(connection_limit))
 
         if password:
-            sql_bits.append(MaskString("PASSWORD '{0}'".format(password)))
+            sql_bits.append(
+                StringCommand(
+                    "PASSWORD", StringCommand("'", MaskString(password), "'", _separator="")
+                )
+            )
 
         yield make_execute_psql_command(
             StringCommand(*sql_bits),
@@ -196,7 +200,11 @@ def role(
             sql_bits.append("CONNECTION LIMIT {0}".format(connection_limit))
             should_execute = True
         if password:
-            sql_bits.append(MaskString("PASSWORD '{0}'".format(password)))
+            sql_bits.append(
+                StringCommand(
+                    "PASSWORD", StringCommand("'", MaskString(password), "'", _separator="")
+                )
+            )
             should_execute = True
 
         if should_execute: