This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica-go.git
The following commit(s) were added to refs/heads/master by this push:
new d5f551c [CALCITE-3024] Update dependencies
d5f551c is described below
commit d5f551ca1787f78bec805b6fb5213c65c1b2371d
Author: Francis Chuang <[email protected]>
AuthorDate: Fri Apr 26 09:21:36 2019 +1000
[CALCITE-3024] Update dependencies
---
Gopkg.lock | 35 +++++++++++++++++------------------
Gopkg.toml | 8 ++++----
go.mod | 15 +++++++--------
go.sum | 35 +++++++++++++++--------------------
http_client.go | 22 +++++++++++++---------
5 files changed, 56 insertions(+), 59 deletions(-)
diff --git a/Gopkg.lock b/Gopkg.lock
index 4ef05df..3af6021 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,20 +2,20 @@
[[projects]]
- digest = "1:97df918963298c287643883209a2c3f642e6593379f97ab400c2a2e219ab647d"
+ digest = "1:318f1c959a8a740366fce4b1e1eb2fd914036b4af58fbd0a003349b305f118ad"
name = "github.com/golang/protobuf"
packages = ["proto"]
pruneopts = "UT"
- revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
- version = "v1.2.0"
+ revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30"
+ version = "v1.3.1"
[[projects]]
- digest = "1:12ed7dcca9531e58c65cdadb8af0052724bef7fa1581380523fb9cb1215faf0d"
+ digest = "1:f14364057165381ea296e49f8870a9ffce2b8a95e34d6ae06c759106aaef428c"
name = "github.com/hashicorp/go-uuid"
packages = ["."]
pruneopts = "UT"
- revision = "de160f5c59f693fed329e73e291bb751fe4ea4dc"
- version = "v1.0.0"
+ revision = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"
+ version = "v1.0.1"
[[projects]]
branch = "master"
@@ -26,7 +26,7 @@
"x/crypto/pbkdf2",
]
pruneopts = "UT"
- revision = "2aebee971930cd0dd525873330952ab7df5ac95c"
+ revision = "dc7c13fece037a4a36e2b3c69db4991498d30692"
[[projects]]
digest = "1:220454f22582ee261c09b310a14e6979886069808a696005c5ca998f80eca0cf"
@@ -38,14 +38,14 @@
[[projects]]
branch = "master"
- digest = "1:706aaf5e43c7dc00fe3fe91015cf8ef07e50736356c8acf924a061ccb1845237"
+ digest = "1:04b43fe96213ea69cfa6e6b8be218a43a375035ea09d9bdda9fed2691f5a7e76"
name = "golang.org/x/crypto"
packages = [
"md4",
"pbkdf2",
]
pruneopts = "UT"
- revision = "0709b304e793a5edb4a2c0145f281ecdc20838a4"
+ revision = "c05e17bb3b2dca130fc919668a96b4bec9eb9442"
[[projects]]
digest = "1:c902038ee2d6f964d3b9f2c718126571410c5d81251cbab9fe58abd37803513c"
@@ -64,8 +64,8 @@
version = "v1.0.1"
[[projects]]
- digest = "1:310dfc2c375c2bd4cfcf0e0603403ac8a5d9448116ade9309c691c54f78ac9df"
- name = "gopkg.in/jcmturner/gokrb5.v6"
+ digest = "1:5842913724551997c82539fc690ea003cc88cffc0122fd797bd3d08a55a14dd6"
+ name = "gopkg.in/jcmturner/gokrb5.v7"
packages = [
"asn1tools",
"client",
@@ -78,7 +78,6 @@
"crypto/rfc3962",
"crypto/rfc4757",
"crypto/rfc8009",
- "gssapi",
"iana",
"iana/addrtype",
"iana/adtype",
@@ -99,8 +98,8 @@
"types",
]
pruneopts = "UT"
- revision = "c01bd1a96a4147499899e47bfba0d8482f42dcd0"
- version = "v6.0.1"
+ revision = "7b6b2f54b7fda31a47cd7e68ca8485dedeb0e1ed"
+ version = "v7.2.3"
[[projects]]
digest = "1:0f16d9c577198e3b8d3209f5a89aabe679525b2aba2a7548714e973035c0e232"
@@ -120,10 +119,10 @@
"github.com/golang/protobuf/proto",
"github.com/hashicorp/go-uuid",
"github.com/xinsnake/go-http-digest-auth-client",
- "gopkg.in/jcmturner/gokrb5.v6/client",
- "gopkg.in/jcmturner/gokrb5.v6/config",
- "gopkg.in/jcmturner/gokrb5.v6/credentials",
- "gopkg.in/jcmturner/gokrb5.v6/keytab",
+ "gopkg.in/jcmturner/gokrb5.v7/client",
+ "gopkg.in/jcmturner/gokrb5.v7/config",
+ "gopkg.in/jcmturner/gokrb5.v7/credentials",
+ "gopkg.in/jcmturner/gokrb5.v7/keytab",
]
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index b046eb9..b733bdc 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -27,19 +27,19 @@
[[constraint]]
name = "github.com/golang/protobuf"
- version = "1.2.0"
+ version = "1.3.1"
[[constraint]]
name = "github.com/xinsnake/go-http-digest-auth-client"
version = "0.4.0"
[[constraint]]
- name = "gopkg.in/jcmturner/gokrb5.v6"
- version = "6.0.1"
+ name = "gopkg.in/jcmturner/gokrb5.v7"
+ version = "7.2.3"
[[constraint]]
name = "github.com/hashicorp/go-uuid"
- version = "1.0.0"
+ version = "1.0.1"
[prune]
go-tests = true
diff --git a/go.mod b/go.mod
index 6030f37..5737933 100644
--- a/go.mod
+++ b/go.mod
@@ -1,17 +1,16 @@
module github.com/apache/calcite-avatica-go/v3
+go 1.12
+
require (
- github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/golang/protobuf v1.2.0
- github.com/hashicorp/go-uuid v1.0.0
- github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930 //
indirect
- github.com/stretchr/testify v1.3.0 // indirect
+ github.com/golang/protobuf v1.3.1
+ github.com/hashicorp/go-uuid v1.0.1
+ github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03 //
indirect
github.com/xinsnake/go-http-digest-auth-client v0.4.0
- golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
+ golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
- gopkg.in/jcmturner/gokrb5.v6 v6.1.1
+ gopkg.in/jcmturner/gokrb5.v7 v7.2.3
gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect
)
diff --git a/go.sum b/go.sum
index 9a92a50..f49301f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,30 +1,25 @@
-github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/protobuf v1.2.0
h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/hashicorp/go-uuid v1.0.0
h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
-github.com/hashicorp/go-uuid v1.0.0/go.mod
h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930
h1:v4CYlQ+HeysPHsr2QFiEO60gKqnvn1xwvuKhhAhuEkk=
-github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod
h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/pmezard/go-difflib v1.0.0
h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod
h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod
h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0
h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod
h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/golang/protobuf v1.3.1
h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/hashicorp/go-uuid v1.0.1
h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
+github.com/hashicorp/go-uuid v1.0.1/go.mod
h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03
h1:FUwcHNlEqkqLjLBdCp5PRlCFijNjvcYANOZXzCfXwCM=
+github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod
h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
github.com/xinsnake/go-http-digest-auth-client v0.4.0
h1:tTaEBUSDiMi7RDIuj0fy/pszIub8g2DmLjTelB3/3Tk=
github.com/xinsnake/go-http-digest-auth-client v0.4.0/go.mod
h1:QK1t1v7ylyGb363vGWu+6Irh7gyFj+N7+UZzM0L6g8I=
-golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc
h1:F5tKCVGp+MUAHhKp5MZtGqAlGX3+oCsiL1Q629FL90M=
-golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d
h1:adrbvkTDn9rGnXg2IJDKozEpXXLZN89pdIA+Syt4/u0=
+golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d/go.mod
h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod
h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/jcmturner/aescts.v1 v1.0.1
h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw=
gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod
h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
gopkg.in/jcmturner/dnsutils.v1 v1.0.1
h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM=
gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod
h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
gopkg.in/jcmturner/goidentity.v3 v3.0.0
h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI=
gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod
h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
-gopkg.in/jcmturner/gokrb5.v6 v6.1.1
h1:n0KFjpbuM5pFMN38/Ay+Br3l91netGSVqHPHEXeWUqk=
-gopkg.in/jcmturner/gokrb5.v6 v6.1.1/go.mod
h1:NFjHNLrHQiruory+EmqDXCGv6CrjkeYeA+bR9mIfNFk=
+gopkg.in/jcmturner/gokrb5.v7 v7.2.3
h1:hHMV/yKPwMnJhPuPx7pH2Uw/3Qyf+thJYlisUc44010=
+gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod
h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
gopkg.in/jcmturner/rpc.v1 v1.1.0
h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod
h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
diff --git a/http_client.go b/http_client.go
index f7b4ffe..ce48e0a 100644
--- a/http_client.go
+++ b/http_client.go
@@ -32,10 +32,11 @@ import (
avaticaMessage "github.com/apache/calcite-avatica-go/v3/message"
"github.com/golang/protobuf/proto"
"github.com/xinsnake/go-http-digest-auth-client"
- "gopkg.in/jcmturner/gokrb5.v6/client"
- "gopkg.in/jcmturner/gokrb5.v6/config"
- "gopkg.in/jcmturner/gokrb5.v6/credentials"
- "gopkg.in/jcmturner/gokrb5.v6/keytab"
+ "gopkg.in/jcmturner/gokrb5.v7/client"
+ "gopkg.in/jcmturner/gokrb5.v7/config"
+ "gopkg.in/jcmturner/gokrb5.v7/credentials"
+ "gopkg.in/jcmturner/gokrb5.v7/keytab"
+ gokrbSPNEGO "gopkg.in/jcmturner/gokrb5.v7/spnego"
)
var (
@@ -59,7 +60,7 @@ type httpClient struct {
host string
authConfig httpClientAuthConfig
httpClient *http.Client
- kerberosClient client.Client
+ kerberosClient *client.Client
}
type avaticaError struct {
@@ -108,7 +109,7 @@ func NewHTTPClient(host string, authenticationConf
httpClientAuthConfig) (*httpC
return nil, fmt.Errorf("error reading kerberos
ticket cache: %s", err)
}
- kc, err := client.NewClientFromCCache(tc)
+ kc, err := client.NewClientFromCCache(tc,
config.NewConfig())
if err != nil {
return nil, fmt.Errorf("error creating kerberos
client: %s", err)
}
@@ -129,8 +130,7 @@ func NewHTTPClient(host string, authenticationConf
httpClientAuthConfig) (*httpC
return nil, fmt.Errorf("error reading kerberos
keytab: %s", err)
}
- kc :=
client.NewClientWithKeytab(authenticationConf.principal.username,
authenticationConf.principal.realm, kt)
- kc.WithConfig(cfg)
+ kc :=
client.NewClientWithKeytab(authenticationConf.principal.username,
authenticationConf.principal.realm, kt, cfg)
err = kc.Login()
@@ -176,7 +176,11 @@ func (c *httpClient) post(ctx context.Context, message
proto.Message) (proto.Mes
if c.authConfig.authenticationType == basic {
req.SetBasicAuth(c.authConfig.username, c.authConfig.password)
} else if c.authConfig.authenticationType == spnego {
- c.kerberosClient.SetSPNEGOHeader(req, "")
+ err := gokrbSPNEGO.SetSPNEGOHeader(c.kerberosClient, req, "")
+
+ if err != nil{
+ return nil, err
+ }
}
req = req.WithContext(ctx)
