Cleanup cruft

notes.md

@@ -1,6 +0,0 @@
-- for setting up the database:
-  - create database
-  - create postgres user password? could we do this as a key?
-  - create user secret in application key vault
-  - execute SQL to create user
-- we need an initial image to seed ACR with

script/database_setup.py

@@ -16,7 +16,6 @@ from reset_database import reset_database
 
 
 def database_setup(username, password, dbname, ccpo_users):
-    """docstring for database_setup"""
     print(
         f"Creating Postgres user role for '{username}' and granting all privileges to database '{dbname}'."
     )
@@ -42,10 +41,10 @@ def _create_database_user(username, password, dbname):
 
     engine.execute(
         f"CREATE ROLE {username} WITH LOGIN NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION PASSWORD '{password}';\n"
-        + f"GRANT ALL PRIVILEGES ON DATABASE {dbname} TO {username};\n"
-        + f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO {username}; \n"
-        + f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON SEQUENCES TO {username}; \n"
-        + f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON FUNCTIONS TO {username}; \n"
+        f"GRANT ALL PRIVILEGES ON DATABASE {dbname} TO {username};\n"
+        f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO {username}; \n"
+        f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON SEQUENCES TO {username}; \n"
+        f"ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON FUNCTIONS TO {username}; \n"
     )
 
     trans.commit()

terraform/secrets-tool/commands/database.py

@@ -118,24 +118,24 @@ def provision(
 
     create_database_cmd = (
         f"docker run -e PGHOST='{dbhost}'"
-        +f" -e PGPASSWORD='{root_password}'"
-        +f" -e PGUSER='{root_name}@{dbhost}'"
-        +f" -e PGDATABASE='{dbname}'"
-        +f" -e PGSSLMODE=require"
-        +f" {container}"
-        +f" .venv/bin/python script/create_database.py {dbname}"
+        f" -e PGPASSWORD='{root_password}'"
+        f" -e PGUSER='{root_name}@{dbhost}'"
+        f" -e PGDATABASE='{dbname}'"
+        f" -e PGSSLMODE=require"
+        f" {container}"
+        f" .venv/bin/python script/create_database.py {dbname}"
     )
     _run_cmd(create_database_cmd)
 
     seed_database_cmd = (
         f"docker run -e PGHOST='{dbhost}'"
-        +f" -e PGPASSWORD='{root_password}'"
-        +f" -e PGUSER='{root_name}@{dbhost}'"
-        +f" -e PGDATABASE='{dbname}'"
-        +f" -e PGSSLMODE=require"
-        +f" -v {ccpo_users}:/opt/atat/atst/users.yml"
-        +f" {container}"
-        +f" .venv/bin/python script/database_setup.py {user_username} '{user_password}' users.yml"
+        f" -e PGPASSWORD='{root_password}'"
+        f" -e PGUSER='{root_name}@{dbhost}'"
+        f" -e PGDATABASE='{dbname}'"
+        f" -e PGSSLMODE=require"
+        f" -v {ccpo_users}:/opt/atat/atst/users.yml"
+        f" {container}"
+        f" .venv/bin/python script/database_setup.py {user_username} '{user_password}' users.yml"
     )
     _run_cmd(seed_database_cmd)
 

users.yml

@@ -1,3 +0,0 @@
-- dod_id: "2323232323"
-  first_name: "hi"
-  last_name: "bye"