Etcd 3.4 & Go 1.16 upgrades (#4229)

.appveyor.yml

@@ -13,7 +13,7 @@ cache:
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.13.15
+  GOVERSION: 1.16
   GO111MODULE: 'on'
   GOPROXY: 'https://proxy.golang.org'
 

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 
 sensu_go_build_env: &sensu_go_build_env
   docker:
-    - image: cimg/go:1.13.15
+    - image: cimg/go:1.16
       auth:
         username: $DOCKER_USERNAME
         password: $DOCKER_PASSWORD

.github/workflows/golangci-lint.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.15
+          go-version: 1.16
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.15
+          go-version: 1.16
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.15
+          go-version: 1.16
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.15
+          go-version: 1.16
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.13.15
+          go-version: 1.16
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:

CHANGELOG.md

@@ -17,6 +17,12 @@ namespaces with initial resources.
 - Add `EntityServiceClass` constant to the `corev2` package, representing BSM Services.
 - Added ResourceTemplate instantiation on namespace creation.
 - Added more context when logging JavaScript filter evaluation errors.
+- Added `etcd-log-level` configuration flag for setting the log level of the
+embedded etcd server.
+
+### Changed
+- Upgraded Go version from 1.13.15 to 1.16.
+- Upgraded Etcd version from 3.3.22 to 3.4.15.
 
 ### Fixed
 - Both V2 & V3 resources are now validated when used with storev2.

api/core/v2/go.mod

@@ -2,8 +2,9 @@ module github.com/sensu/sensu-go/api/core/v2
 
 go 1.13
 
+replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20210226220824-aa7126864d82
+
 require (
-	github.com/coreos/etcd v3.3.22+incompatible
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/echlebek/crock v1.0.1
@@ -16,7 +17,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.6.0
-	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	go.etcd.io/etcd v3.4.15+incompatible
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 )

api/core/v2/health.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 // ClusterHealth holds cluster member status info.

api/core/v2/version.go

@@ -1,7 +1,7 @@
 package v2
 
 import (
-	etcdVersion "github.com/coreos/etcd/version"
+	etcdVersion "go.etcd.io/etcd/version"
 )
 
 // Version holds the current etcd server and cluster version, and the sensu-backend version.

api/core/v3/go.mod

@@ -5,6 +5,7 @@ go 1.13
 replace (
 	github.com/sensu/sensu-go/api/core/v2 => ../v2
 	github.com/sensu/sensu-go/types => ../../../types
+	go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20210226220824-aa7126864d82
 )
 
 require (

backend/agentd/agentd.go

@@ -13,7 +13,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/gogo/protobuf/proto"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
@@ -33,6 +32,7 @@ import (
 	"github.com/sensu/sensu-go/backend/store/v2/etcdstore"
 	"github.com/sensu/sensu-go/transport"
 	"github.com/sirupsen/logrus"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (

backend/agentd/watcher.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/gogo/protobuf/proto"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	corev3 "github.com/sensu/sensu-go/api/core/v3"
@@ -13,6 +12,7 @@ import (
 	storev2 "github.com/sensu/sensu-go/backend/store/v2"
 	etcdstorev2 "github.com/sensu/sensu-go/backend/store/v2/etcdstore"
 	"github.com/sensu/sensu-go/backend/store/v2/wrap"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // GetEntityConfigWatcher watches changes to EntityConfig in etcd and publish them

backend/apid/actions/cluster.go

@@ -3,8 +3,8 @@ package actions
 import (
 	"context"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/sensu/sensu-go/backend/store"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // ClusterController is a thin wrapper around clientv3.Cluster. It exists

backend/apid/actions/cluster_test.go

@@ -4,12 +4,12 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/google/uuid"
 	"github.com/sensu/sensu-go/backend/store"
 	"github.com/sensu/sensu-go/testing/mockstore"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"go.etcd.io/etcd/clientv3"
 	"golang.org/x/net/context"
 )
 
@@ -30,7 +30,14 @@ func (mockCluster) MemberRemove(context.Context, uint64) (*clientv3.MemberRemove
 
 func (mockCluster) MemberUpdate(context.Context, uint64, []string) (*clientv3.MemberUpdateResponse, error) {
 	return new(clientv3.MemberUpdateResponse), nil
+}
+
+func (mockCluster) MemberPromote(context.Context, uint64) (*clientv3.MemberPromoteResponse, error) {
+	return new(clientv3.MemberPromoteResponse), nil
+}
 
+func (mockCluster) MemberAddAsLearner(context.Context, []string) (*clientv3.MemberAddResponse, error) {
+	return new(clientv3.MemberAddResponse), nil
 }
 
 var _ clientv3.Cluster = mockCluster{}

backend/apid/actions/health.go

@@ -3,9 +3,9 @@ package actions
 import (
 	"crypto/tls"
 
-	"github.com/coreos/etcd/clientv3"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/backend/store"
+	"go.etcd.io/etcd/clientv3"
 	"golang.org/x/net/context"
 )
 

backend/apid/actions/version.go

@@ -1,9 +1,9 @@
 package actions
 
 import (
-	etcdVersion "github.com/coreos/etcd/version"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/version"
+	etcdVersion "go.etcd.io/etcd/version"
 	"golang.org/x/net/context"
 )
 

backend/apid/apid.go

@@ -11,9 +11,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"go.etcd.io/etcd/clientv3"
 
 	"github.com/sensu/sensu-go/backend/apid/actions"
 	"github.com/sensu/sensu-go/backend/apid/graphql"

backend/apid/graphql/health.go

@@ -3,10 +3,10 @@ package graphql
 import (
 	"strconv"
 
-	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/backend/apid/graphql/schema"
 	"github.com/sensu/sensu-go/graphql"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 var _ schema.ClusterHealthFieldResolvers = (*clusterHealthImpl)(nil)

backend/apid/graphql/health_test.go

@@ -6,10 +6,10 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/backend/apid/graphql/schema"
 	"github.com/sensu/sensu-go/graphql"
+	"go.etcd.io/etcd/etcdserver/etcdserverpb"
 )
 
 func Test_clusterHealthImpl_Etcd(t *testing.T) {

backend/apid/routers/cluster.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/gorilla/mux"
+	"go.etcd.io/etcd/clientv3"
 )
 
 const defaultTimeout = 3

backend/apid/routers/cluster_test.go

@@ -8,10 +8,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/mock"
+	"go.etcd.io/etcd/clientv3"
 )
 
 type mockClusterController struct {

backend/backend.go

@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/transport"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/viper"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/transport"
 	"golang.org/x/time/rate"
 	"google.golang.org/grpc"
 
@@ -134,6 +134,7 @@ func newClient(ctx context.Context, config *Config, backend *Backend) (*clientv3
 	cfg.Discovery = config.EtcdDiscovery
 	cfg.DiscoverySrv = config.EtcdDiscoverySrv
 	cfg.Name = config.EtcdName
+	cfg.LogLevel = config.EtcdLogLevel
 
 	// Heartbeat interval
 	if config.EtcdHeartbeatInterval > 0 {

backend/backend_test.go

@@ -95,6 +95,7 @@ func TestBackendHTTPListener(t *testing.T) {
 				EtcdClientTLSInfo:            tlsInfo,
 				EtcdPeerTLSInfo:              tlsInfo,
 				EtcdUseEmbeddedClient:        true,
+				EtcdLogLevel:                 "info",
 			}
 			ctx, cancel := context.WithCancel(context.Background())
 			b, err := Initialize(ctx, cfg)

backend/cmd/init.go

@@ -8,15 +8,15 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey"
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/transport"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/backend"
 	"github.com/sensu/sensu-go/backend/etcd"
 	"github.com/sensu/sensu-go/backend/seeds"
 	etcdstore "github.com/sensu/sensu-go/backend/store/etcd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 const (

backend/cmd/start.go

@@ -81,6 +81,7 @@ const (
 	flagEtcdAdvertiseClientURLs      = "etcd-advertise-client-urls"
 	flagEtcdHeartbeatInterval        = "etcd-heartbeat-interval"
 	flagEtcdElectionTimeout          = "etcd-election-timeout"
+	flagEtcdLogLevel                 = "etcd-log-level"
 
 	// Etcd TLS flag constants
 	flagEtcdCertFile           = "etcd-cert-file"
@@ -216,6 +217,7 @@ func StartCommand(initialize InitializeFunc) *cobra.Command {
 				EtcdMaxRequestBytes:          viper.GetUint(flagEtcdMaxRequestBytes),
 				EtcdHeartbeatInterval:        viper.GetUint(flagEtcdHeartbeatInterval),
 				EtcdElectionTimeout:          viper.GetUint(flagEtcdElectionTimeout),
+				EtcdLogLevel:                 viper.GetString(flagEtcdLogLevel),
 				NoEmbedEtcd:                  viper.GetBool(flagNoEmbedEtcd),
 				Labels:                       viper.GetStringMapString(flagLabels),
 				Annotations:                  viper.GetStringMapString(flagAnnotations),
@@ -373,6 +375,7 @@ func handleConfig(cmd *cobra.Command, arguments []string, server bool) error {
 	viper.SetDefault(flagEtcdMaxRequestBytes, etcd.DefaultMaxRequestBytes)
 	viper.SetDefault(flagEtcdHeartbeatInterval, etcd.DefaultTickMs)
 	viper.SetDefault(flagEtcdElectionTimeout, etcd.DefaultElectionMs)
+	viper.SetDefault(flagEtcdLogLevel, "warn")
 
 	if server {
 		viper.SetDefault(flagNoEmbedEtcd, false)
@@ -467,7 +470,8 @@ func flagSet(server bool) *pflag.FlagSet {
 		flagSet.String(flagTrustedCAFile, viper.GetString(flagTrustedCAFile), "TLS CA certificate bundle in PEM format")
 		flagSet.Bool(flagInsecureSkipTLSVerify, viper.GetBool(flagInsecureSkipTLSVerify), "skip TLS verification (not recommended!)")
 		flagSet.Bool(flagDebug, false, "enable debugging and profiling features")
-		flagSet.String(flagLogLevel, viper.GetString(flagLogLevel), "logging level [panic, fatal, error, warn, info, debug]")
+		flagSet.String(flagLogLevel, viper.GetString(flagLogLevel), "logging level [panic, fatal, error, warn, info, debug, trace]")
+		flagSet.String(flagEtcdLogLevel, viper.GetString(flagEtcdLogLevel), "etcd logging level [panic, fatal, error, warn, info, debug]")
 		flagSet.Int(backend.FlagEventdWorkers, viper.GetInt(backend.FlagEventdWorkers), "number of workers spawned for processing incoming events")
 		flagSet.Int(backend.FlagEventdBufferSize, viper.GetInt(backend.FlagEventdBufferSize), "number of incoming events that can be buffered")
 		flagSet.Int(backend.FlagKeepalivedWorkers, viper.GetInt(backend.FlagKeepalivedWorkers), "number of workers spawned for processing incoming keepalives")

backend/cmd/upgrade.go

@@ -8,14 +8,14 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey"
-	"github.com/coreos/etcd/clientv3"
-	"github.com/coreos/etcd/pkg/transport"
 	corev2 "github.com/sensu/sensu-go/api/core/v2"
 	"github.com/sensu/sensu-go/backend"
 	"github.com/sensu/sensu-go/backend/etcd"
 	etcdstore "github.com/sensu/sensu-go/backend/store/etcd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/pkg/transport"
 )
 
 const (

backend/config.go

@@ -104,4 +104,7 @@ type Config struct {
 	EtcdQuotaBackendBytes int64
 
 	TLS *corev2.TLSOptions
+
+	LogLevel     string
+	EtcdLogLevel string
 }