updating rockd migration

Author: amyfromandi

py-modules/cli/macrostrat/cli/subsystems/rockd/migrations/0010-rockd-tms-defs.sql

@@ -1 +1 @@
-../../../../../../submodules/postgis-tile-utils/sql/01-tms-defs.sql
+../../../../../../../submodules/postgis-tile-utils/sql/01-tms-defs.sql

py-modules/cli/macrostrat/cli/subsystems/rockd/migrations/0011-rockd-tile-utils.sql

@@ -1 +1 @@
-../../../../../../submodules/postgis-tile-utils/sql/02-tile-utils.sql
+../../../../../../../submodules/postgis-tile-utils/sql/02-tile-utils.sql

py-modules/cli/macrostrat/cli/subsystems/rockd/migrations/0012-user-privileges.sql

@@ -20,6 +20,9 @@ $$;
 ALTER DATABASE rockd OWNER TO rockd;
 ALTER SCHEMA public OWNER TO rockd;
 ALTER SCHEMA modules OWNER TO rockd;
+ALTER SCHEMA topology OWNER TO rockd;
+ALTER SCHEMA tile_utils OWNER TO rockd;
+
 
 --REASSIGN OWNED BY "macrostrat-admin" TO rockd;
 GRANT CREATE ON DATABASE rockd TO rockd;
@@ -30,18 +33,30 @@ GRANT SELECT ON ALL TABLES IN SCHEMA public TO "rockd-reader";
 ALTER DEFAULT PRIVILEGES IN SCHEMA public
 GRANT SELECT ON TABLES TO "rockd-reader";
 
+GRANT USAGE ON SCHEMA tile_utils TO "rockd-reader";
+GRANT SELECT ON ALL TABLES IN SCHEMA tile_utils TO "rockd-reader";
+ALTER DEFAULT PRIVILEGES IN SCHEMA tile_utils
+GRANT SELECT ON TABLES TO "rockd-reader";
+
 --granting all permissions to the rockd user.
 --TODO determine if we need to revoke macrostrat-admin access. They have read/write access to the rockd db too.
 ALTER DEFAULT PRIVILEGES IN SCHEMA public
 GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO rockd;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
+ALTER DEFAULT PRIVILEGES IN SCHEMA modules
+GRANT USAGE, SELECT, UPDATE ON SEQUENCES TO rockd;
+ALTER DEFAULT PRIVILEGES IN SCHEMA topology
+GRANT USAGE, SELECT, UPDATE ON SEQUENCES TO rockd;
+ALTER DEFAULT PRIVILEGES IN SCHEMA tile_utils
 GRANT USAGE, SELECT, UPDATE ON SEQUENCES TO rockd;
-
 --if we need to update permissions for all tables run query below
 GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO rockd;
 GRANT USAGE, SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA public TO rockd;
 GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA modules TO rockd;
 GRANT USAGE, SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA modules TO rockd;
+GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA topology TO rockd;
+GRANT USAGE, SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA topology TO rockd;
+GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA tile_utils TO rockd;
+GRANT USAGE, SELECT, UPDATE ON ALL SEQUENCES IN SCHEMA tile_utils TO rockd;
 
 
 --permission denied for schema macrostrat

py-modules/cli/macrostrat/cli/subsystems/storage.py

@@ -77,8 +77,8 @@ def _s3_users():
 def s3_bucket_migration(
     dry_run: bool = Option(False, "--dry-run", "-n", help="Do everything except write"),
     show_cmd: bool = Option(False, help="Print the rclone command for debugging"),
-    src: str = Option(..., help="Source bucket that contains photos"),
-    dst: str = Option(..., help="Destination bucket to copy photos into"),
+    src: str = Option("rockd-photo-backup", help="Source bucket that contains photos"),
+    dst: str = Option("rockd-photo-prod", help="Destination bucket to copy photos into"),
 ):
     endpoint = settings.get("storage.endpoint")
     b_access = settings.get("storage.rockd_backup_access")