From 50f36c93b59838adbcc8f74eeea7f2f658c00700 Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Tue, 31 Jan 2023 23:18:38 +0100 Subject: [PATCH 1/2] feat: support TLS in metrics-api Signed-off-by: Jorge Turrado --- e2e/images/metrics-api/server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/e2e/images/metrics-api/server.go b/e2e/images/metrics-api/server.go index 55192c9..36d61eb 100644 --- a/e2e/images/metrics-api/server.go +++ b/e2e/images/metrics-api/server.go @@ -13,7 +13,8 @@ import ( ) const ( - PORT = 8080 + PORT = 8080 + TLS_PORT = 4333 ) var value int @@ -107,4 +108,9 @@ func main() { http.Handle("/", r) http.ListenAndServe(fmt.Sprintf(":%d", PORT), nil) + + value, found := os.LookupEnv("USE_TLS") + if found && value == "true" { + http.ListenAndServeTLS(fmt.Sprintf(":%d", TLS_PORT), "/cert/tls.crt", "/cert/tls.key", nil) + } } From 940707b77895627e8253263cc03bf2972b1963dd Mon Sep 17 00:00:00 2001 From: Jorge Turrado Date: Wed, 1 Feb 2023 23:18:50 +0100 Subject: [PATCH 2/2] add support for TLS in metrics api Signed-off-by: Jorge Turrado --- e2e/images/metrics-api/Dockerfile | 3 ++- e2e/images/metrics-api/server.go | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/e2e/images/metrics-api/Dockerfile b/e2e/images/metrics-api/Dockerfile index 098882d..53e3eaf 100644 --- a/e2e/images/metrics-api/Dockerfile +++ b/e2e/images/metrics-api/Dockerfile @@ -11,5 +11,6 @@ RUN go build -o /go/bin/server . FROM gcr.io/distroless/base COPY --from=build-env /go/bin/server / EXPOSE 8080 +EXPOSE 4333 -CMD ["/server"] \ No newline at end of file +ENTRYPOINT ["/server"] \ No newline at end of file diff --git a/e2e/images/metrics-api/server.go b/e2e/images/metrics-api/server.go index 36d61eb..93f75ee 100644 --- a/e2e/images/metrics-api/server.go +++ b/e2e/images/metrics-api/server.go @@ -91,8 +91,7 @@ func setValue(w http.ResponseWriter, r *http.Request) { } func main() { - fmt.Printf("Running server on port: %d", PORT) - + fmt.Printf("Running server on port: %d\n", PORT) app := new(application) app.auth.basic.username = os.Getenv("AUTH_USERNAME") app.auth.basic.password = os.Getenv("AUTH_PASSWORD") @@ -107,10 +106,17 @@ func main() { r.HandleFunc("/api/value/{number:[0-9]+}", setValue).Methods("POST") http.Handle("/", r) - http.ListenAndServe(fmt.Sprintf(":%d", PORT), nil) value, found := os.LookupEnv("USE_TLS") if found && value == "true" { - http.ListenAndServeTLS(fmt.Sprintf(":%d", TLS_PORT), "/cert/tls.crt", "/cert/tls.key", nil) + go func() { + fmt.Printf("Running tls server on port: %d\n", TLS_PORT) + err := http.ListenAndServeTLS(fmt.Sprintf(":%d", TLS_PORT), "/certs/tls.crt", "/certs/tls.key", nil) + if err != nil { + fmt.Println(err.Error()) + } + }() } + + http.ListenAndServe(fmt.Sprintf(":%d", PORT), nil) }