Merge pull request #54 from RedHatInsights/fix/filewriter-readiness

Fix the file writing client readiness
RedHatInsights · Mar 29, 2023 · 4b9730c · 4b9730c
2 parents ff0dd02 + 50f842a
commit 4b9730c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 52 deletions.
diff --git a/api/src/main/java/com/redhat/insights/http/InsightsFileWritingClient.java b/api/src/main/java/com/redhat/insights/http/InsightsFileWritingClient.java
@@ -50,8 +50,7 @@ public void sendInsightsReport(String filename, InsightsReport report) {
 
   @Override
   public boolean isReadyToSend() {
-    return (new File(config.getCertFilePath()).exists()
-            && new File(config.getKeyFilePath()).exists())
-        && new File(config.getMachineIdFilePath()).exists();
+    return (new File(config.getArchiveUploadDir()).exists()
+        && new File(config.getMachineIdFilePath()).exists());
   }
 }
diff --git a/api/src/test/java/com/redhat/insights/http/InsightsFileWritingClientTest.java b/api/src/test/java/com/redhat/insights/http/InsightsFileWritingClientTest.java
@@ -10,6 +10,7 @@
 import com.redhat.insights.doubles.NoopInsightsLogger;
 import com.redhat.insights.logging.InsightsLogger;
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -27,6 +28,7 @@ public String getIdentificationName() {
             return "TEST";
           }
 
+          @Override
           public String getArchiveUploadDir() {
             return tmpdir.toString();
           }
@@ -48,7 +50,9 @@ public String getArchiveUploadDir() {
   }
 
   @Test
-  public void testIsReadyToSend() {
+  public void testIsReadyToSend() throws IOException {
+    Path tmpdir = Files.createTempDirectory("tmpDirPrefix");
+
     InsightsConfiguration goodConfig =
         new InsightsConfiguration() {
           @Override
@@ -57,73 +61,45 @@ public String getIdentificationName() {
           }
 
           @Override
-          public String getKeyFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.key").toString();
-          }
-
-          @Override
-          public String getCertFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.cert").toString();
+          public String getArchiveUploadDir() {
+            return tmpdir.toString();
           }
 
           @Override
           public String getMachineIdFilePath() {
             return getPathFromResource("com/redhat/insights/machine-id").toString();
           }
         };
-    InsightsConfiguration wrongKeyConfig =
-        new InsightsConfiguration() {
-          @Override
-          public String getIdentificationName() {
-            return "BAD";
-          }
-
-          @Override
-          public String getKeyFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.key")
-                .resolveSibling("wrong.key")
-                .toString();
-          }
 
-          @Override
-          public String getCertFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.cert").toString();
-          }
-        };
-    InsightsConfiguration wrongCertConfig =
+    InsightsConfiguration wrongMachineIdConfig =
         new InsightsConfiguration() {
           @Override
           public String getIdentificationName() {
-            return "BAD";
+            return "GOOD";
           }
 
           @Override
-          public String getKeyFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.key").toString();
+          public String getArchiveUploadDir() {
+            return tmpdir.toString();
           }
 
           @Override
-          public String getCertFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.cert")
-                .resolveSibling("wrong.cert")
-                .toString();
+          public String getMachineIdFilePath() {
+            return "BAD";
           }
         };
-    InsightsConfiguration wrongMachineIdConfig =
+
+    InsightsConfiguration wrongUploadPathConfig =
         new InsightsConfiguration() {
           @Override
           public String getIdentificationName() {
             return "GOOD";
           }
 
           @Override
-          public String getKeyFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.key").toString();
-          }
-
-          @Override
-          public String getCertFilePath() {
-            return getPathFromResource("com/redhat/insights/tls/dummy.cert").toString();
+          public String getArchiveUploadDir() {
+            // This is unlikely to exist
+            return "/a/b/c/d/FC02B2FE-B18B-48FB-B0B5-9CC8B98E9CD9";
           }
 
           @Override
@@ -133,19 +109,19 @@ public String getMachineIdFilePath() {
         };
 
     InsightsLogger logger = new NoopInsightsLogger();
+
     InsightsHttpClient client = new InsightsFileWritingClient(logger, goodConfig);
     assertTrue(client.isReadyToSend(), "Client should be ready to send");
-    client = new InsightsFileWritingClient(logger, wrongCertConfig);
-    assertFalse(
-        client.isReadyToSend(),
-        "Client shouldn't be ready to send because of wrong certificate path");
-    client = new InsightsFileWritingClient(logger, wrongKeyConfig);
-    assertFalse(
-        client.isReadyToSend(), "Client shouldn't be ready to send because of wrong key path");
+
     client = new InsightsFileWritingClient(logger, wrongMachineIdConfig);
     assertFalse(
         client.isReadyToSend(),
         "Client shouldn't be ready to send because of wrong machine-id path");
+
+    client = new InsightsFileWritingClient(logger, wrongUploadPathConfig);
+    assertFalse(
+        client.isReadyToSend(),
+        "Client shouldn't be ready to send because of non-existing upload directory");
   }
 
   private Path getPathFromResource(String path) {