Merge pull request #131 from UW-Macrostrat/storage-admin

Starting point for storage administration command

Author: davenquinn

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "submodules/postgis-tile-utils"]
 	path = submodules/postgis-tile-utils
 	url = https://github.com/UW-Macrostrat/postgis-tile-utils
+[submodule "submodules/storage-admin"]
+	path = submodules/storage-admin
+	url = https://github.com/UW-Macrostrat/radosgw_admin_client

cli/macrostrat/cli/subsystems/storage.py

@@ -2,6 +2,7 @@
 Storage system management
 """
 
+import re
 from os import environ
 from subprocess import run
 from typing import List, Optional
@@ -12,6 +13,7 @@
 from macrostrat.core import app as app_
 from macrostrat.utils import get_logger
 
+from ...core.exc import MacrostratError
 from ..kubernetes import _kubectl, get_secret
 
 settings = app_.settings
@@ -21,6 +23,39 @@
 
 app = Typer(no_args_is_help=True)
 
+if admin := settings.get("storage.admin", None):
+    host = settings.get("storage.endpoint", None)
+
+    if getattr(admin, "type") == "ceph-object-storage":
+        access_key = getattr(admin, "access_key")
+        secret_key = getattr(admin, "secret_key")
+
+        # Set up the radosgw-admin command
+
+        @app.command("admin", add_help_option=False)
+        def storage_admin(args: List[str] = Argument(None)):
+            """
+            Run the Ceph Object Storage admin command.
+            """
+            import sys
+            from os import environ
+
+            from htpheno.radosgw_admin_client.cli import UserError, main
+
+            environ["RADOSGW_ACCESS_KEY"] = access_key
+            environ["RADOSGW_SECRET_KEY"] = secret_key
+            environ["RADOSGW_HOST"] = re.sub("^https?://", "", host)
+
+            if args is None:
+                args = ["--help"]
+
+            sys.argv = ["radosgw-admin", *args]
+            try:
+                main()
+            except UserError as e:
+                # raise MacrostratError(e)
+                print("[red bold]Error:[/] [red]" + str(e))
+
 
 def _s3_users():
     res = _kubectl(

cli/poetry.lock

@@ -28,7 +28,8 @@ ipython = "^8.5.0"
 "macrostrat.integrations" = { path = "../integrations", develop = true }
 "macrostrat.map-integration" = { path = "../map-integration", develop = true }
 "criticalmaas.ta1-geopackage" = "^0.2.0"
-"mapboard.topology-manager" = {  path = "../submodules/topology-manager", develop = true }
+"mapboard.topology-manager" = { path = "../submodules/topology-manager", develop = true }
+"htpheno.radosgw-admin-client" = { path = "../submodules/storage-admin", develop = true }
 numpy = "^1.23.4"
 psycopg2-binary = "^2.9.4"
 pyproj = "^3.4.0"

cli/pyproject.toml

@@ -49,6 +49,17 @@ def all_environments(self):
             next(keys)
             return [k for k in keys]
 
+    def get(self, key, default=None):
+        if not "." in key:
+            return getattr(self, key, default)
+
+        keys = key.split(".")
+        for k in keys:
+            if k not in self:
+                return default
+            self = getattr(self, k)
+        return self
+
 
 settings = MacrostratConfig()
 

core/macrostrat/core/config.py

@@ -121,6 +121,7 @@ services:
       - minio_data:/data
     command: server --address 0.0.0.0:9000 --console-address 0.0.0.0:9001 /data
   web:
+    profiles: ["web"]
     image: hub.opensciencegrid.org/macrostrat/macrostrat-web:main
     build: ${MACROSTRAT_WEB_SRC:-""}
     environment: