From e1e19e9c8b343034adb4ee16347500c762687f13 Mon Sep 17 00:00:00 2001
From: Keith Lustria <keith.lustria@oracle.com>
Date: Mon, 8 Jan 2024 22:53:27 -0800
Subject: [PATCH] Improve getOpcPath to return exception during failure and add
 unit test coverage

---
 integrations/oci/sdk/runtime/pom.xml          |  7 +++++-
 .../sdk/runtime/OciAvailabilityDefault.java   | 10 ++++----
 .../oci/sdk/runtime/OciAvailabilityTest.java  | 23 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/integrations/oci/sdk/runtime/pom.xml b/integrations/oci/sdk/runtime/pom.xml
index a7c481c44e7..158f2e10cfd 100644
--- a/integrations/oci/sdk/runtime/pom.xml
+++ b/integrations/oci/sdk/runtime/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -93,6 +93,11 @@
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityDefault.java b/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityDefault.java
index 81a0f39c19b..07f86206022 100644
--- a/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityDefault.java
+++ b/integrations/oci/sdk/runtime/src/main/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityDefault.java
@@ -37,7 +37,7 @@
 @Singleton
 @Weight(ServiceInfoBasics.DEFAULT_INJECT_WEIGHT)
 class OciAvailabilityDefault implements OciAvailability {
-    private static final String OPC_PATH = getOpcPath();
+    private static final String OPC_PATH = getOpcPath(METADATA_SERVICE_BASE_URL);
 
     @Override
     public boolean isRunningOnOci(OciConfig ociConfig) {
@@ -74,15 +74,15 @@ static boolean canReach(String address,
         }
     }
 
-    private static String getOpcPath() {
-        String input = METADATA_SERVICE_BASE_URL;
+    static String getOpcPath(String metadataServiceBaseURL) {
+        String input = metadataServiceBaseURL;
         int index = -1;
         for (int nth = 3; nth > 0; nth--) {
             index = input.indexOf("/", index + 1);
             if (index == -1) {
-                return null;
+                throw new IllegalStateException("Unable to find opc path from '" + metadataServiceBaseURL + "'");
             }
         }
-        return METADATA_SERVICE_BASE_URL.substring(index);
+        return metadataServiceBaseURL.substring(index);
     }
 }
diff --git a/integrations/oci/sdk/runtime/src/test/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityTest.java b/integrations/oci/sdk/runtime/src/test/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityTest.java
index 7e1a7f136a3..ac147a1d140 100644
--- a/integrations/oci/sdk/runtime/src/test/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityTest.java
+++ b/integrations/oci/sdk/runtime/src/test/java/io/helidon/integrations/oci/sdk/runtime/OciAvailabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,12 @@
 import java.util.Objects;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class OciAvailabilityTest {
 
@@ -32,4 +35,22 @@ void isRunningOnOci() {
                                  is(false));
     }
 
+    @Test
+    void getValidOpcPath() {
+        assertThat(OciAvailabilityDefault.getOpcPath("http://169.254.169.254/opc/v2/"),
+                   is("/opc/v2/"));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "http169.254.169.254opcv2",
+            "http://169.254.169.254",
+    })
+    void getInValidOpcPath(String metadataServiceBaseURL) {
+        Exception e = assertThrows(IllegalStateException.class, () -> {
+            OciAvailabilityDefault.getOpcPath(metadataServiceBaseURL);
+        });
+        String expectedMessage = "Unable to find opc path from '" + metadataServiceBaseURL + "'";
+        assertThat(e.getMessage(), is(expectedMessage));
+    }
 }