feat: Add support for raw endpoints (without component paths)

Author: peacekeeper

src/main/java/com/godiddy/cli/clistorage/cliconfig/CLIConfig.java

@@ -31,6 +31,18 @@ public static void setEndpoint(String endpoint) {
         }
     }
 
+    public static Boolean getEndpointRaw() {
+        return CLIStorage.get("endpointRaw") == null ? null : Boolean.parseBoolean(CLIStorage.get("endpointRaw"));
+    }
+
+    public static void setEndpointRaw(Boolean endpointRaw) {
+        if (endpointRaw == null) {
+            CLIStorage.remove("endpointRaw");
+        } else {
+            CLIStorage.put("endpointRaw", endpointRaw.toString());
+        }
+    }
+
     public static Kms.Value getKms() {
         return CLIStorage.get("kms") == null ? null : Kms.Value.valueOf(CLIStorage.get("kms"));
     }

src/main/java/com/godiddy/cli/commands/config/ConfigEndpointCommand.java

@@ -24,19 +24,27 @@ public class ConfigEndpointCommand extends ConfigAbstractCommand implements Call
     )
     String endpoint;
 
+    @CommandLine.Option(
+            names = {"-r", "--raw"},
+            description = "Whether or not to use raw endpoints that omit the component paths, e.g. /universal-resolver/, /universal-registrar/."
+    )
+    Boolean endpointRaw;
+
     @Override
     public Integer call() throws Exception {
-        log.trace("Parameter 'endpoint': " + this.endpoint);
+        log.trace("Parameter 'endpoint': " + this.endpoint + ", 'endpointRaw': " + this.endpointRaw);
         if (Boolean.TRUE.equals(this.delete)) {
             CLIConfig.setEndpoint(null);
+            CLIConfig.setEndpointRaw(null);
             System.out.println("Endpoint setting successfully deleted.");
         } else {
             if (this.endpoint == null) {
                 String endpoint = CLIConfig.getEndpoint();
+                Boolean endpointRaw = CLIConfig.getEndpointRaw();
                 if (endpoint == null) {
                     System.out.println("No endpoint set.");
                 } else {
-                    System.out.println("Endpoint: " + endpoint);
+                    System.out.println("Endpoint: " + endpoint + " (raw=" + endpointRaw + ")");
                 }
             } else {
                 String endpoint = this.endpoint;
@@ -46,7 +54,13 @@ public Integer call() throws Exception {
                     endpoint = predefinedEndpoint;
                 }
                 CLIConfig.setEndpoint(endpoint);
-                System.out.println("Endpoint successfully set: " + endpoint);
+                if (this.endpointRaw == null) {
+                    System.out.println("Endpoint successfully set: " + endpoint);
+                } else {
+                    Boolean endpointRaw = this.endpointRaw;
+                    CLIConfig.setEndpointRaw(endpointRaw);
+                    System.out.println("Endpoint successfully set: " + endpoint + " (raw=" + endpointRaw + ")");
+                }
             }
         }
         return 0;

src/main/java/com/godiddy/cli/config/Api.java

@@ -19,6 +19,7 @@
 import uniregistrar.openapi.RFC3339DateFormat;
 
 import java.io.*;
+import java.net.URI;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -48,9 +49,9 @@ public class Api {
 
     public static ApiClient apiClient() {
         ApiClient apiClient = new ApiClient();
-        String endpoint = Endpoint.getEndpoint();
-        if (endpoint.endsWith("/")) endpoint = endpoint.substring(0, endpoint.length()-1);
-        apiClient.updateBaseUri(endpoint);
+        String endpointWithoutSlash = Endpoint.getEndpoint();
+        if (endpointWithoutSlash.endsWith("/")) endpointWithoutSlash = endpointWithoutSlash.substring(0, endpointWithoutSlash.length()-1);
+        apiClient.updateBaseUri(endpointWithoutSlash);
         apiClient.setRequestInterceptor(requestInterceptor);
         apiClient.setResponseInterceptor(responseInterceptor);
         return apiClient;
@@ -105,8 +106,20 @@ public void onComplete() { }
     };
 
     private static final Consumer<HttpRequest.Builder> requestInterceptor = builder -> {
+        Boolean endpointRaw = Endpoint.getEndpointRaw();
+        if (Boolean.TRUE.equals(endpointRaw)) {
+            String endpointWithSlash = Endpoint.getEndpoint();
+            if (! endpointWithSlash.endsWith("/")) endpointWithSlash += "/";
+            String httpRequestUri = builder.build().uri().toString();
+            String httpRequestRelativeUri = httpRequestUri.substring(endpointWithSlash.length());
+            httpRequestRelativeUri = httpRequestRelativeUri.substring(httpRequestRelativeUri.indexOf("/")+1);
+            httpRequestUri = endpointWithSlash + httpRequestRelativeUri;
+            builder.uri(URI.create(httpRequestUri));
+        }
         String apiKey = ApiKey.getApiKey();
-        builder.header("Authorization", "Bearer " + apiKey);
+        if (apiKey != null && ! apiKey.isBlank()) {
+            builder.header("Authorization", "Bearer " + apiKey);
+        }
         HttpRequest httpRequest = builder.build();
         System.out.println();
         System.out.println(">>> " + httpRequest.method() + " " + httpRequest.uri());

src/main/java/com/godiddy/cli/config/Endpoint.java

@@ -19,16 +19,23 @@ public class Endpoint {
             "godiddy-dev", "https://api.dev.godiddy.com/1.0.0/",
             "dif-universalresolver", "https://dev.uniresolver.io/1.0/",
             "dif-universalregistrar", "https://uniregistrar.io/1.0/",
-            "local-universalresolver", "http://localhost:8080/1.0",
-            "local-universalregistrar", "http://localhost:9090/1.0",
+            "local-universalresolver", "http://localhost:8080/1.0/",
+            "local-universalregistrar", "http://localhost:9080/1.0/",
             "local-businesswallet", "http://localhost:21080/1.0.0/"
     );
 
+    public static final Boolean DEFAULT_ENDPOINTRAW = Boolean.FALSE;
+
     public static String getEndpoint() {
         String endpoint = Objects.requireNonNullElse(CLIConfig.getEndpoint(), DEFAULT_ENDPOINT);
         if (DEFAULT_ENDPOINT.equals(endpoint)) {
             log.debug("Using default endpoint: " + DEFAULT_ENDPOINT);
         }
         return endpoint;
     }
+
+    public static Boolean getEndpointRaw() {
+        Boolean endpointRaw = Objects.requireNonNullElse(CLIConfig.getEndpointRaw(), DEFAULT_ENDPOINTRAW);
+        return endpointRaw;
+    }
 }