Properly cleaning up temporary dir and simplying one file handling

Signed-off-by: fjtirado <ftirados@ibm.com>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/resources/ClasspathResource.java

@@ -31,7 +31,7 @@ public ClasspathResource(String path) {
   public InputStream open() throws IOException {
     InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
     if (is == null) {
-      throw new IOException("Cannot load resouce with path: " + path + " from ClassPath");
+      throw new IOException("Cannot load resource with path: " + path + " from classpath");
     }
     return is;
   }

impl/grpc/src/main/java/io/serverlessworkflow/impl/executors/grpc/FileDescriptorContext.java

@@ -17,50 +17,74 @@
 
 import com.github.os72.protocjar.Protoc;
 import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
 import io.serverlessworkflow.impl.resources.ExternalResourceHandler;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 class FileDescriptorReader {
 
   private static final Logger logger = LoggerFactory.getLogger(FileDescriptorReader.class);
 
-  static FileDescriptorContext readDescriptor(ExternalResourceHandler externalResourceHandler) {
+  static FileDescriptorProto readDescriptor(ExternalResourceHandler externalResourceHandler) {
 
+    Path grpcDir = null;
     try (InputStream inputStream = externalResourceHandler.open()) {
-
-      Path grpcDir = Files.createTempDirectory("serverless-workflow-");
-
-      Path protoFile = grpcDir.resolve(externalResourceHandler.name());
-      if (!Files.exists(protoFile)) {
-        Files.createDirectories(protoFile.getParent());
-      }
-
-      Files.copy(inputStream, protoFile, StandardCopyOption.REPLACE_EXISTING);
-
+      grpcDir = Files.createTempDirectory("serverless-workflow-");
+      Files.createDirectories(grpcDir);
+      Path protoFile = grpcDir.resolve(Path.of(externalResourceHandler.name()).getFileName());
+      Files.copy(inputStream, protoFile);
       Path descriptorOutput = grpcDir.resolve("descriptor.protobin");
-
       generateFileDescriptor(grpcDir, protoFile, descriptorOutput);
-
-      DescriptorProtos.FileDescriptorSet fileDescriptorSet =
-          DescriptorProtos.FileDescriptorSet.newBuilder()
-              .mergeFrom(Files.readAllBytes(descriptorOutput))
-              .build();
-
-      return new FileDescriptorContext(fileDescriptorSet, externalResourceHandler.name());
-
+      return DescriptorProtos.FileDescriptorSet.newBuilder()
+          .mergeFrom(Files.readAllBytes(descriptorOutput))
+          .build()
+          .getFile(0);
     } catch (IOException e) {
       throw new UncheckedIOException(
-          "Unable to process GRPC descriptor file associated with resource "
+          "Unable to process GRPC proto file associated with resource "
               + externalResourceHandler.name(),
           e);
+    } finally {
+      if (grpcDir != null) {
+        deleteTempFiles(grpcDir);
+      }
+    }
+  }
+
+  private static void deleteTempFiles(Path grpcDir) {
+    try {
+      Files.walkFileTree(
+          grpcDir,
+          new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                throws IOException {
+              Files.delete(file);
+              return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc)
+                throws IOException {
+              if (exc != null) {
+                throw exc;
+              }
+              Files.delete(dir);
+              return FileVisitResult.CONTINUE;
+            }
+          });
+    } catch (IOException e) {
+      logger.warn("Error deleting GRPC temp dir " + grpcDir, e);
     }
   }
 
@@ -69,11 +93,6 @@ static FileDescriptorContext readDescriptor(ExternalResourceHandler externalReso
    * the embedded protoc from protoc-jar library. If that fails with FileNotFoundException
    * (unsupported architecture), falls back to using the system's installed protoc via
    * ProcessBuilder.
-   *
-   * @param grpcDir a temporary directory
-   * @param protoFile the .proto file used by <code>protoc</code> to generate the file descriptor
-   * @param descriptorOutput the output directory where the descriptor file will be generated
-   * @throws IOException
    */
   private static void generateFileDescriptor(Path grpcDir, Path protoFile, Path descriptorOutput)
       throws IOException {
@@ -107,8 +126,6 @@ private static void generateFileDescriptor(Path grpcDir, Path protoFile, Path de
 
   /*
    * Fallback method to generate file descriptor using system's installed protoc via ProcessBuilder.
-   *
-   * @param protocArgs the arguments to pass to protoc command
    */
   private static void generateFileDescriptorWithProcessBuilder(String[] protocArgs)
       throws IOException {

impl/grpc/src/main/java/io/serverlessworkflow/impl/executors/grpc/FileDescriptorReader.java

@@ -15,7 +15,7 @@
  */
 package io.serverlessworkflow.impl.executors.grpc;
 
-import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -42,15 +42,15 @@ public class GrpcExecutor implements CallableTask {
 
   private final GrpcRequestContext requestContext;
   private final WorkflowValueResolver<Map<String, Object>> arguments;
-  private final FileDescriptorContext fileDescriptorContext;
+  private final FileDescriptorProto fileDescriptorProto;
 
   public GrpcExecutor(
       GrpcRequestContext requestContext,
       WorkflowValueResolver<Map<String, Object>> arguments,
-      FileDescriptorContext fileDescriptorContext) {
+      FileDescriptorProto fileDescriptorProto) {
     this.requestContext = requestContext;
     this.arguments = arguments;
-    this.fileDescriptorContext = fileDescriptorContext;
+    this.fileDescriptorProto = fileDescriptorProto;
   }
 
   @Override
@@ -65,12 +65,6 @@ private CompletableFuture<WorkflowModel> buildGrpcCallExecutor(
 
     Channel channel = GrpcChannelResolver.channel(workflowContext, taskContext, requestContext);
 
-    DescriptorProtos.FileDescriptorProto fileDescriptorProto =
-        fileDescriptorContext.fileDescriptorSet().getFileList().stream()
-            .filter(file -> file.getName().equals(fileDescriptorContext.inputProto()))
-            .findFirst()
-            .orElseThrow(() -> new IllegalStateException("Proto file not found in descriptor set"));
-
     try {
       Descriptors.FileDescriptor fileDescriptor =
           Descriptors.FileDescriptor.buildFrom(

impl/grpc/src/main/java/io/serverlessworkflow/impl/executors/grpc/GrpcExecutor.java

@@ -50,10 +50,12 @@ public CallableTaskFactory init(
         new GrpcRequestContext(
             service.getHost(), service.getPort(), with.getMethod(), service.getName());
 
-    FileDescriptorContext fileDescriptorContext =
-        definition
-            .resourceLoader()
-            .loadStatic(with.getProto().getEndpoint(), FileDescriptorReader::readDescriptor);
-    return () -> new GrpcExecutor(grpcRequestContext, arguments, fileDescriptorContext);
+    return () ->
+        new GrpcExecutor(
+            grpcRequestContext,
+            arguments,
+            definition
+                .resourceLoader()
+                .loadStatic(with.getProto().getEndpoint(), FileDescriptorReader::readDescriptor));
   }
 }