From 82bc8b179e03e08a568cb3cbf7c48777022964e4 Mon Sep 17 00:00:00 2001
From: Brett Curtis <brett@osinfra.io>
Date: Sat, 13 Jul 2024 15:18:45 -0400
Subject: [PATCH] Configure Gateway TLS (#25)

---
 cmd/http/main.go               |  4 ++--
 cmd/http/main_test.go          | 10 +++++-----
 deployments/regional/main.tf   |  8 ++++----
 internal/metadata/main.go      |  8 ++++----
 internal/metadata/main_test.go |  8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmd/http/main.go b/cmd/http/main.go
index 92179c7..4f2161c 100644
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -15,8 +15,8 @@ import (
 // main initializes the HTTP server and sets up the routes.
 func main() {
 	mux := http.NewServeMux()
-	mux.HandleFunc("/metadata/", metadata.MetadataHandler)
-	mux.HandleFunc("/health", metadata.HealthCheckHandler)
+	mux.HandleFunc("/gke-info-go/metadata/", metadata.MetadataHandler)
+	mux.HandleFunc("/gke-info-go/health", metadata.HealthCheckHandler)
 
 	port := "8080"
 	if envPort := os.Getenv("PORT"); envPort != "" {
diff --git a/cmd/http/main_test.go b/cmd/http/main_test.go
index e20656d..d9312c0 100644
--- a/cmd/http/main_test.go
+++ b/cmd/http/main_test.go
@@ -15,7 +15,7 @@ import (
 func TestMain(t *testing.T) {
 	// Set up a test server
 	mux := http.NewServeMux()
-	mux.HandleFunc("/metadata/", metadata.MetadataHandler)
+	mux.HandleFunc("/gke-info-go/metadata/", metadata.MetadataHandler)
 
 	ts := httptest.NewServer(mux)
 	defer ts.Close()
@@ -31,10 +31,10 @@ func TestMain(t *testing.T) {
 		expectedBody string
 		isJSON       bool
 	}{
-		{ts.URL + "/metadata/cluster-name", http.StatusOK, `{"cluster-name":"test-cluster-name"}`, true},
-		{ts.URL + "/metadata/cluster-location", http.StatusOK, `{"cluster-location":"test-cluster-location"}`, true},
-		{ts.URL + "/metadata/instance-zone", http.StatusOK, `{"instance-zone":"us-central1-a"}`, true},
-		{ts.URL + "/metadata/unknown", http.StatusBadRequest, "Unknown metadata type\n", false},
+		{ts.URL + "/gke-info-go/metadata/cluster-name", http.StatusOK, `{"cluster-name":"test-cluster-name"}`, true},
+		{ts.URL + "/gke-info-go/metadata/cluster-location", http.StatusOK, `{"cluster-location":"test-cluster-location"}`, true},
+		{ts.URL + "/gke-info-go/metadata/instance-zone", http.StatusOK, `{"instance-zone":"us-central1-a"}`, true},
+		{ts.URL + "/gke-info-go/metadata/unknown", http.StatusBadRequest, "Unknown metadata type\n", false},
 	}
 
 	// Mock FetchMetadata for the tests
diff --git a/deployments/regional/main.tf b/deployments/regional/main.tf
index d4addfa..634f36f 100755
--- a/deployments/regional/main.tf
+++ b/deployments/regional/main.tf
@@ -231,7 +231,7 @@ resource "kubernetes_deployment_v1" "gke_info_go" {
 
           liveness_probe {
             http_get {
-              path = "/health"
+              path = "/gke-info-go/health"
               port = "8080"
             }
 
@@ -243,7 +243,7 @@ resource "kubernetes_deployment_v1" "gke_info_go" {
 
           readiness_probe {
             http_get {
-              path = "/health"
+              path = "/gke-info-go/health"
               port = "8080"
             }
 
@@ -280,7 +280,7 @@ resource "kubernetes_service_v1" "gke_info_go" {
   }
 
   spec {
-    cluster_ip = "None"
+    type = "ClusterIP"
     selector = {
       app = "gke-info-go"
     }
@@ -300,7 +300,7 @@ resource "kubernetes_service_v1" "gke_info_go_regional" {
   }
 
   spec {
-    cluster_ip = "None"
+    type = "ClusterIP"
     selector = {
       app = "gke-info-go"
     }
diff --git a/internal/metadata/main.go b/internal/metadata/main.go
index d87d8ac..be70abf 100644
--- a/internal/metadata/main.go
+++ b/internal/metadata/main.go
@@ -58,18 +58,18 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// MetadataHandler handles the /metadata/* endpoint and fetches the requested metadata.
+// MetadataHandler handles the /gke-info-go/metadata/* endpoint and fetches the requested metadata.
 func MetadataHandler(w http.ResponseWriter, r *http.Request) {
 	log.Printf("Received request for %s", r.URL.Path)
 
 	pathParts := strings.Split(r.URL.Path, "/")
-	if len(pathParts) < 3 {
+	if len(pathParts) < 4 {
 		log.Printf("Invalid request: %s", r.URL.Path)
-		http.Error(w, "Invalid request: expected /metadata/{type}", http.StatusBadRequest)
+		http.Error(w, "Invalid request: expected /gke-info-go/metadata/{type}", http.StatusBadRequest)
 		return
 	}
 
-	metadataType := pathParts[2]
+	metadataType := pathParts[3]
 	var url string
 
 	switch metadataType {
diff --git a/internal/metadata/main_test.go b/internal/metadata/main_test.go
index 241aa18..57fe9ad 100644
--- a/internal/metadata/main_test.go
+++ b/internal/metadata/main_test.go
@@ -60,10 +60,10 @@ func TestMetadataHandler(t *testing.T) {
 		expectedBody string
 		isJSON       bool
 	}{
-		{"/metadata/cluster-name", http.StatusOK, `{"cluster-name":"test-cluster-name"}`, true},
-		{"/metadata/cluster-location", http.StatusOK, `{"cluster-location":"test-cluster-location"}`, true},
-		{"/metadata/instance-zone", http.StatusOK, `{"instance-zone":"us-central1-a"}`, true},
-		{"/metadata/unknown", http.StatusBadRequest, "Unknown metadata type", false},
+		{"/gke-info-go/metadata/cluster-name", http.StatusOK, `{"cluster-name":"test-cluster-name"}`, true},
+		{"/gke-info-go/metadata/cluster-location", http.StatusOK, `{"cluster-location":"test-cluster-location"}`, true},
+		{"/gke-info-go/metadata/instance-zone", http.StatusOK, `{"instance-zone":"us-central1-a"}`, true},
+		{"/gke-info-go/metadata/unknown", http.StatusBadRequest, "Unknown metadata type", false},
 	}
 
 	for _, test := range tests {