From 897e2fdbb3e388269ea4946d00c29020ef8665f6 Mon Sep 17 00:00:00 2001 From: Bella Luz Quintero Date: Tue, 7 Jan 2025 16:23:10 -0700 Subject: [PATCH] modify file path and make error more specific --- .../rse2e/external/azure/AzureBlobFileFetcher.java | 6 +++--- .../rse2e/external/localfile/LocalFileFetcher.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java index 5fcc744db..7f386ee4b 100644 --- a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java +++ b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/azure/AzureBlobFileFetcher.java @@ -55,7 +55,7 @@ public List fetchFiles() { String rse2ELocalInputFilePath = System.getenv("RSE2E_LOCAL_INPUT_FILE_PATH"); if (rse2ELocalInputFilePath == null || rse2ELocalInputFilePath.isEmpty()) { throw new IllegalArgumentException( - "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set"); + "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set in azure file fetcher."); } List relevantFiles = new ArrayList<>(); @@ -64,9 +64,9 @@ public List fetchFiles() { String datePrefix = AzureBlobHelper.buildDatePathPrefix(today); // TODO - update base on AzureBlobOrganizer - String pathPrefix = datePrefix + "Automated/"; + String pathPrefix = datePrefix + "/Automated/"; if (rse2ELocalInputFilePath.contains("GoldenCopy")) { - pathPrefix += datePrefix + "GoldenCopy/"; + pathPrefix += datePrefix + "/GoldenCopy/"; } ListBlobsOptions options = new ListBlobsOptions().setPrefix(pathPrefix); diff --git a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java index ef9c9767d..aa36f4301 100644 --- a/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java +++ b/rs-e2e/src/main/java/gov/hhs/cdc/trustedintermediary/rse2e/external/localfile/LocalFileFetcher.java @@ -30,7 +30,7 @@ public List fetchFiles() { String rse2ELocalInputFilePath = System.getenv("RSE2E_LOCAL_INPUT_FILE_PATH"); if (rse2ELocalInputFilePath == null || rse2ELocalInputFilePath.isEmpty()) { throw new IllegalArgumentException( - "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set"); + "Environment variable RSE2E_LOCAL_INPUT_FILE_PATH is not set in local file fetcher."); } try (Stream stream = Files.walk(Paths.get(rse2ELocalInputFilePath))) { return stream.filter(Files::isRegularFile)