Merge branch 'master' into ibodrov-patch-1

Author: ibodrov

agent/src/main/java/com/walmartlabs/concord/agent/Agent.java

@@ -29,7 +29,7 @@
 import com.walmartlabs.concord.agent.mmode.MaintenanceModeListener;
 import com.walmartlabs.concord.agent.mmode.MaintenanceModeNotifier;
 import com.walmartlabs.concord.client2.ProcessEntry.StatusEnum;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import com.walmartlabs.concord.server.queueclient.QueueClient;
 import com.walmartlabs.concord.server.queueclient.message.ProcessRequest;
 import com.walmartlabs.concord.server.queueclient.message.ProcessResponse;
@@ -235,7 +235,7 @@ private JobRequest take(QueueClient queueClient) throws Exception {
             return null;
         }
 
-        Path workDir = IOUtils.createTempDir(agentCfg.getPayloadDir(), "workDir");
+        Path workDir = PathUtils.createTempDir(agentCfg.getPayloadDir(), "workDir");
 
         return JobRequest.from(resp, workDir);
     }

agent/src/main/java/com/walmartlabs/concord/agent/DefaultStateFetcher.java

@@ -22,7 +22,7 @@
 
 import com.walmartlabs.concord.client2.ClientUtils;
 import com.walmartlabs.concord.client2.ProcessApi;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.ZipUtils;
 
 import javax.inject.Inject;
 import java.io.InputStream;
@@ -40,7 +40,7 @@ public DefaultStateFetcher(ProcessApi processApi) {
     @Override
     public void downloadState(JobRequest job) throws Exception {
         try (InputStream is = ClientUtils.withRetry(AgentConstants.API_CALL_MAX_RETRIES, AgentConstants.API_CALL_RETRY_DELAY, () -> processApi.downloadState(job.getInstanceId()))){
-            IOUtils.unzip(is, job.getPayloadDir(), StandardCopyOption.REPLACE_EXISTING);
+            ZipUtils.unzip(is, job.getPayloadDir(), StandardCopyOption.REPLACE_EXISTING);
         }
     }
 }

agent/src/main/java/com/walmartlabs/concord/agent/OneShotRunner.java

@@ -24,7 +24,7 @@
 import com.google.inject.Injector;
 import com.walmartlabs.concord.agent.cfg.AgentConfiguration;
 import com.walmartlabs.concord.agent.guice.WorkerModule;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import com.walmartlabs.concord.server.queueclient.message.ProcessResponse;
 
 import javax.inject.Inject;
@@ -49,7 +49,7 @@ public OneShotRunner(AgentConfiguration agentCfg,
 
     public void run(String processResponseJson) throws Exception {
         var processResponse = objectMapper.readValue(processResponseJson, ProcessResponse.class);
-        var workDir = IOUtils.createTempDir(agentCfg.getPayloadDir(), "workDir");
+        var workDir = PathUtils.createTempDir(agentCfg.getPayloadDir(), "workDir");
         var jobRequest = JobRequest.from(processResponse, workDir);
 
         var workerModule = new WorkerModule(agentCfg.getAgentId(), jobRequest.getInstanceId(), jobRequest.getSessionToken());

agent/src/main/java/com/walmartlabs/concord/agent/Worker.java

@@ -25,7 +25,7 @@
 import com.walmartlabs.concord.agent.logging.ProcessLog;
 import com.walmartlabs.concord.agent.remote.ProcessStatusUpdater;
 import com.walmartlabs.concord.client2.ProcessEntry.StatusEnum;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import com.walmartlabs.concord.imports.Import.SecretDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,7 +105,7 @@ public void run() {
             Path payloadDir = jobRequest.getPayloadDir();
             try {
                 log.info("exec ['{}'] -> removing the payload directory: {}", instanceId, payloadDir);
-                IOUtils.deleteRecursively(payloadDir);
+                PathUtils.deleteRecursively(payloadDir);
             } catch (IOException e) {
                 log.warn("exec ['{}'] -> can't remove the payload directory: {}", instanceId, e.getMessage());
             }

agent/src/main/java/com/walmartlabs/concord/agent/cfg/Utils.java

@@ -21,7 +21,7 @@
  */
 
 import com.typesafe.config.Config;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -58,7 +58,7 @@ public static Path getOptionalAbsolutePath(Config cfg, String key) {
     public static Path getOrCreatePath(Config cfg, String key) {
         try {
             if (!cfg.hasPath(key)) {
-                return IOUtils.createTempDir(key);
+                return PathUtils.createTempDir(key);
             }
 
             String value = cfg.getString(key);
@@ -73,7 +73,7 @@ public static Path getOrCreatePath(Config cfg, String key) {
 
                 return p;
             }
-            return IOUtils.createTempDir(value);
+            return PathUtils.createTempDir(value);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/ProcessPool.java

@@ -24,7 +24,7 @@
 import com.walmartlabs.concord.agent.ExecutionException;
 import com.walmartlabs.concord.agent.Utils;
 import com.walmartlabs.concord.agent.cfg.PreForkConfiguration;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -166,7 +166,7 @@ private void maintenance() {
 
     private static void cleanup(ProcessEntry process) {
         try {
-            IOUtils.deleteRecursively(process.workDir);
+            PathUtils.deleteRecursively(process.workDir);
         } catch (IOException e) {
             log.info("cleanup ['{}'] -> error: {}", process.workDir, e.getMessage());
             // ignore

agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/RunnerJobExecutor.java

@@ -36,7 +36,7 @@
 import com.walmartlabs.concord.agent.logging.ProcessLog;
 import com.walmartlabs.concord.agent.logging.ProcessLogFactory;
 import com.walmartlabs.concord.agent.remote.AttachmentsUploader;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import com.walmartlabs.concord.common.Posix;
 import com.walmartlabs.concord.dependencymanager.DependencyEntity;
 import com.walmartlabs.concord.dependencymanager.DependencyManager;
@@ -239,7 +239,7 @@ private void persistWorkDir(UUID instanceId, Path src) {
             }
 
             log.info("exec ['{}'] -> persisting the payload directory into {}...", instanceId, dst);
-            IOUtils.copy(src, dst);
+            PathUtils.copy(src, dst);
 
             // persistentWorkDir is mostly useful when the Agent is running in a container
             // typically it is running as PID 456 - all files created by the process
@@ -279,7 +279,7 @@ private void cleanup(UUID instanceId, ProcessEntry pe) {
         Path workDir = pe.getWorkDir();
         try {
             log.info("exec ['{}'] -> removing the working directory: {}", instanceId, workDir);
-            IOUtils.deleteRecursively(workDir);
+            PathUtils.deleteRecursively(workDir);
         } catch (IOException e) {
             log.warn("exec ['{}'] -> can't remove the working directory: {}", instanceId, e.getMessage());
         }
@@ -486,7 +486,7 @@ private ProcessEntry fork(RunnerJob job, String[] cmd) throws ExecutionException
         ProcessEntry entry = processPool.take(hc, () -> {
             // can't use workDirBase, "preforks" start before they receive their process payload
             // create a new temporary directory
-            Path workDir = IOUtils.createTempDir("workDir");
+            Path workDir = PathUtils.createTempDir("workDir");
             return start(workDir, cmd);
         });
 
@@ -495,7 +495,7 @@ private ProcessEntry fork(RunnerJob job, String[] cmd) throws ExecutionException
         // the process' workDir
         Path dst = entry.getWorkDir();
         // TODO use move
-        IOUtils.copy(src, dst);
+        PathUtils.copy(src, dst);
 
         writeInstanceId(job.getInstanceId(), dst);
 
@@ -540,7 +540,7 @@ private ProcessEntry start(Path workDir, String[] cmd) throws IOException {
 
         // TODO constants
         Map<String, String> env = b.environment();
-        env.put(IOUtils.TMP_DIR_KEY, IOUtils.TMP_DIR.toAbsolutePath().toString());
+        env.put(PathUtils.TMP_DIR_KEY, PathUtils.TMP_DIR.toAbsolutePath().toString());
         env.put("_CONCORD_ATTACHMENTS_DIR", workDir.resolve(Constants.Files.JOB_ATTACHMENTS_DIR_NAME)
                 .toAbsolutePath().toString());
 

agent/src/main/java/com/walmartlabs/concord/agent/logging/LocalProcessLog.java

@@ -20,7 +20,6 @@
  * =====
  */
 
-import com.walmartlabs.concord.common.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +61,7 @@ public void delete() {
     public void log(InputStream src) throws IOException {
         Path f = logFile();
         try (OutputStream dst = Files.newOutputStream(f, StandardOpenOption.CREATE, StandardOpenOption.APPEND)) {
-             IOUtils.copy(src, dst);
+            src.transferTo(dst);
         }
     }
 

agent/src/main/java/com/walmartlabs/concord/agent/remote/AttachmentsUploader.java

@@ -22,8 +22,9 @@
 
 import com.walmartlabs.concord.agent.AgentConstants;
 import com.walmartlabs.concord.client2.*;
-import com.walmartlabs.concord.common.IOUtils;
+import com.walmartlabs.concord.common.PathUtils;
 import com.walmartlabs.concord.common.TemporaryPath;
+import com.walmartlabs.concord.common.ZipUtils;
 import com.walmartlabs.concord.sdk.Constants;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 
@@ -47,9 +48,9 @@ public void upload(UUID instanceId, Path workDir) throws Exception {
             return;
         }
 
-        try (TemporaryPath tmp = IOUtils.tempFile("attachments", ".zip")) {
+        try (TemporaryPath tmp = PathUtils.tempFile("attachments", ".zip")) {
             try (ZipArchiveOutputStream zip = new ZipArchiveOutputStream(Files.newOutputStream(tmp.path()))) {
-                IOUtils.zip(zip, attachmentsDir);
+                ZipUtils.zip(zip, attachmentsDir);
             }
 
             ProcessApi api = new ProcessApi(apiClient);

cli/src/main/java/com/walmartlabs/concord/cli/AbortException.java

@@ -0,0 +1,28 @@
+package com.walmartlabs.concord.cli;
+
+/*-
+ * *****
+ * Concord
+ * -----
+ * Copyright (C) 2017 - 2025 Walmart Inc.
+ * -----
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =====
+ */
+
+public class AbortException extends RuntimeException {
+
+    public AbortException() {
+        super("Aborted");
+    }
+}