BXC-4691 add boxctron service key path

UNC-Libraries · Dec 4, 2024 · 4ceb7e0 · 4ceb7e0
1 parent 507a7e3
commit 4ceb7e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/...c/main/java/edu/unc/lib/boxc/web/admin/controllers/processing/ChompbPreIngestService.java b/...c/main/java/edu/unc/lib/boxc/web/admin/controllers/processing/ChompbPreIngestService.java
@@ -21,6 +21,7 @@
 public class ChompbPreIngestService {
     private GlobalPermissionEvaluator globalPermissionEvaluator;
     private Path baseProjectsPath;
+    private String serviceKeyPath;
     private static final Set<String> VALID_FILENAMES = Set.of("data.json", "data.csv");
 
     /**
@@ -41,6 +42,7 @@ public String startCropping(AgentPrincipals agent, String projectName, String em
         return executeChompbCommand("chompb", "process_source_files",
                     "--action", "velocicroptor",
                     "-w", baseProjectsPath.resolve(projectName).toAbsolutePath().toString(),
+                    "-k", serviceKeyPath,
                     "--user", agent.getUsername(),
                     "--email", email);
     }
@@ -124,4 +126,8 @@ public void setGlobalPermissionEvaluator(GlobalPermissionEvaluator globalPermiss
     public void setBaseProjectsPath(Path baseProjectsPath) {
         this.baseProjectsPath = baseProjectsPath;
     }
+
+    public void setServiceKeyPath(String serviceKeyPath) {
+        this.serviceKeyPath = serviceKeyPath;
+    }
 }
diff --git a/web-admin-app/src/main/webapp/WEB-INF/service-context.xml b/web-admin-app/src/main/webapp/WEB-INF/service-context.xml
@@ -75,6 +75,7 @@
     <bean id="chompbPreIngestService" class="edu.unc.lib.boxc.web.admin.controllers.processing.ChompbPreIngestService">
         <property name="globalPermissionEvaluator" ref="globalPermissionEvaluator" />
         <property name="baseProjectsPath" value="${chompb.projects.basePath}" />
+        <property name="serviceKeyPath" value="${boxctron.service.key}" />
     </bean>
 
     <bean class="edu.unc.lib.boxc.web.common.view.CDRViewResolver" p:suffix=".jsp">

diff --git a/...st/java/edu/unc/lib/boxc/web/admin/controllers/processing/ChompbPreIngestServiceTest.java b/...st/java/edu/unc/lib/boxc/web/admin/controllers/processing/ChompbPreIngestServiceTest.java
@@ -54,6 +54,7 @@ public void setup() {
         closeable = openMocks(this);
         service = new ChompbPreIngestService();
         service.setBaseProjectsPath(tmpFolder);
+        service.setServiceKeyPath("/path/to/key");
         service.setGlobalPermissionEvaluator(globalPermissionEvaluator);
         when(agentPrincipals.getPrincipals()).thenReturn(new AccessGroupSetImpl("group"));
         when(globalPermissionEvaluator.hasGlobalPermission(any(AccessGroupSet.class), eq(Permission.ingest))).thenReturn(true);