restore from backup script added

Author: michael-conway

pcor_tools/CedarBackupDockerfile

@@ -0,0 +1,30 @@
+from python:3.9
+
+ADD . pcor_tools
+
+WORKDIR pcor_tools
+
+RUN pip install -r requirements.txt
+
+ENV CEDAR_PROPERTIES=/etc/irods-ext/cedar.properties
+
+CMD python cedar_backup_tool.py -t f6d5c357-beab-421c-93d3-0498a582acfd -i e355737f-3f47-4001-9ae4-67c1ca5bca75 -o /backup michaelconway/cedarbackup:latest
+
+
+# docker run -i --rm -v /commons/infrastructure/prod/irods-ext/cedar.properties:/etc/irods-ext/cedar.properties -v /commons/infrastructure/prod/backup/cedar:/backup --name cedar_backup michaelconway/cedarbackup:latest > /var/log/ods/cedar_backup.log 2>&1
+
+
+
+# docker run -i --rm -v /Users/conwaymc/temp/cedar.properties:/etc/irods-ext/cedar.properties -v /Users/conwaymc/temp/cedarbk:/backup michaelconway/cedarbackup:latest
+
+
+# docker build -t michaelconway/cedarbackup:latest -f CedarBackupDockerfile .
+
+
+# /Users/conwaymc/temp/cedar.properties
+
+
+# 0 4 * * * /commons/infrastructure/prod/cedar_backup.sh
+
+
+

pcor_tools/cedar_backup_tool.spec

@@ -6,7 +6,7 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=[],
-    hiddenimports=[],
+    hiddenimports=["requests"],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

pcor_tools/cedar_loading_tool.py

@@ -1,11 +1,26 @@
-import logging
+"""
+Tool to migrate a given cedar template from one version to another.
+
+Requites an env variable "CEDAR_PROPERTIES" to be set. see ./tests/test_resources/cedar_config_file.properties
+The env variable would be the absolute path to the location of that properties file
+
+run parameters
+
+-r - the url copied from CEDAR for the instance
+-s - source version, e.g. 1_5_0
+-t - target version, e.g. 1_5_1
+
+restored = https://repo.metadatacenter.org/folders/f71236e0-fa24-42eb-bb98-a9bd8f6b2586
+
+"""
+import json
 import logging
 import os
 import sys
 from optparse import OptionParser
 
-from pcor_cedar.loader_cedar import LoaderCedar
-from pcor_ingest.ingest_context import PcorIngestConfiguration
+from pcor_cedar.cedar_access import CedarAccess
+from pcor_cedar.migration import CedarMigrate
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -14,38 +29,46 @@
 )
 logger = logging.getLogger(__name__)
 
-
 def setup_arguments():
     parser = OptionParser()
-    parser.add_option('-r', "--resource_url", action='store', dest='resource_url', default=None)
-    parser.add_option('-d', "--directory", action='store', dest='directory', default=None)
-    parser.add_option('-v', "--cedar_version", action='store', dest='cedar_version', default="1_5_1")
+    parser.add_option('-f', "--resource_file", action='store', dest='resource_file', default=None)
+    parser.add_option('-t', "--target_folder_id", action='store', dest='target_folder_id', default=None)
 
     return parser.parse_args()[0]
 
-
 def main():
-    logger.info('Main function execution started.')
+    logger.info('Main function execution started. Load a backup json into CEDAR')
     global args
     args = setup_arguments()
 
     if "CEDAR_PROPERTIES" not in os.environ:
         logger.error("CEDAR_PROPERTIES not found in env. System exiting...")
         sys.exit()
 
-    if "PCOR_GEN3_CONFIG_LOCATION" not in os.environ:
-        logger.error("PCOR_GEN3_CONFIG_LOCATION not found in env. System exiting...")
-        sys.exit()
+    cedar_config_file = os.environ.get("CEDAR_PROPERTIES")
+    cedar_access = CedarAccess(cedar_config_file)
+
+    resource_file = args.resource_file
+    target_folder_id = args.target_folder_id
+
+    if not resource_file:
+        logger.error("no resource_file, specify this parameter with -f")
+        raise Exception("no -s parameter specified")
+
+    if not target_folder_id:
+        logger.error("no target_folder_id, specify this parameter with -t")
+        raise Exception("no -t parameter specified")
+
+    cedar_config_file = os.environ.get("CEDAR_PROPERTIES")
+    logger.info('resource to load :: %s' % resource_file)
+    logger.info('target_folder_id :: %s' % target_folder_id)
+
+    with open(resource_file, 'r') as f:
+        contents_json = json.loads(f.read())
 
-    resource_url = args.resource_url
-    directory = args.directory
-    cedar_version = args.cedar_version
+    id = cedar_access.create_resource(json.dumps(contents_json), target_folder_id)
+    logger.info("complete..id: {id}".format(id=id))
 
-    pcor_ingest_configuration = PcorIngestConfiguration(os.environ.get("PCOR_GEN3_CONFIG_LOCATION"))
-    cedar_loader = LoaderCedar(pcor_ingest_configuration, cedar_version)
-    logger.info("loading...")
-    cedar_loader.main_load_process(resource_url, directory)
-    logger.info("loading complete")
 
 if __name__ == "__main__":
-    main()
+    main()

pcor_tools/cedar_restore_tool.py

@@ -57,7 +57,7 @@ mypy-extensions==1.0.0
 nbclient==0.10.0
 nbconvert==7.16.4
 nbformat==5.10.4
-numpy==2.1.2
+numpy
 openpyxl==3.1.5
 packaging==24.1
 pandas==2.2.3