Addressing feedback, adding test

Author: jonathan-buttner

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/RequestUtils.java

@@ -29,7 +29,7 @@ public static String bearerToken(String apiKey) {
         return "Bearer " + apiKey;
     }
 
-    public static Header createApiKeyHeader(SecureString apiKey) {
+    public static Header createAuthApiKeyHeader(SecureString apiKey) {
         return new BasicHeader(HttpHeaders.AUTHORIZATION, apiKey(apiKey.toString()));
     }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ccm/CCMAuthenticationApplierFactory.java

@@ -17,7 +17,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import static org.elasticsearch.xpack.inference.external.request.RequestUtils.createApiKeyHeader;
+import static org.elasticsearch.xpack.inference.external.request.RequestUtils.createAuthApiKeyHeader;
 import static org.elasticsearch.xpack.inference.rest.Paths.INFERENCE_CCM_PATH;
 
 /**
@@ -70,7 +70,7 @@ public AuthenticationHeaderApplier(String apiKey) {
 
         @Override
         public HttpRequestBase apply(HttpRequestBase request) {
-            request.setHeader(createApiKeyHeader(apiKey));
+            request.setHeader(createAuthApiKeyHeader(apiKey));
             return request;
         }
     }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/request/RequestUtilsTests.java

@@ -10,19 +10,37 @@
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.test.ESTestCase;
 
+import static org.elasticsearch.xpack.inference.external.request.RequestUtils.apiKey;
 import static org.elasticsearch.xpack.inference.external.request.RequestUtils.bearerToken;
+import static org.elasticsearch.xpack.inference.external.request.RequestUtils.createAuthApiKeyHeader;
 import static org.elasticsearch.xpack.inference.external.request.RequestUtils.createAuthBearerHeader;
 import static org.hamcrest.Matchers.is;
 
 public class RequestUtilsTests extends ESTestCase {
+    private static final String SECRET = "abc";
+    private static final String BEARER_PREFIX = "Bearer ";
+    private static final String APIKEY_PREFIX = "ApiKey ";
+    private static final String AUTHORIZATION_HEADER = "Authorization";
+
     public void testCreateAuthBearerHeader() {
-        var header = createAuthBearerHeader(new SecureString("abc".toCharArray()));
+        var header = createAuthBearerHeader(new SecureString(SECRET.toCharArray()));
 
-        assertThat(header.getName(), is("Authorization"));
-        assertThat(header.getValue(), is("Bearer abc"));
+        assertThat(header.getName(), is(AUTHORIZATION_HEADER));
+        assertThat(header.getValue(), is(BEARER_PREFIX + SECRET));
     }
 
     public void testBearerToken() {
-        assertThat(bearerToken("abc"), is("Bearer abc"));
+        assertThat(bearerToken(SECRET), is(BEARER_PREFIX + SECRET));
+    }
+
+    public void testCreateAuthApiKeyHeader() {
+        var header = createAuthApiKeyHeader(new SecureString(SECRET.toCharArray()));
+
+        assertThat(header.getName(), is(AUTHORIZATION_HEADER));
+        assertThat(header.getValue(), is(APIKEY_PREFIX + SECRET));
+    }
+
+    public void testApiKey() {
+        assertThat(apiKey(SECRET), is(APIKEY_PREFIX + SECRET));
     }
 }