Skip to content

Commit 3e790a6

Browse files
authored
Merge pull request #345 from arangodb-helper/build/upgrade-go1.18.6
Upgrade go to v1.19.4 to fix CVEs
2 parents 6c613ef + 29da34a commit 3e790a6

File tree

7 files changed

+16
-88
lines changed

7 files changed

+16
-88
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ services:
66
language: go
77

88
go:
9-
- "1.17.x"
9+
- "1.19.x"
1010

1111
env:
12-
- VERBOSE=1 MULTIARCH=0 GOIMAGE=gcr.io/gcr-for-testing/golang:1.17.13 ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.11 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb:3.9.2 STARTER_MODES="single,cluster,activefailover"
12+
- VERBOSE=1 MULTIARCH=0 GOIMAGE=gcr.io/gcr-for-testing/golang:1.19.4 ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.11 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb:3.9.2 STARTER_MODES="single,cluster,activefailover"
1313

1414
install:
1515
- make init

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [master](https://github.com/arangodb-helper/arangodb/tree/master) (N/A)
44
- Fix restarting cluster with arangosync enabled
5+
- Upgrade Go to v1.19.4 to fix CVEs
56

67
## [0.15.5](https://github.com/arangodb-helper/arangodb/tree/0.15.5) (2022-09-19)
78
- Fix project CI: linter, tests, build, release

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ REPODIR := $(ORGDIR)/$(REPONAME)
3535
REPOPATH := $(ORGPATH)/$(REPONAME)
3636

3737
GOPATH := $(GOBUILDDIR)
38-
GOVERSION := 1.17.13
39-
GOIMAGE ?= golang:$(GOVERSION)-alpine3.16
38+
GOVERSION := 1.19.4
39+
GOIMAGE ?= golang:$(GOVERSION)-alpine3.17
4040

4141
GOOS ?= linux
4242
GOARCH ?= amd64

go.mod

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/arangodb-helper/arangodb
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680
@@ -31,17 +31,13 @@ require (
3131
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
3232
github.com/containerd/cgroups v1.0.3 // indirect
3333
github.com/containerd/containerd v1.6.6 // indirect
34-
github.com/containerd/continuity v0.2.2 // indirect
3534
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/docker/distribution v2.7.1+incompatible // indirect
3735
github.com/docker/docker v20.10.17+incompatible // indirect
3836
github.com/docker/go-connections v0.4.0 // indirect
3937
github.com/docker/go-units v0.4.0 // indirect
4038
github.com/gogo/protobuf v1.3.2 // indirect
4139
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
42-
github.com/golang/protobuf v1.5.2 // indirect
4340
github.com/inconshreveable/mousetrap v1.0.0 // indirect
44-
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
4541
github.com/mattn/go-colorable v0.1.7 // indirect
4642
github.com/mattn/go-isatty v0.0.12 // indirect
4743
github.com/moby/sys/mount v0.3.3 // indirect
@@ -55,11 +51,7 @@ require (
5551
github.com/pmezard/go-difflib v1.0.0 // indirect
5652
github.com/sirupsen/logrus v1.8.1 // indirect
5753
go.opencensus.io v0.23.0 // indirect
58-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
5954
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
6055
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
61-
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
62-
google.golang.org/grpc v1.43.0 // indirect
63-
gopkg.in/yaml.v2 v2.4.0 // indirect
6456
gopkg.in/yaml.v3 v3.0.1 // indirect
6557
)

go.sum

Lines changed: 8 additions & 73 deletions
Large diffs are not rendered by default.

service/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func copyBoolRef(v *bool) *bool {
7070
return boolRef(*v)
7171
}
7272

73-
// boolFromRef returns a boolean from given reference, returning given default value
73+
// boolFromRef returns a boolean from given reference, returning given default value
7474
// when reference is nil.
7575
func boolFromRef(v *bool, defaultValue bool) bool {
7676
if v == nil {

test/process_cluster_resign_leadership_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func getShardsForCollection(client driver.Client, database driver.Database,
264264
return nil, errors.Errorf("there are no shards for the collection %s", collectionName)
265265
}
266266

267-
//getServerIDLeaderForFirstShard returns server ID of the leader shard.
267+
// getServerIDLeaderForFirstShard returns server ID of the leader shard.
268268
func getServerIDLeaderForFirstShard(client driver.Client, database driver.Database,
269269
collectionName string) (driver.ServerID, error) {
270270
newShards, err := getShardsForCollection(client, database, collectionName)

0 commit comments

Comments
 (0)