Merge pull request #287 from justinsb/normalize_requestlog

tests: normalize http request order

Author: k8s-ci-robot

pkg/patterns/declarative/pkg/applier/applylib_test.go

@@ -94,13 +94,16 @@ func runApplierGoldenTests(t *testing.T, testDir string, interceptHTTPServer boo
 		t.Logf("replacing old url prefix %q", "http://"+restConfig.Host)
 		requestLog.ReplaceURLPrefix("http://"+restConfig.Host, "http://kube-apiserver")
 		requestLog.RemoveUserAgent()
+		requestLog.SortGETs()
+
 		requests := requestLog.FormatHTTP()
 		h.CompareGoldenFile(filepath.Join(testdir, "expected.yaml"), requests)
 
 		if interceptHTTPServer {
 			t.Logf("replacing old url prefix %q", "http://"+restConfig.Host)
 			apiserverRequestLog.ReplaceURLPrefix("http://"+restConfig.Host, "http://kube-apiserver")
 			apiserverRequestLog.RemoveUserAgent()
+			apiserverRequestLog.SortGETs()
 			apiserverRequestLog.RemoveHeader("Kubectl-Session")
 			apiserverRequests := apiserverRequestLog.FormatHTTP()
 			h.CompareGoldenFile(filepath.Join(testdir, "expected-apiserver.yaml"), apiserverRequests)

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple1/expected-apiserver.yaml

@@ -18,7 +18,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /api/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
+GET /apis?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple2/expected-apiserver.yaml

@@ -18,7 +18,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /api/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
+GET /apis?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

pkg/patterns/declarative/pkg/applier/testdata/kubectl/simple3/expected-apiserver.yaml

@@ -18,7 +18,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /apis?timeout=32s
+GET /api/v1?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply
@@ -38,7 +38,7 @@ Kubectl-Command: kubectl apply
 
 ---
 
-GET /api/v1?timeout=32s
+GET /apis?timeout=32s
 Accept: application/json, */*
 Accept-Encoding: gzip
 Kubectl-Command: kubectl apply

pkg/test/httprecorder/request_log.go

@@ -3,6 +3,7 @@ package httprecorder
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 	"regexp"
 	"sort"
 	"strings"
@@ -108,6 +109,47 @@ func (l *RequestLog) RemoveHeader(k string) {
 	}
 }
 
+// SortGETs attempts to normalize parallel requests.
+// Consecutive GET requests are sorted alphabetically.
+func (l *RequestLog) SortGETs() {
+
+	isSwappable := func(urlString string) (string, bool) {
+		u, err := url.Parse(urlString)
+		if err != nil {
+			klog.Warningf("unable to parse url %q", urlString)
+			return "", false
+		}
+
+		switch u.Path {
+		case "/apis", "/api/v1", "/apis/v1":
+			return u.Path, true
+		}
+		return "", false
+	}
+
+doAgain:
+	changed := false
+	for i := 0; i < len(l.Entries)-1; i++ {
+		a := l.Entries[i]
+		b := l.Entries[i+1]
+
+		if a.Request.Method == "GET" && b.Request.Method == "GET" {
+			aKey, aSwappable := isSwappable(a.Request.URL)
+			bKey, bSwappable := isSwappable(b.Request.URL)
+			if aSwappable && bSwappable {
+				if aKey > bKey {
+					l.Entries[i+1] = a
+					l.Entries[i] = b
+					changed = true
+				}
+			}
+		}
+	}
+	if changed {
+		goto doAgain
+	}
+}
+
 func (l *RequestLog) RemoveUserAgent() {
 	l.RemoveHeader("user-agent")
 }