chore: bump dependencies via dependabot

PRs #3336 #3337 #3338 #3339 Also bump proto tools via siderolabs/tools#133 Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
siderolabs · Mar 22, 2021 · dc294db · dc294db
1 parent 2b1641a
commit dc294db
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 124 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -605,7 +605,7 @@ RUN prototool lint --protoc-bin-path=/toolchain/bin/protoc --protoc-wkt-path=/to
 
 # The markdownlint target performs linting on Markdown files.
 
-FROM node:15.11.0-alpine AS lint-markdown
+FROM node:15.12.0-alpine AS lint-markdown
 RUN apk add --no-cache findutils
 RUN npm i -g markdownlint-cli@0.23.2
 RUN npm i -g textlint@11.7.6

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ REGISTRY_AND_USERNAME := $(IMAGE_REGISTRY)/$(USERNAME)
 DOCKER_LOGIN_ENABLED ?= true
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/talos-systems/tools:v0.5.0-alpha.0-2-gf7bce92
+TOOLS ?= ghcr.io/talos-systems/tools:v0.5.0-alpha.0-3-g41b8073
 PKGS ?= v0.5.0-alpha.0-3-gfdf4866
 EXTRAS ?= v0.3.0-alpha.0-1-gc0fa0c0
 GO_VERSION ?= 1.16

diff --git a/cmd/talosctl/cmd/talos/service.go b/cmd/talosctl/cmd/talos/service.go
@@ -11,7 +11,6 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/peer"
@@ -136,8 +135,7 @@ func serviceInfo(ctx context.Context, c *client.Client, id string) error {
 		for i := range svc.Events.Events {
 			event := svc.Events.Events[len(svc.Events.Events)-1-i]
 
-			//nolint:errcheck
-			ts, _ := ptypes.Timestamp(event.Ts)
+			ts := event.Ts.AsTime()
 			fmt.Fprintf(w, "%s\t[%s]: %s (%s ago)\n", label, event.State, event.Msg, time.Since(ts).Round(time.Second))
 			label = "" //nolint:wastedassign
 		}
@@ -249,8 +247,7 @@ func (svc serviceInfoWrapper) LastUpdated() string {
 		return ""
 	}
 
-	//nolint:errcheck
-	ts, _ := ptypes.Timestamp(svc.Events.Events[len(svc.Events.Events)-1].Ts)
+	ts := svc.Events.Events[len(svc.Events.Events)-1].Ts.AsTime()
 
 	return time.Since(ts).Round(time.Second).String()
 }

diff --git a/cmd/talosctl/cmd/talos/time.go b/cmd/talosctl/cmd/talos/time.go
@@ -11,7 +11,6 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/peer"
@@ -66,16 +65,17 @@ var timeCmd = &cobra.Command{
 					node = msg.Metadata.Hostname
 				}
 
-				localtime, err = ptypes.Timestamp(msg.Localtime)
-				if err != nil {
-					return fmt.Errorf("error parsing local time: %w", err)
+				if !msg.Localtime.IsValid() {
+					return fmt.Errorf("error parsing local time")
 				}
 
-				remotetime, err = ptypes.Timestamp(msg.Remotetime)
-				if err != nil {
-					return fmt.Errorf("error parsing remote time: %w", err)
+				if !msg.Remotetime.IsValid() {
+					return fmt.Errorf("error parsing remote time")
 				}
 
+				localtime = msg.Localtime.AsTime()
+				remotetime = msg.Remotetime.AsTime()
+
 				fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", node, msg.Server, localtime.String(), remotetime.String())
 			}
 

diff --git a/go.mod b/go.mod
@@ -42,8 +42,8 @@ require (
 	github.com/gdamore/tcell/v2 v2.2.0
 	github.com/gizak/termui/v3 v3.1.0
 	github.com/gogo/googleapis v1.4.0 // indirect
-	github.com/golang/protobuf v1.4.3
-	github.com/google/go-cmp v0.5.4
+	github.com/golang/protobuf v1.5.1
+	github.com/google/go-cmp v0.5.5
 	github.com/google/uuid v1.2.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
 	github.com/hashicorp/go-getter v1.5.2
@@ -92,7 +92,7 @@ require (
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b
 	google.golang.org/grpc v1.36.0
-	google.golang.org/protobuf v1.25.0
+	google.golang.org/protobuf v1.26.0
 	gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	honnef.co/go/tools v0.1.2 // indirect

diff --git a/go.sum b/go.sum
@@ -476,8 +476,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
 github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
@@ -493,8 +495,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -1484,8 +1487,10 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod
@@ -3,7 +3,7 @@ module github.com/talos-systems/cloud-image-uploader
 go 1.16
 
 require (
-	github.com/aws/aws-sdk-go v1.37.30
+	github.com/aws/aws-sdk-go v1.38.1
 	github.com/google/uuid v1.2.0
 	github.com/spf13/pflag v1.0.5
 	github.com/talos-systems/go-retry v0.1.1-0.20201113203059-8c63d290a688

diff --git a/hack/cloud-image-uploader/go.sum b/hack/cloud-image-uploader/go.sum
@@ -1,5 +1,5 @@
-github.com/aws/aws-sdk-go v1.37.30 h1:fZeVg3QuTkWE/dEvPQbK6AL32+3G9ofJfGFSPS1XLH0=
-github.com/aws/aws-sdk-go v1.37.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.38.1 h1:dVtNY7+5CtiRfAbEVxm5NgL5Xol8AMNoAf6TkyhDq1I=
+github.com/aws/aws-sdk-go v1.38.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=

diff --git a/internal/app/machined/pkg/system/events/events.go b/internal/app/machined/pkg/system/events/events.go
@@ -7,7 +7,7 @@ package events
 import (
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/talos-systems/talos/internal/app/machined/pkg/system/health"
 	machineapi "github.com/talos-systems/talos/pkg/machinery/api/machine"
@@ -125,8 +125,7 @@ func (events *ServiceEvents) AsProto(count int) *machineapi.ServiceEvents {
 	}
 
 	for i := range eventList {
-		//nolint:errcheck
-		tspb, _ := ptypes.TimestampProto(eventList[i].Timestamp)
+		tspb := timestamppb.New(eventList[i].Timestamp)
 
 		result.Events[i] = &machineapi.ServiceEvent{
 			Msg:   eventList[i].Message,

diff --git a/internal/app/machined/pkg/system/health/status.go b/internal/app/machined/pkg/system/health/status.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	machineapi "github.com/talos-systems/talos/pkg/machinery/api/machine"
 )
@@ -22,8 +22,7 @@ type Status struct {
 
 // AsProto returns protobuf-ready health state.
 func (status *Status) AsProto() *machineapi.ServiceHealth {
-	//nolint:errcheck
-	tspb, _ := ptypes.TimestampProto(status.LastChange)
+	tspb := timestamppb.New(status.LastChange)
 
 	return &machineapi.ServiceHealth{
 		Unknown:     status.Healthy == nil,

diff --git a/internal/app/timed/pkg/reg/reg.go b/internal/app/timed/pkg/reg/reg.go
@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/talos-systems/talos/internal/app/timed/pkg/ntp"
 	healthapi "github.com/talos-systems/talos/pkg/machinery/api/health"
@@ -72,29 +72,15 @@ func (r *Registrator) TimeCheck(ctx context.Context, in *timeapi.TimeRequest) (r
 }
 
 func genProtobufTimeResponse(local, remote time.Time, server string) (*timeapi.TimeResponse, error) {
-	resp := &timeapi.TimeResponse{}
-
-	localpbts, err := ptypes.TimestampProto(local)
-	if err != nil {
-		return resp, err
-	}
-
-	remotepbts, err := ptypes.TimestampProto(remote)
-	if err != nil {
-		return resp, err
-	}
-
-	resp = &timeapi.TimeResponse{
+	return &timeapi.TimeResponse{
 		Messages: []*timeapi.Time{
 			{
 				Server:     server,
-				Localtime:  localpbts,
-				Remotetime: remotepbts,
+				Localtime:  timestamppb.New(local),
+				Remotetime: timestamppb.New(remote),
 			},
 		},
-	}
-
-	return resp, nil
+	}, nil
 }
 
 // Check implements the Health api and provides visibilty into the state of timed.

diff --git a/pkg/machinery/api/cluster/cluster.pb.go b/pkg/machinery/api/cluster/cluster.pb.go
diff --git a/pkg/machinery/api/common/common.pb.go b/pkg/machinery/api/common/common.pb.go
diff --git a/pkg/machinery/api/health/health.pb.go b/pkg/machinery/api/health/health.pb.go
diff --git a/pkg/machinery/api/inspect/inspect.pb.go b/pkg/machinery/api/inspect/inspect.pb.go
diff --git a/pkg/machinery/api/machine/machine.pb.go b/pkg/machinery/api/machine/machine.pb.go