Add tests for experimental libgit2 transport

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>

Author: Paulo Gomes

hack/ci/e2e.sh

@@ -139,3 +139,19 @@ echo "Run large Git repo tests"
 kubectl -n source-system apply -f "${ROOT_DIR}/config/testdata/git/large-repo.yaml"
 kubectl -n source-system wait gitrepository/large-repo-go-git --for=condition=ready --timeout=2m15s
 kubectl -n source-system wait gitrepository/large-repo-libgit2 --for=condition=ready --timeout=2m15s
+
+
+# Test experimental libgit2 transport. Any tests against the default transport must
+# either run before this, or patch the deployment again to disable this, as once enabled
+# only the managed transport will be used.
+kubectl -n source-system patch deployment source-controller \
+    --patch '{"spec": {"template": {"spec": {"containers": [{"name": "manager","env": [{"name": "EXPERIMENTAL_GIT_TRANSPORT", "value": "true"}]}]}}}}'
+
+# wait until the patch took effect and the new source-controller is running
+sleep 20s
+
+kubectl -n source-system wait --for=condition=ready --timeout=1m -l app=source-controller pod
+
+echo "Re-run large libgit2 repo test with managed transport"
+kubectl -n source-system wait gitrepository/large-repo-libgit2 --for=condition=ready --timeout=2m15s
+kubectl -n source-system exec deploy/source-controller -- printenv | grep EXPERIMENTAL_GIT_TRANSPORT=true

pkg/git/libgit2/managed/http.go

@@ -85,9 +85,6 @@ type httpSmartSubtransport struct {
 }
 
 func (t *httpSmartSubtransport) Action(targetUrl string, action git2go.SmartServiceAction) (git2go.SmartSubtransportStream, error) {
-	var req *http.Request
-	var err error
-
 	var proxyFn func(*http.Request) (*url.URL, error)
 	proxyOpts, err := t.transport.SmartProxyOptions()
 	if err != nil {
@@ -125,26 +122,50 @@ func (t *httpSmartSubtransport) Action(targetUrl string, action git2go.SmartServ
 		ExpectContinueTimeout: 1 * time.Second,
 	}
 
-	finalUrl := targetUrl
-	opts, found := transportOptions(targetUrl)
-	if found && opts.TargetUrl != "" {
-		// override target URL only if options are found and a new targetURL
-		// is provided.
-		finalUrl = opts.TargetUrl
+	client, req, err := createClientRequest(targetUrl, action, httpTransport)
+	if err != nil {
+		return nil, err
+	}
+
+	stream := newManagedHttpStream(t, req, client)
+	if req.Method == "POST" {
+		stream.recvReply.Add(1)
+		stream.sendRequestBackground()
 	}
 
-	// Add any provided certificate to the http transport.
-	if len(opts.CABundle) > 0 {
-		cap := x509.NewCertPool()
-		if ok := cap.AppendCertsFromPEM(opts.CABundle); !ok {
-			return nil, fmt.Errorf("failed to use certificate from PEM")
+	return stream, nil
+}
+
+func createClientRequest(targetUrl string, action git2go.SmartServiceAction, t *http.Transport) (*http.Client, *http.Request, error) {
+	var req *http.Request
+	var err error
+
+	if t == nil {
+		return nil, nil, fmt.Errorf("failed to create client: transport cannot be nil")
+	}
+
+	finalUrl := targetUrl
+	opts, found := transportOptions(targetUrl)
+	if found {
+		if opts.TargetUrl != "" {
+			// override target URL only if options are found and a new targetURL
+			// is provided.
+			finalUrl = opts.TargetUrl
 		}
-		httpTransport.TLSClientConfig = &tls.Config{
-			RootCAs: cap,
+
+		// Add any provided certificate to the http transport.
+		if len(opts.CABundle) > 0 {
+			cap := x509.NewCertPool()
+			if ok := cap.AppendCertsFromPEM(opts.CABundle); !ok {
+				return nil, nil, fmt.Errorf("failed to use certificate from PEM")
+			}
+			t.TLSClientConfig = &tls.Config{
+				RootCAs: cap,
+			}
 		}
 	}
 
-	client := &http.Client{Transport: httpTransport, Timeout: fullHttpClientTimeOut}
+	client := &http.Client{Transport: t, Timeout: fullHttpClientTimeOut}
 
 	switch action {
 	case git2go.SmartServiceActionUploadpackLs:
@@ -172,18 +193,11 @@ func (t *httpSmartSubtransport) Action(targetUrl string, action git2go.SmartServ
 	}
 
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	req.Header.Set("User-Agent", "git/2.0 (git2go)")
-
-	stream := newManagedHttpStream(t, req, client)
-	if req.Method == "POST" {
-		stream.recvReply.Add(1)
-		stream.sendRequestBackground()
-	}
-
-	return stream, nil
+	req.Header.Set("User-Agent", "git/2.0 (flux-libgit2)")
+	return client, req, nil
 }
 
 func (t *httpSmartSubtransport) Close() error {