Skip to content

Commit

Permalink
Merge pull request #5039 from sensu/ck/bump-core-modules
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
amdprophet authored Nov 21, 2023
2 parents 76e247f + 8034d51 commit ac4d6eb
Show file tree
Hide file tree
Showing 14 changed files with 4,027 additions and 938 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cache:
environment:
GOPATH: c:\gopath
GOROOT: c:\Program Files\Go
GOVERSION: 1.17.12
GOVERSION: 1.21.3
GO111MODULE: 'on'
GOPROXY: 'https://proxy.golang.org'

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/static-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ jobs:
name: staticcheck (project)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
with:
fetch-depth: 1
- uses: WillAbides/setup-go-faster@v1.8.0
with:
go-version: "1.21.x"
- uses: dominikh/staticcheck-action@v1.0.0
with:
version: "2021.1.1"
version: "2023.1.6"
install-go: false
cache-key: "1.21.x"
env:
GO_VERSION: 1.17.1
GO_VERSION: 1.21.3
4 changes: 1 addition & 3 deletions agent/check_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/google/uuid"
"github.com/sensu/sensu-go/agent/transformers"
corev2 "github.com/sensu/core/v2"
"github.com/sensu/sensu-go/agent/transformers"
"github.com/sensu/sensu-go/asset"
"github.com/sensu/sensu-go/command"
"github.com/sensu/sensu-go/token"
Expand Down Expand Up @@ -48,8 +48,6 @@ func (a *Agent) handleCheck(ctx context.Context, payload []byte) error {
request := &corev2.CheckRequest{}
if err := a.unmarshal(payload, request); err != nil {
return err
} else if request == nil {
return errors.New("given check configuration appears invalid")
}

checkConfig := request.Config
Expand Down
8 changes: 4 additions & 4 deletions backend/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,13 @@ func NewEtcd(config *Config) (*Etcd, error) {
}

// Client config
cfg.ACUrls = acURLs
cfg.LCUrls = lcURLs
cfg.AdvertiseClientUrls = acURLs
cfg.ListenClientUrls = lcURLs
cfg.ClientTLSInfo = (transport.TLSInfo)(config.ClientTLSInfo)

// Peer config
cfg.APUrls = apURLs
cfg.LPUrls = lpURLs
cfg.AdvertisePeerUrls = apURLs
cfg.ListenPeerUrls = lpURLs
cfg.PeerTLSInfo = (transport.TLSInfo)(config.PeerTLSInfo)

if len(config.CipherSuites) > 0 {
Expand Down
2 changes: 1 addition & 1 deletion backend/messaging/wizard_bus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestBug1407(t *testing.T) {
subscription, err := bus.Subscribe("topic", "a", subscriber)
require.NoError(t, err)
require.NoError(t, subscription.Cancel())
subscription, err = bus.Subscribe("topic", "a", subscriber)
_, err = bus.Subscribe("topic", "a", subscriber)
require.NoError(t, err)
value, _ := bus.topics.Load("topic")
topic := value.(*wizardTopic)
Expand Down
205 changes: 0 additions & 205 deletions backend/store/cache/cache_test.go

This file was deleted.

Loading

0 comments on commit ac4d6eb

Please sign in to comment.