From b3bee6fc82c06f96aae5196a990953cb97cbc965 Mon Sep 17 00:00:00 2001
From: Jeremy Belldina <jbelldina@pearlstreettechnologies.com>
Date: Mon, 9 Sep 2024 15:29:24 -0400
Subject: [PATCH] Rename key to token to match influxdb header.

---
 .../retrofit/config/RetrofitClientFactory.java      | 13 +++++++------
 .../influxdb/config/InfluxDbConfiguration.java      |  4 ++--
 .../influxdb/security/InfluxdbCredentials.java      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java
index 94ed9b262..ab2952c44 100644
--- a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java
+++ b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java
@@ -126,7 +126,7 @@ public <T> T createClient(
       String password,
       String usernamePasswordFile,
       String bearerToken,
-      String apiKey)
+      String apiToken)
       throws IOException {
     String baseUrl = remoteService.getBaseUrl();
 
@@ -138,9 +138,10 @@ public <T> T createClient(
         && StringUtils.isEmpty(password)
         && StringUtils.isEmpty(usernamePasswordFile)
         && StringUtils.isEmpty(bearerToken)
-        && StringUtils.isEmpty(apiKey))) {
+        && StringUtils.isEmpty(apiToken))) {
       okHttpClient =
-          createAuthenticatedClient(username, password, usernamePasswordFile, bearerToken, apiKey);
+          createAuthenticatedClient(
+              username, password, usernamePasswordFile, bearerToken, apiToken);
     }
 
     Slf4jRetrofitLogger logger = createRetrofitLogger.apply(type);
@@ -161,7 +162,7 @@ private static OkHttpClient createAuthenticatedClient(
       String password,
       String usernamePasswordFile,
       String bearerToken,
-      String apiKey)
+      String apiToken)
       throws IOException {
     final String credential;
 
@@ -172,8 +173,8 @@ private static OkHttpClient createAuthenticatedClient(
       credential = "Basic " + Base64.encodeBase64String(trimmedFileContent.getBytes());
     } else if (StringUtils.isNotEmpty(bearerToken)) {
       credential = "Bearer " + bearerToken;
-    } else if (StringUtils.isNotEmpty(apiKey)) {
-      credential = "Token " + apiKey;
+    } else if (StringUtils.isNotEmpty(apiToken)) {
+      credential = "Token " + apiToken;
     } else {
       credential = Credentials.basic(username, password);
     }
diff --git a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java
index f9aab9a78..590903a3a 100644
--- a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java
+++ b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java
@@ -71,7 +71,7 @@ MetricsService influxDbMetricsService(
       List<AccountCredentials.Type> supportedTypes = account.getSupportedTypes();
 
       InfluxdbCredentials credentials =
-          InfluxdbCredentials.builder().apiKey(account.getApiKey()).build();
+          InfluxdbCredentials.builder().apiToken(account.getApiKey()).build();
 
       InfluxDbNamedAccountCredentials.InfluxDbNamedAccountCredentialsBuilder
           accountCredentialsBuilder =
@@ -92,7 +92,7 @@ MetricsService influxDbMetricsService(
                   null,
                   null,
                   null,
-                  account.getApiKey()));
+                  credentials.getApiToken()));
         }
         accountCredentialsBuilder.supportedTypes(supportedTypes);
       }
diff --git a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/security/InfluxdbCredentials.java b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/security/InfluxdbCredentials.java
index 98e32ee11..2ce6d2f6c 100644
--- a/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/security/InfluxdbCredentials.java
+++ b/kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/security/InfluxdbCredentials.java
@@ -28,5 +28,5 @@ public class InfluxdbCredentials {
           .orElse("Unknown");
 
   private String dbName;
-  private String apiKey;
+  private String apiToken;
 }