Migrate mysql operations & tests to use explicit fact imports.

Fizzadar · Fizzadar · commit ad0ecfcbe2d6 · 2021-09-25T13:47:52.000+01:00
diff --git a/pyinfra/operations/mysql.py b/pyinfra/operations/mysql.py
@@ -16,7 +16,13 @@
 import six
 
 from pyinfra.api import MaskString, operation, OperationError, StringCommand
-from pyinfra.facts.mysql import make_execute_mysql_command, make_mysql_command
+from pyinfra.facts.mysql import (
+    make_execute_mysql_command,
+    make_mysql_command,
+    MysqlDatabases,
+    MysqlUserGrants,
+    MysqlUsers,
+)
 
 
 @operation(is_idempotent=False)
@@ -137,8 +143,12 @@ def user(
         if require_subject:
             raise OperationError('Cannot set `require_subject` if `require` is not "X509"')
 
-    current_users = host.fact.mysql_users(
-        mysql_user, mysql_password, mysql_host, mysql_port,
+    current_users = host.get_fact(
+        MysqlUsers,
+        mysql_user=mysql_user,
+        mysql_password=mysql_password,
+        mysql_host=mysql_host,
+        mysql_port=mysql_port,
     )
 
     user_host = '{0}@{1}'.format(user, user_hostname)
@@ -325,9 +335,12 @@ def database(
         )
     '''
 
-    current_databases = host.fact.mysql_databases(
-        mysql_user, mysql_password,
-        mysql_host, mysql_port,
+    current_databases = host.get_fact(
+        MysqlDatabases,
+        mysql_user=mysql_user,
+        mysql_password=mysql_password,
+        mysql_host=mysql_host,
+        mysql_port=mysql_port,
     )
 
     is_present = database in current_databases
@@ -439,10 +452,14 @@ def privileges(
             ).format(database, table))
 
     database_table = '{0}.{1}'.format(database, table)
-    user_grants = host.fact.mysql_user_grants(
-        user, user_hostname,
-        mysql_user, mysql_password,
-        mysql_host, mysql_port,
+    user_grants = host.get_fact(
+        MysqlUserGrants,
+        user=user,
+        user_hostname=user_hostname,
+        mysql_user=mysql_user,
+        mysql_password=mysql_password,
+        mysql_host=mysql_host,
+        mysql_port=mysql_port,
     )
 
     existing_privileges = []
diff --git a/tests/operations/mysql.database/add.json b/tests/operations/mysql.database/add.json
@@ -5,7 +5,9 @@
         "charset": "UTF-8"
     },
     "facts": {
-        "mysql_databases": []
+        "mysql.MysqlDatabases": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE DATABASE somedb COLLATE utf8_bin CHARSET UTF-8'"
diff --git a/tests/operations/mysql.database/add_noop.json b/tests/operations/mysql.database/add_noop.json
@@ -1,8 +1,10 @@
 {
     "args": ["somedb"],
     "facts": {
-        "mysql_databases": {
-            "somedb": {}
+        "mysql.MysqlDatabases": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "somedb": {}
+            }
         }
     },
     "commands": [],
diff --git a/tests/operations/mysql.database/add_privileges.json b/tests/operations/mysql.database/add_privileges.json
@@ -5,9 +5,11 @@
         "user_privileges": "ALL"
     },
     "facts": {
-        "mysql_databases": [],
-        "mysql_user_grants": {
-            "someuser": {
+        "mysql.MysqlDatabases": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        },
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
                 "localhost": {}
             }
         }
diff --git a/tests/operations/mysql.database/delete.json b/tests/operations/mysql.database/delete.json
@@ -4,9 +4,11 @@
         "present": false
     },
     "facts": {
-        "mysql_databases": [
-            "somedb"
-        ]
+        "mysql.MysqlDatabases": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "somedb": {}
+            }
+        }
     },
     "commands": [
         "mysql -Be 'DROP DATABASE somedb'"
diff --git a/tests/operations/mysql.database/delete_noop.json b/tests/operations/mysql.database/delete_noop.json
@@ -4,7 +4,9 @@
         "present": false
     },
     "facts": {
-        "mysql_databases": {}
+        "mysql.MysqlDatabases": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [],
     "noop_description": "mysql database somedb does not exist"
diff --git a/tests/operations/mysql.privileges/add.json b/tests/operations/mysql.privileges/add.json
@@ -1,12 +1,10 @@
 {
     "args": ["someuser", ["SELECT", "INSERT", "DELETE"]],
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": ["DELETE"]
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": ["DELETE"]
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/add_database.json b/tests/operations/mysql.privileges/add_database.json
@@ -4,12 +4,10 @@
         "database": "mydb"
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": []
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": []
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/add_existing.json b/tests/operations/mysql.privileges/add_existing.json
@@ -1,12 +1,10 @@
 {
     "args": ["someuser", ["SELECT", "INSERT"]],
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": ["SELECT", "INSERT"]
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": ["SELECT", "INSERT"]
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/add_table.json b/tests/operations/mysql.privileges/add_table.json
@@ -5,12 +5,10 @@
         "table": "mytable"
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": []
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": []
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/add_table_invalid.json b/tests/operations/mysql.privileges/add_table_invalid.json
@@ -4,12 +4,10 @@
         "table": "mytable"
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": []
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": []
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/add_with_grant_option.json b/tests/operations/mysql.privileges/add_with_grant_option.json
@@ -4,13 +4,10 @@
         "with_grant_option": true
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": [],
-                        "with_grant_option": false
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": []
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/delete.json b/tests/operations/mysql.privileges/delete.json
@@ -4,12 +4,10 @@
         "present": false
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": ["SELECT", "INSERT"]
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": ["SELECT", "INSERT"]
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/delete_with_grant_option.json b/tests/operations/mysql.privileges/delete_with_grant_option.json
@@ -5,12 +5,10 @@
         "with_grant_option": false
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": ["SELECT", "GRANT OPTION"]
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": ["SELECT", "GRANT OPTION"]
                 }
             }
         }
diff --git a/tests/operations/mysql.privileges/remove_noop.json b/tests/operations/mysql.privileges/remove_noop.json
@@ -4,12 +4,10 @@
         "present": false
     },
     "facts": {
-        "mysql_user_grants": {
-            "someuser": {
-                "localhost": {
-                    "*.*": {
-                        "privileges": []
-                    }
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "*.*": {
+                    "privileges": []
                 }
             }
         }
diff --git a/tests/operations/mysql.user/add.json b/tests/operations/mysql.user/add.json
@@ -4,7 +4,9 @@
         "user_hostname": "localwhat"
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\"'"
diff --git a/tests/operations/mysql.user/add_existing.json b/tests/operations/mysql.user/add_existing.json
diff --git a/tests/operations/mysql.user/add_noop.json b/tests/operations/mysql.user/add_noop.json
@@ -1,8 +1,10 @@
 {
     "args": ["someuser"],
     "facts": {
-        "mysql_users": {
-            "someuser@localhost": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {
+                "someuser@localhost": {}
+            }
         }
     },
     "commands": [],
diff --git a/tests/operations/mysql.user/add_password.json b/tests/operations/mysql.user/add_password.json
@@ -5,7 +5,9 @@
         "password": "mypass"
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         [
diff --git a/tests/operations/mysql.user/add_privileges.json b/tests/operations/mysql.user/add_privileges.json
@@ -5,11 +5,11 @@
         "privileges": ["SELECT"]
     },
     "facts": {
-        "mysql_users": {},
-        "mysql_user_grants": {
-            "someuser": {
-                "localwhat": {}
-            }
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        },
+        "mysql.MysqlUserGrants": {
+            "user=someuser, user_hostname=localwhat, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
         }
     },
     "commands": [
diff --git a/tests/operations/mysql.user/add_resources.json b/tests/operations/mysql.user/add_resources.json
@@ -8,7 +8,9 @@
         "max_connections_per_hour": 1
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" WITH MAX_USER_CONNECTIONS 500 MAX_QUERIES_PER_HOUR 50 MAX_UPDATES_PER_HOUR 10 MAX_CONNECTIONS_PER_HOUR 1'"
diff --git a/tests/operations/mysql.user/add_ssl.json b/tests/operations/mysql.user/add_ssl.json
@@ -4,7 +4,9 @@
         "require": "SSL"
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE USER \"someuser\"@\"localhost\" REQUIRE SSL'"
diff --git a/tests/operations/mysql.user/add_x509.json b/tests/operations/mysql.user/add_x509.json
@@ -5,7 +5,9 @@
         "require": "X509"
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" REQUIRE X509'"
diff --git a/tests/operations/mysql.user/add_x509_specified.json b/tests/operations/mysql.user/add_x509_specified.json
@@ -8,7 +8,9 @@
         "require_subject": "a-subject"
     },
     "facts": {
-        "mysql_users": {}
+        "mysql.MysqlUsers": {
+            "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {}
+        }
     },
     "commands": [
         "mysql -Be 'CREATE USER \"someuser\"@\"localwhat\" REQUIRE CIPHER \"a-cipher\" ISSUER \"a-issuer\" SUBJECT \"a-subject\"'"
diff --git a/tests/operations/mysql.user/delete.json b/tests/operations/mysql.user/delete.json
diff --git a/tests/operations/mysql.user/remove_noop.json b/tests/operations/mysql.user/remove_noop.json
diff --git a/tests/operations/mysql.user/update_resources.json b/tests/operations/mysql.user/update_resources.json
diff --git a/tests/operations/mysql.user/update_resources_partial.json b/tests/operations/mysql.user/update_resources_partial.json
diff --git a/tests/operations/mysql.user/update_ssl.json b/tests/operations/mysql.user/update_ssl.json
diff --git a/tests/operations/mysql.user/update_x509.json b/tests/operations/mysql.user/update_x509.json
diff --git a/tests/operations/mysql.user/update_x509_specified.json b/tests/operations/mysql.user/update_x509_specified.json
diff --git a/tests/operations/mysql.user/update_x509_specified_partial.json b/tests/operations/mysql.user/update_x509_specified_partial.json

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"args": ["somedb"],`
`3`	`3`	`"facts": {`
`4`		`- "mysql_databases": {`
`5`		`- "somedb": {}`
	`4`	`+ "mysql.MysqlDatabases": {`
	`5`	`+ "mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {`
	`6`	`+ "somedb": {}`
	`7`	`+ }`
`6`	`8`	`}`
`7`	`9`	`},`
`8`	`10`	`"commands": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"args": ["someuser", ["SELECT", "INSERT", "DELETE"]],`
`3`	`3`	`"facts": {`
`4`		`- "mysql_user_grants": {`
`5`		`- "someuser": {`
`6`		`- "localhost": {`
`7`		`- ".": {`
`8`		`- "privileges": ["DELETE"]`
`9`		`- }`
	`4`	`+ "mysql.MysqlUserGrants": {`
	`5`	`+ "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {`
	`6`	`+ ".": {`
	`7`	`+ "privileges": ["DELETE"]`
`10`	`8`	`}`
`11`	`9`	`}`
`12`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,10 @@`
`4`	`4`	`"database": "mydb"`
`5`	`5`	`},`
`6`	`6`	`"facts": {`
`7`		`- "mysql_user_grants": {`
`8`		`- "someuser": {`
`9`		`- "localhost": {`
`10`		`- ".": {`
`11`		`- "privileges": []`
`12`		`- }`
	`7`	`+ "mysql.MysqlUserGrants": {`
	`8`	`+ "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {`
	`9`	`+ ".": {`
	`10`	`+ "privileges": []`
`13`	`11`	`}`
`14`	`12`	`}`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,10 @@`
`5`	`5`	`"table": "mytable"`
`6`	`6`	`},`
`7`	`7`	`"facts": {`
`8`		`- "mysql_user_grants": {`
`9`		`- "someuser": {`
`10`		`- "localhost": {`
`11`		`- ".": {`
`12`		`- "privileges": []`
`13`		`- }`
	`8`	`+ "mysql.MysqlUserGrants": {`
	`9`	`+ "user=someuser, user_hostname=localhost, mysql_user=None, mysql_password=None, mysql_host=None, mysql_port=None": {`
	`10`	`+ ".": {`
	`11`	`+ "privileges": []`
`14`	`12`	`}`
`15`	`13`	`}`
`16`	`14`	`}`