[Feature] [v2] Add HTTP2 connection (#284)

Author: ajanikow

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## [master](https://github.com/arangodb/go-driver/tree/master) (N/A)
+- Add Driver V2 in Alpha version
+- Add HTTP2 support for V1 and V2
 
 ## [1.1.0](https://github.com/arangodb/go-driver/tree/1.1.0) (2020-08-11)
 - Use internal coordinator communication for cursors if specified coordinator was not found on endpoint list

Makefile

@@ -10,6 +10,9 @@ TMPDIR := ${SCRIPTDIR}/.tmp
 
 DOCKER_CMD:=docker run
 
+GOBUILDTAGS:=$(TAGS)
+GOBUILDTAGSOPT=-tags "$(GOBUILDTAGS)"
+
 ifndef ARANGODB
 	ARANGODB := arangodb/arangodb:latest
 endif
@@ -43,18 +46,17 @@ endif
 
 ifeq ("$(TEST_AUTH)", "none")
 	ARANGOENV := -e ARANGO_NO_AUTH=1
-	TEST_AUTHENTICATION := 
-	TAGS := 
+	TEST_AUTHENTICATION :=
 	TESTS := $(REPOPATH) $(REPOPATH)/test
 else ifeq ("$(TEST_AUTH)", "rootpw")
 	ARANGOENV := -e ARANGO_ROOT_PASSWORD=rootpw
 	TEST_AUTHENTICATION := basic:root:rootpw
-	TAGS := -tags auth
+	GOBUILDTAGS += auth
 	TESTS := $(REPOPATH)/test
 else ifeq ("$(TEST_AUTH)", "jwt")
 	ARANGOENV := -e ARANGO_ROOT_PASSWORD=rootpw 
 	TEST_AUTHENTICATION := jwt:root:rootpw
-	TAGS := -tags auth
+	GOBUILDTAGS += auth
 	TESTS := $(REPOPATH)/test
 	JWTSECRET := testing
 	JWTSECRETFILE := "${TMPDIR}/${TESTCONTAINER}-jwtsecret"
@@ -179,6 +181,10 @@ run-tests-single-json-with-auth:
 	@echo "Single server, HTTP+JSON, with authentication"
 	@${MAKE} TEST_MODE="single" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="json" __run_tests
 
+run-tests-single-json-http2-with-auth:
+	@echo "Single server, HTTP+JSON, with authentication"
+	@${MAKE} TEST_MODE="single" TAGS="http2" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="json" __run_tests
+
 run-tests-single-vpack-with-auth:
 	@echo "Single server, HTTP+Velocypack, with authentication"
 	@${MAKE} TEST_MODE="single" TEST_AUTH="rootpw" TEST_CONTENT_TYPE="vpack" __run_tests
@@ -351,7 +357,7 @@ __test_go_test:
 		-e CGO_ENABLED=0 \
 		-w /usr/code/ \
 		golang:$(GOVERSION) \
-		go test $(TAGS) $(TESTOPTIONS) $(TESTVERBOSEOPTIONS) $(TESTS)
+		go test $(GOBUILDTAGSOPT) $(TESTOPTIONS) $(TESTVERBOSEOPTIONS) $(TESTS)
 
 # Internal test tasks
 __run_v2_tests: __test_prepare __test_v2_go_test __test_cleanup
@@ -371,7 +377,7 @@ __test_v2_go_test:
 		-e CGO_ENABLED=0 \
 		-w /usr/code/v2/ \
 		golang:$(GOV2VERSION) \
-		go test $(TAGS) $(TESTOPTIONS) $(TESTVERBOSEOPTIONS) ./tests
+		go test $(GOBUILDTAGSOPT) $(TESTOPTIONS) $(TESTVERBOSEOPTIONS) ./tests
 
 
 __test_prepare:

client_foxx.go

@@ -19,6 +19,7 @@
 //
 // Author Tomasz Mielech
 //
+
 package driver
 
 import (

client_foxx_impl.go

@@ -19,6 +19,7 @@
 //
 // Author Tomasz Mielech
 //
+
 package driver
 
 // Foxx provides access to foxx services specific operations.

foxx.go

@@ -19,6 +19,7 @@
 //
 // Author Tomasz Mielech
 //
+
 package driver
 
 import (

go.mod

@@ -12,5 +12,6 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.19.0 // indirect
 	github.com/stretchr/testify v1.5.1
+	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	golang.org/x/tools v0.0.0-20200818005847-188abfa75333 // indirect
 )

go.sum

@@ -50,6 +50,7 @@ golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -58,6 +59,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

test/client_connection_http2_test.go

@@ -0,0 +1,38 @@
+// +build http2
+//
+// DISCLAIMER
+//
+// Copyright 2017 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Adam Janikowski
+//
+
+package test
+
+import (
+	"crypto/tls"
+	"net/http"
+
+	"golang.org/x/net/http2"
+)
+
+func NewConnectionTransport() http.RoundTripper {
+	return &http2.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		AllowHTTP:       true,
+	}
+}

test/client_connection_http_test.go

@@ -0,0 +1,48 @@
+// +build !http2
+//
+// DISCLAIMER
+//
+// Copyright 2017 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Adam Janikowski
+//
+
+package test
+
+import (
+	"crypto/tls"
+	"net"
+	"net/http"
+	"time"
+)
+
+func NewConnectionTransport() http.RoundTripper {
+	return &http.Transport{
+		// Copy default values from http.DefaultTransport
+		Proxy:           http.ProxyFromEnvironment,
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+			DualStack: true,
+		}).DialContext,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+}

test/client_test.go

@@ -339,7 +339,7 @@ func waitUntilEndpointSynchronized(ctx context.Context, c driver.Client, dbname
 func TestCreateClientHttpConnection(t *testing.T) {
 	conn, err := http.NewConnection(http.ConnectionConfig{
 		Endpoints: getEndpointsFromEnv(t),
-		TLSConfig: &tls.Config{InsecureSkipVerify: true},
+		Transport: NewConnectionTransport(),
 	})
 	if err != nil {
 		t.Fatalf("Failed to create new http connection: %s", describe(err))
@@ -353,37 +353,6 @@ func TestCreateClientHttpConnection(t *testing.T) {
 	}
 }
 
-// TestCreateClientHttpConnectionCustomTransport creates an HTTP connection to the environment specified
-// endpoints with a custom HTTP roundtripper and creates a client for that.
-func TestCreateClientHttpConnectionCustomTransport(t *testing.T) {
-	conn, err := http.NewConnection(http.ConnectionConfig{
-		Endpoints: getEndpointsFromEnv(t),
-		Transport: &httplib.Transport{},
-		TLSConfig: &tls.Config{InsecureSkipVerify: true},
-	})
-	if err != nil {
-		t.Fatalf("Failed to create new http connection: %s", describe(err))
-	}
-	c, err := driver.NewClient(driver.ClientConfig{
-		Connection:     conn,
-		Authentication: createAuthenticationFromEnv(t),
-	})
-	if err != nil {
-		t.Fatalf("Failed to create new client: %s", describe(err))
-	}
-	timeout := 3 * time.Minute
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-	if up := waitUntilServerAvailable(ctx, c, t); up != nil {
-		t.Fatalf("Connection is not available in %s: %s", timeout, describe(up))
-	}
-	if info, err := c.Version(driver.WithDetails(ctx)); err != nil {
-		t.Errorf("Version failed: %s", describe(err))
-	} else {
-		t.Logf("Got server version %s", info)
-	}
-}
-
 // TestResponseHeader checks the Response.Header function.
 func TestResponseHeader(t *testing.T) {
 	c := createClientFromEnv(t, true)