reconfiguring eksMetricsRequest again

Author: elenaatencio

app/modals/AwsModal.tsx

@@ -127,20 +127,20 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
           </select>
         </div>
         <div>
-          <label htmlFor="aws-access-key">
-            Access Key<span>*</span>
+          <label htmlFor="aws-access-key">{(typeOfService === 'AWS/EKS') ? 'Bearer Token' : 'Access Key'} <span>*</span>
           </label>
           <input
             id="aws-access-key"
             type="password"
             name="accessKey"
             value={accessKey}
             onChange={e => handleChange(e)}
-            placeholder="AWS Access Key"
+            placeholder={typeOfService === 'AWS/EKS' ? 'Grafana Bearer Token' : 'AWS Access Key'}
             required
           />
         </div>
-        <div>
+        {(typeOfService !== 'AWS/EKS') && (
+          <div>
           <label htmlFor="aws-secret-access-key">
             Secret Access Key<span>*</span>
           </label>
@@ -154,18 +154,33 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
             required
           />
         </div>
+        )}
+        {/* <div>
+          <label htmlFor="aws-secret-access-key">
+            Secret Access Key<span>*</span>
+          </label>
+          <input
+            id="aws-secret-access-key"
+            type="password"
+            name="secretAccessKey"
+            value={secretAccessKey}
+            onChange={e => handleChange(e)}
+            placeholder="AWS Secret Access Key"
+            required
+          />
+        </div> */}
+        
         <div>
           <label htmlFor="aws-url">
-            Cluster URL<span>*</span>
+            {(typeOfService === 'AWS/EKS') ? 'Grafana URL' : 'Access Key'}<span>*</span>
           </label>
           <input
             id="aws-url"
             type="string"
             name="awsUrl"
             value={awsUrl}
             onChange={e => handleChange(e)}
-            placeholder="AWS Url"
-            required
+            placeholder={typeOfService === 'AWS/EKS'? 'Grafana Provided URL': 'AWS Url'}
           />
         </div>
         <div>

electron/routes/cloudbased.ts

@@ -265,7 +265,7 @@ ipcMain.on(
 ipcMain.on('eksMetricsRequest', async (message:Electron.IpcMainEvent, username: string, appIndex: number) => {
   const fileContents = JSON.parse(fs.readFileSync(settingsLocation, 'utf8'));
   const userAwsService = fileContents[username]?.services[appIndex];
-  const [typeOfService, region, awsUrl] = [userAwsService[4], userAwsService[2], userAwsService[9]];
+  const [typeOfService, region, awsUrl, token] = [userAwsService[4], userAwsService[2], userAwsService[9], userAwsService[7]];
 
   const url = `${awsUrl}/api/search?folderIds=0`
   console.log("hi")
@@ -275,7 +275,7 @@ ipcMain.on('eksMetricsRequest', async (message:Electron.IpcMainEvent, username:
       "Access-Control-Allow-Origin": "*",
       Accept: "application/json",
       "Content-Type": "application/json",
-      Authorization: 'Bearer eyJrIjoiamN4UGRKVHg3cUQyZ201N042NW41bHg5bGhJaVFlaFciLCJuIjoidGVzdEtleSIsImlkIjoxfQ=='
+      Authorization: `Bearer ${token}`,
     },
   });
   log.info(response);