diff --git a/cli/cmd/fetchRunner.go b/cli/cmd/fetchRunner.go index 959a59acc..e44017fd0 100644 --- a/cli/cmd/fetchRunner.go +++ b/cli/cmd/fetchRunner.go @@ -16,7 +16,7 @@ import ( ) func RunMizuFetch(fetch *MizuFetchOptions) { - mizuProxiedUrl := kubernetes.GetMizuCollectorProxiesHostAndPath(uint16(fetch.MizuPort), mizu.ResourcesNamespace, mizu.AggregatorPodName) + mizuProxiedUrl := kubernetes.GetMizuCollectorProxiedHostAndPath(uint16(fetch.MizuPort), mizu.ResourcesNamespace, mizu.AggregatorPodName) resp, err := http.Get(fmt.Sprintf("http://%s/api/har?from=%v&to=%v", mizuProxiedUrl, fetch.FromTimestamp, fetch.ToTimestamp)) if err != nil { log.Fatal(err) diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 59b2e39c1..424a0587f 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -248,7 +248,7 @@ func portForwardApiPod(ctx context.Context, kubernetesProvider *kubernetes.Provi cancel() } }() - mizuProxiedUrl := kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) + mizuProxiedUrl := kubernetes.GetMizuCollectorProxiedHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) fmt.Printf("Mizu is available at http://%s\n", mizuProxiedUrl) time.Sleep(time.Second * 5) // Waiting to be sure the proxy is ready @@ -321,7 +321,7 @@ func waitForFinish(ctx context.Context, cancel context.CancelFunc) { } func syncApiStatus(ctx context.Context, cancel context.CancelFunc, tappingOptions *MizuTapOptions) { - controlSocket, err := mizu.CreateControlSocket(fmt.Sprintf("ws://%s/ws", kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName))) + controlSocket, err := mizu.CreateControlSocket(fmt.Sprintf("ws://%s/ws", kubernetes.GetMizuCollectorProxiedHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName))) if err != nil { fmt.Printf("error establishing control socket connection %s\n", err) cancel() diff --git a/cli/cmd/viewRunner.go b/cli/cmd/viewRunner.go index 9a35e43a2..2400adc12 100644 --- a/cli/cmd/viewRunner.go +++ b/cli/cmd/viewRunner.go @@ -23,7 +23,7 @@ func runMizuView(mizuViewOptions *MizuViewOptions) { return } - mizuProxiedUrl := kubernetes.GetMizuCollectorProxiesHostAndPath(mizuViewOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) + mizuProxiedUrl := kubernetes.GetMizuCollectorProxiedHostAndPath(mizuViewOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) _, err = http.Get(fmt.Sprintf("http://%s/", mizuProxiedUrl)) if err == nil { fmt.Printf("Found a running service %s and open port %d\n", mizu.AggregatorPodName, mizuViewOptions.GuiPort) @@ -31,7 +31,7 @@ func runMizuView(mizuViewOptions *MizuViewOptions) { } fmt.Printf("Found service %s, creating k8s proxy\n", mizu.AggregatorPodName) - fmt.Printf("Mizu is available at http://%s\n", kubernetes.GetMizuCollectorProxiesHostAndPath(mizuViewOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName)) + fmt.Printf("Mizu is available at http://%s\n", kubernetes.GetMizuCollectorProxiedHostAndPath(mizuViewOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName)) err = kubernetes.StartProxy(kubernetesProvider, mizuViewOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) if err != nil { fmt.Printf("Error occured while running k8s proxy %v\n", err) diff --git a/cli/kubernetes/proxy.go b/cli/kubernetes/proxy.go index 131a7fa24..e0fa84830 100644 --- a/cli/kubernetes/proxy.go +++ b/cli/kubernetes/proxy.go @@ -19,7 +19,7 @@ func StartProxy(kubernetesProvider *Provider, mizuPort uint16, mizuNamespace str RejectMethods: proxy.MakeRegexpArrayOrDie(proxy.DefaultMethodRejectRE), } - mizuProxiedUrl := GetMizuCollectorProxiesHostAndPath(mizuPort, mizuNamespace, mizuServiceName) + mizuProxiedUrl := GetMizuCollectorProxiedHostAndPath(mizuPort, mizuNamespace, mizuServiceName) proxyHandler, err := proxy.NewProxyHandler(k8sProxyApiPrefix, filter, &kubernetesProvider.clientConfig, time.Second * 2) if err != nil { return err @@ -28,7 +28,7 @@ func StartProxy(kubernetesProvider *Provider, mizuPort uint16, mizuNamespace str mux.Handle(k8sProxyApiPrefix, proxyHandler) //work around to make static resources available to the dashboard (all .svgs will not load without this) mux.Handle("/static/", getRerouteHttpHandler(proxyHandler, mizuProxiedUrl)) - + l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "127.0.0.1", int(mizuPort))) if err != nil { return err @@ -40,7 +40,7 @@ func StartProxy(kubernetesProvider *Provider, mizuPort uint16, mizuNamespace str return server.Serve(l) } -func GetMizuCollectorProxiesHostAndPath(mizuPort uint16, mizuNamespace string, mizuServiceName string) string { +func GetMizuCollectorProxiedHostAndPath(mizuPort uint16, mizuNamespace string, mizuServiceName string) string { return fmt.Sprintf("localhost:%d/api/v1/namespaces/%s/services/%s:80/proxy", mizuPort, mizuNamespace, mizuServiceName) }