Migrate postgresql operations & tests to use explicit fact imports.

Fizzadar · Fizzadar · commit 7db41b8de949 · 2021-10-03T16:04:31.000+01:00
diff --git a/pyinfra/operations/postgresql.py b/pyinfra/operations/postgresql.py
@@ -14,7 +14,12 @@
 '''
 
 from pyinfra.api import MaskString, operation, StringCommand
-from pyinfra.facts.postgresql import make_execute_psql_command, make_psql_command
+from pyinfra.facts.postgresql import (
+    make_execute_psql_command,
+    make_psql_command,
+    PostgresqlDatabases,
+    PostgresqlRoles,
+)
 
 
 @operation(is_idempotent=False)
@@ -90,9 +95,12 @@ def role(
 
     '''
 
-    roles = host.fact.postgresql_roles(
-        postgresql_user, postgresql_password,
-        postgresql_host, postgresql_port,
+    roles = host.get_fact(
+        PostgresqlRoles,
+        postgresql_user=postgresql_user,
+        postgresql_password=postgresql_password,
+        postgresql_host=postgresql_host,
+        postgresql_port=postgresql_port,
     )
 
     is_present = role in roles
@@ -188,9 +196,12 @@ def database(
 
     '''
 
-    current_databases = host.fact.postgresql_databases(
-        postgresql_user, postgresql_password,
-        postgresql_host, postgresql_port,
+    current_databases = host.get_fact(
+        PostgresqlDatabases,
+        postgresql_user=postgresql_user,
+        postgresql_password=postgresql_password,
+        postgresql_host=postgresql_host,
+        postgresql_port=postgresql_port,
     )
 
     is_present = database in current_databases
diff --git a/tests/operations/postgresql.database/add_database.json b/tests/operations/postgresql.database/add_database.json
@@ -1,7 +1,9 @@
 {
     "args": ["somedb"],
     "facts" :{
-        "postgresql_databases": {}
+        "postgresql.PostgresqlDatabases": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+        }
     },
     "commands": [
         "psql -Ac 'CREATE DATABASE \"somedb\"'"
diff --git a/tests/operations/postgresql.database/add_database_noop.json b/tests/operations/postgresql.database/add_database_noop.json
@@ -1,8 +1,10 @@
 {
     "args": ["somedb"],
     "facts" :{
-        "postgresql_databases": {
-            "somedb": {}
+        "postgresql.PostgresqlDatabases": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+                "somedb": {}
+            }
         }
     },
     "commands": [],
diff --git a/tests/operations/postgresql.database/add_database_owner.json b/tests/operations/postgresql.database/add_database_owner.json
@@ -4,7 +4,9 @@
         "owner": "someowner"
     },
     "facts" :{
-        "postgresql_databases": {}
+        "postgresql.PostgresqlDatabases": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+        }
     },
     "commands": [
         "psql -Ac 'CREATE DATABASE \"somedb\" OWNER \"someowner\"'"
diff --git a/tests/operations/postgresql.database/remove_database.json b/tests/operations/postgresql.database/remove_database.json
@@ -4,8 +4,10 @@
         "present": false
     },
     "facts" :{
-        "postgresql_databases": {
-            "somedb": {}
+        "postgresql.PostgresqlDatabases": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+                "somedb": {}
+            }
         }
     },
     "commands": [
diff --git a/tests/operations/postgresql.database/remove_database_noop.json b/tests/operations/postgresql.database/remove_database_noop.json
@@ -4,7 +4,9 @@
         "present": false
     },
     "facts" :{
-        "postgresql_databases": {}
+        "postgresql.PostgresqlDatabases": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+        }
     },
     "commands": [],
     "noop_description": "postgresql database somedb does not exist"
diff --git a/tests/operations/postgresql.role/role_add_noop.json b/tests/operations/postgresql.role/role_add_noop.json
@@ -1,8 +1,10 @@
 {
     "args": ["testuser"],
     "facts": {
-        "postgresql_roles": {
-            "testuser": {}
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+                "testuser": {}
+            }
         }
     },
     "commands": [],
diff --git a/tests/operations/postgresql.role/role_remove_noop.json b/tests/operations/postgresql.role/role_remove_noop.json
@@ -4,7 +4,9 @@
         "present": false
     },
     "facts": {
-        "postgresql_roles": {}
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+        }
     },
     "commands": [],
     "noop_description": "postgresql role testuser does not exist"
diff --git a/tests/operations/postgresql.role/user_add.json b/tests/operations/postgresql.role/user_add.json
@@ -5,7 +5,9 @@
         "password": "abc"
     },
     "facts": {
-        "postgresql_roles": {}
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
+        }
     },
     "commands": [
         [
diff --git a/tests/operations/postgresql.role/user_add_no_login.json b/tests/operations/postgresql.role/user_add_no_login.json
@@ -4,7 +4,8 @@
         "login": false
     },
     "facts": {
-        "postgresql_roles": {
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
         }
     },
     "commands": [
diff --git a/tests/operations/postgresql.role/user_add_privileges.json b/tests/operations/postgresql.role/user_add_privileges.json
@@ -7,7 +7,8 @@
         "replication": true
     },
     "facts": {
-        "postgresql_roles": {
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
         }
     },
     "commands": [
diff --git a/tests/operations/postgresql.role/user_add_replication.json b/tests/operations/postgresql.role/user_add_replication.json
@@ -5,7 +5,8 @@
         "replication": true
     },
     "facts": {
-        "postgresql_roles": {
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
         }
     },
     "commands": [
diff --git a/tests/operations/postgresql.role/user_add_super.json b/tests/operations/postgresql.role/user_add_super.json
@@ -4,7 +4,8 @@
         "superuser": true
     },
     "facts": {
-        "postgresql_roles": {
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {}
         }
     },
     "commands": [
diff --git a/tests/operations/postgresql.role/user_remove.json b/tests/operations/postgresql.role/user_remove.json
@@ -4,8 +4,10 @@
         "present": false
     },
     "facts": {
-        "postgresql_roles": {
-            "testuser": {}
+        "postgresql.PostgresqlRoles": {
+            "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {
+                "testuser": {}
+            }
         }
     },
     "commands": ["psql -Ac 'DROP ROLE \"testuser\"'"],

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"args": ["somedb"],`
`3`	`3`	`"facts" :{`
`4`		`- "postgresql_databases": {`
`5`		`- "somedb": {}`
	`4`	`+ "postgresql.PostgresqlDatabases": {`
	`5`	`+ "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {`
	`6`	`+ "somedb": {}`
	`7`	`+ }`
`6`	`8`	`}`
`7`	`9`	`},`
`8`	`10`	`"commands": [],`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"args": ["testuser"],`
`3`	`3`	`"facts": {`
`4`		`- "postgresql_roles": {`
`5`		`- "testuser": {}`
	`4`	`+ "postgresql.PostgresqlRoles": {`
	`5`	`+ "postgresql_user=None, postgresql_password=None, postgresql_host=None, postgresql_port=None": {`
	`6`	`+ "testuser": {}`
	`7`	`+ }`
`6`	`8`	`}`
`7`	`9`	`},`
`8`	`10`	`"commands": [],`