Merge pull request #256 from cybozu-go/update-dependencies

Update dependencies

.github/workflows/main.yaml

@@ -5,7 +5,7 @@ on:
     branches:
       - 'main'
 env:
-  go-version: 1.17
+  go-version: 1.19
   filename: 'main.yaml'
 jobs:
   build:
@@ -21,7 +21,7 @@ jobs:
           go-version: ${{ env.go-version }}
 
       - name: Start etcd container 
-        run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.3
+        run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.4
 
       - name: Install test tools
         run: make SUDO="sudo" test-tools
@@ -98,12 +98,12 @@ jobs:
           go-version: ${{ env.go-version }}
 
       - id: auth
-        uses: google-github-actions/auth@v0.7.0
+        uses: google-github-actions/auth@v0.8.3
         with:
           credentials_json: '${{ secrets.NECO_TEST_SERVICE_ACCOUNT }}'
 
       - name: Set up Cloud SDK for sabakan
-        uses: google-github-actions/setup-gcloud@v0.6.0
+        uses: google-github-actions/setup-gcloud@v0.6.2
 
       - name: Set GCP instance name
         run: echo "INSTANCE_NAME=sabakan-${{ github.run_number }}-$(TZ=Asia/Tokyo date +%H%M%S)" >> $GITHUB_ENV

.github/workflows/release.yaml

@@ -4,7 +4,7 @@ on:
     tags:
       - 'v*'
 env:
-  go-version: 1.17
+  go-version: 1.19
   tag: ${GITHUB_REF#refs/tags/v}
   prerelease: ${{ contains(github.ref, '-') }}
 jobs:
@@ -47,7 +47,7 @@ jobs:
     name: Release GitHub
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cybozu/golang:1.17-focal
+      image: quay.io/cybozu/golang:1.19-focal
     steps:
       - name: Create GitHub release
         run: |

CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+- Update dependencies (#256)
+    - Upgrade direct dependencies in go.mod
+    - Update Golang to 1.19
+    - Update GitHub Actions
+    - Update etcd to 3.5.4
+
 ## [2.13.0] - 2022-04-25
 
 ### Fixed

Makefile

@@ -1,7 +1,7 @@
 # Makefile for sabakan
 
 # configuration variables
-ETCD_VERSION = 3.5.3
+ETCD_VERSION = 3.5.4
 GO_FILES=$(shell find -name '*.go' -not -name '*_test.go')
 BUILT_TARGET=sabakan sabactl sabakan-cryptsetup
 
@@ -22,7 +22,6 @@ check-generate:
 code-check:
 	test -z "$$(gofmt -s -l . | tee /dev/stderr)"
 	staticcheck ./...
-	test -z "$$(nilerr ./... 2>&1 | tee /dev/stderr)"
 	test -z "$$(custom-checker -restrictpkg.packages=html/template,log $$(go list -tags='$(GOTAGS)' ./...) 2>&1 | tee /dev/stderr)"
 	go vet ./...
 
@@ -39,7 +38,7 @@ clean:
 	rm -f $(BUILT_TARGET)
 
 .PHONY: test-tools
-test-tools: custom-checker staticcheck nilerr etcd
+test-tools: custom-checker staticcheck etcd
 
 .PHONY: custom-checker
 custom-checker:
@@ -53,12 +52,6 @@ staticcheck:
 		env GOFLAGS= go install honnef.co/go/tools/cmd/staticcheck@latest; \
 	fi
 
-.PHONY: nilerr
-nilerr:
-	if ! which nilerr >/dev/null; then \
-		env GOFLAGS= go install github.com/gostaticanalysis/nilerr/cmd/nilerr@latest; \
-	fi
-
 .PHONY: etcd
 etcd:
 	if ! which etcd >/dev/null; then \

dhcpd/request.go

@@ -8,9 +8,9 @@ import (
 )
 
 // DHCPREQUEST has three use-cases.
-//   1. accept offer from a server.
-//   2. confirm previously assigned IP address.
-//   3. renew/rebind lease for an already received address.
+//  1. accept offer from a server.
+//  2. confirm previously assigned IP address.
+//  3. renew/rebind lease for an already received address.
 //
 // To distinguish these three, "server identifier" option (54) and
 // "requested IP address" option (50) are used.

go.mod

@@ -1,75 +1,75 @@
 module github.com/cybozu-go/sabakan/v2
 
-go 1.17
+go 1.19
 
 require (
-	github.com/99designs/gqlgen v0.17.2
-	github.com/cybozu-go/etcdutil v1.6.0
+	github.com/99designs/gqlgen v0.17.20
+	github.com/cybozu-go/etcdutil v1.6.1
 	github.com/cybozu-go/log v1.6.1
-	github.com/cybozu-go/netutil v1.4.2
-	github.com/cybozu-go/well v1.11.0
+	github.com/cybozu-go/netutil v1.4.3
+	github.com/cybozu-go/well v1.11.1
 	github.com/flatcar/ignition v0.36.2
-	github.com/google/go-cmp v0.5.7
+	github.com/google/go-cmp v0.5.9
 	github.com/google/go-tpm v0.3.3
-	github.com/hashicorp/go-version v1.4.0
+	github.com/hashicorp/go-version v1.6.0
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.19.0
-	github.com/prometheus/client_golang v1.12.1
-	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.33.0
-	github.com/spf13/cobra v1.4.0
-	github.com/vektah/gqlparser/v2 v2.4.1
+	github.com/onsi/gomega v1.22.1
+	github.com/prometheus/client_golang v1.13.0
+	github.com/prometheus/client_model v0.3.0
+	github.com/prometheus/common v0.37.0
+	github.com/spf13/cobra v1.6.1
+	github.com/vektah/gqlparser/v2 v2.5.1
 	github.com/vincent-petithory/dataurl v1.0.0
-	go.etcd.io/etcd/api/v3 v3.5.3
-	go.etcd.io/etcd/client/v3 v3.5.3
+	go.etcd.io/etcd/api/v3 v3.5.4
+	go.etcd.io/etcd/client/v3 v3.5.4
 	go.universe.tf/netboot v0.0.0-20210617221821-fc2840fa7b05
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+	golang.org/x/crypto v0.1.0
 	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
 	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.10.1 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/spf13/viper v1.13.0 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/vishvananda/netlink v1.1.0 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.3 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
-	go4.org v0.0.0-20181109185143-00e24f1b2599 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.9 // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.45.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
+	github.com/vishvananda/netns v0.0.0-20220913150850-18c4f4234207 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/net v0.1.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/tools v0.2.0 // indirect
+	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
+	google.golang.org/grpc v1.50.1 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )