From 9367fd761b5c6241a66960f05c0d7a0c9d88f2c2 Mon Sep 17 00:00:00 2001
From: djeinstine <djeinstine@gmail.com>
Date: Fri, 8 Nov 2024 14:23:57 +0000
Subject: [PATCH] getUrlSchema now uses async call

---
 src/utils/config/service-helpers.js       | 11 +++++------
 src/utils/kubernetes/kubernetes-routes.js | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index d086e2f5..5f7c4bdd 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -185,7 +185,7 @@ export async function servicesFromKubernetes() {
       return [];
     }
 
-    const services = routeList
+    const services = await Promise.all(routeList
       .filter(
         (route) =>
           route.metadata.annotations &&
@@ -194,11 +194,11 @@ export async function servicesFromKubernetes() {
             route.metadata.annotations[`${ANNOTATION_BASE}/instance`] === instanceName ||
             `${ANNOTATION_BASE}/instance.${instanceName}` in route.metadata.annotations),
       )
-      .map((route) => {
+      .map( async (route) => {
         let constructedService = {
           app: route.metadata.annotations[`${ANNOTATION_BASE}/app`] || route.metadata.name,
           namespace: route.metadata.namespace,
-          href: route.metadata.annotations[`${ANNOTATION_BASE}/href`] || getUrlSchema(route),
+          href: route.metadata.annotations[`${ANNOTATION_BASE}/href`] || await getUrlSchema(route),
           name: route.metadata.annotations[`${ANNOTATION_BASE}/name`] || route.metadata.name,
           group: route.metadata.annotations[`${ANNOTATION_BASE}/group`] || "Kubernetes",
           weight: route.metadata.annotations[`${ANNOTATION_BASE}/weight`] || "0",
@@ -207,7 +207,6 @@ export async function servicesFromKubernetes() {
           external: false,
           type: "service",
         };
-        console.log("href is ",constructedService.href);
         if (route.metadata.annotations[`${ANNOTATION_BASE}/external`]) {
           constructedService.external =
             String(route.metadata.annotations[`${ANNOTATION_BASE}/external`]).toLowerCase() === "true";
@@ -240,9 +239,9 @@ export async function servicesFromKubernetes() {
           logger.error("Error attempting k8s environment variable substitution.");
           logger.debug(e);
         }
-        console.log(constructedService)
         return constructedService;
-      });
+      })
+    );
 
     const mappedServiceGroups = [];
 
diff --git a/src/utils/kubernetes/kubernetes-routes.js b/src/utils/kubernetes/kubernetes-routes.js
index fcbfa23f..5fdbc6ca 100644
--- a/src/utils/kubernetes/kubernetes-routes.js
+++ b/src/utils/kubernetes/kubernetes-routes.js
@@ -25,11 +25,11 @@ const getSchemaFromGateway = async (gatewayRef) => {
     }
 };
 
-function getUrlFromHttpRoute(ingress) {
+async function getUrlFromHttpRoute(ingress) {
     const urlHost = ingress.spec.hostnames[0];
     const urlPath = ingress.spec.rules[0].matches[0].path.value;
-    //const urlSchema = await getSchemaFromGateway(ingress.spec.parentRefs[0]) ? "https" : "http";
-    const urlSchema = "https"
+    const urlSchema = await getSchemaFromGateway(ingress.spec.parentRefs[0]) ? "https" : "http";
+    // const urlSchema = "https"
     return `${urlSchema}://${urlHost}${urlPath}`;
 }
   
@@ -162,7 +162,7 @@ export async function getRouteList(){
   return routeList;
 }
 
-export function getUrlSchema(route) {
+export async function getUrlSchema(route) {
     let urlSchema;
     
     switch (routingType) {
@@ -170,7 +170,7 @@ export function getUrlSchema(route) {
         urlSchema = getUrlFromIngress(route);
         break;
       case "gateway":
-        urlSchema = getUrlFromHttpRoute(route);
+        urlSchema = await getUrlFromHttpRoute(route);
         break;
       default:
         urlSchema = getUrlFromIngress(route);