Rewrite hellohttp2 test service to use stdlib

Author: linkvt

test/e2e/http2_test.go

@@ -24,6 +24,7 @@ import (
 	"net/http"
 	"testing"
 
+	v1 "k8s.io/api/core/v1"
 	pkgTest "knative.dev/pkg/test"
 	"knative.dev/pkg/test/spoof"
 	rtesting "knative.dev/serving/pkg/testing/v1"
@@ -49,7 +50,13 @@ func TestHelloHTTP2WithPortNameH2C(t *testing.T) {
 
 	t.Log("Creating a new Service")
 
-	resources, err := v1test.CreateServiceReady(t, clients, &names, rtesting.WithNamedPort("h2c"))
+	resources, err := v1test.CreateServiceReady(
+		t, clients, &names, rtesting.WithNamedPort("h2c"),
+		rtesting.WithEnv(v1.EnvVar{
+			Name:  "RESPONSE",
+			Value: test.HelloHTTP2Text,
+		}),
+	)
 	if err != nil {
 		t.Fatalf("Failed to create initial Service: %v: %v", names.Service, err)
 	}

test/test_images/hellohttp2/hellohttp2.go

@@ -17,29 +17,43 @@ limitations under the License.
 package main
 
 import (
-	"flag"
 	"fmt"
 	"log"
 	"net/http"
 	"os"
-
-	"knative.dev/pkg/network"
 )
 
+func main() {
+	log.Print("hellohttp2 app started.")
+
+	mux := http.NewServeMux()
+	mux.HandleFunc("/", handler)
+	mux.HandleFunc("/healthz", healthzHandler)
+
+	protocols := &http.Protocols{}
+	protocols.SetHTTP1(true)
+	protocols.SetUnencryptedHTTP2(true)
+
+	s := &http.Server{
+		Addr:      ":" + os.Getenv("PORT"),
+		Handler:   mux,
+		Protocols: protocols,
+	}
+	log.Fatal(s.ListenAndServe())
+}
+
 func handler(w http.ResponseWriter, r *http.Request) {
-	if r.ProtoMajor == 2 {
-		log.Print("hellohttp2 received an http2 request.")
-		fmt.Fprintln(w, "Hello, New World! How about donuts and coffee?")
+	log.Printf("Request: proto=%s method=%s path=%s", r.Proto, r.Method, r.URL.Path)
+
+	if res, ok := os.LookupEnv("RESPONSE"); ok {
+		fmt.Fprint(w, res)
 	} else {
-		log.Print("hellohttp2 received an HTTP 1.1 request.")
-		w.WriteHeader(http.StatusUpgradeRequired)
+		fmt.Fprintf(w, "proto=%s method=%s path=%s\n", r.Proto, r.Method, r.URL.Path)
 	}
 }
 
-func main() {
-	flag.Parse()
-	log.Print("hellohttp2 app started.")
-
-	s := network.NewServer(":"+os.Getenv("PORT"), http.HandlerFunc(handler))
-	log.Fatal(s.ListenAndServe())
+func healthzHandler(w http.ResponseWriter, r *http.Request) {
+	log.Printf("Health check: proto=%s method=%s path=%s", r.Proto, r.Method, r.URL.Path)
+	w.WriteHeader(http.StatusOK)
+	fmt.Fprintln(w, "OK")
 }

test/test_images/hellohttp2/service.yaml

@@ -5,9 +5,17 @@ metadata:
   namespace: default
 spec:
   template:
+    metadata:
+      annotations:
+        # Example: Override the queue sidecar image with a custom image
+        # queue.sidecar.serving.knative.dev/image: ko://knative.dev/serving/cmd/queue
     spec:
       containers:
-      - image: ko://knative.dev/serving/test/test_images/hellohttp2
-        ports:
-        - name: h2c
-          containerPort: 8080
+        - image: ko://knative.dev/serving/test/test_images/hellohttp2
+          ports:
+            - name: h2c
+              containerPort: 8080
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080