Skip to content

Commit

Permalink
🧹 update all direct dependencies to latest version (#2001)
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-rock authored Oct 1, 2023
1 parent 2c333ad commit 31bd54e
Show file tree
Hide file tree
Showing 50 changed files with 1,064 additions and 1,104 deletions.
8 changes: 8 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ linters:
disable-all: true
enable:
- gofmt
- depguard
# deactivated for now since its slow in github actions
# - govet

Expand All @@ -28,3 +29,10 @@ linters-settings:
- structtag
- lostcancel
disable-all: true

depguard:
rules:
denied-packages:
deny:
- pkg: "gotest.tools"
desc: Should be replaced with "github.com/stretchr/testify/assert"
32 changes: 0 additions & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ define testGoModProvider
cd ${$@_HOME} && gotestsum --junitfile ../../report_${$@_NAME}.xml --format pkgname -- -cover ${$@_PKGS}
endef

define gomodtidyProvider
$(eval $@_HOME = $(1))
$(eval $@_NAME = $(shell basename ${$@_HOME}))
echo "--> go mod tidy ${$@_NAME} in ${$@_HOME}"
cd ${$@_HOME} && go mod tidy
endef

.PHONY: providers
providers: providers/proto providers/config providers/build

Expand Down Expand Up @@ -350,31 +343,6 @@ providers/test:
@$(call testGpModProvider, providers/ms365)
@$(call testGpModProvider, providers/aws)


This comment has been minimized.

Copy link
@czunker

czunker Oct 11, 2023

Contributor

Was this removed by intend? It was useful.

providers/gomodtidy:
# @$(call gomodtidyProvider, providers/core)
# @$(call gomodtidyProvider, providers/network)
# @$(call gomodtidyProvider, providers/os)
@$(call gomodtidyProvider, providers/ipmi)
@$(call gomodtidyProvider, providers/oci)
@$(call gomodtidyProvider, providers/slack)
@$(call gomodtidyProvider, providers/github)
@$(call gomodtidyProvider, providers/gitlab)
@$(call gomodtidyProvider, providers/terraform)
@$(call gomodtidyProvider, providers/vsphere)
@$(call gomodtidyProvider, providers/opcua)
@$(call gomodtidyProvider, providers/okta)
@$(call gomodtidyProvider, providers/google-workspace)
@$(call gomodtidyProvider, providers/arista)
@$(call gomodtidyProvider, providers/equinix)
@$(call gomodtidyProvider, providers/vcd)
@$(call gomodtidyProvider, providers/gcp)
@$(call gomodtidyProvider, providers/k8s)
@$(call gomodtidyProvider, providers/azure)
@$(call gomodtidyProvider, providers/ms365)
@$(call gomodtidyProvider, providers/aws)


lr/test:
go test ./resources/lr/...

Expand Down
2 changes: 1 addition & 1 deletion _motor/providers/awsec2ebs/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"gotest.tools/assert"
"github.com/stretchr/testify/assert"
)

func awsTestConfig() aws.Config {
Expand Down
4 changes: 2 additions & 2 deletions _motor/providers/awsec2ebs/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ package awsec2ebs
import (
"testing"

"gotest.tools/assert"
"github.com/stretchr/testify/assert"
)

func TestParseInstanceId(t *testing.T) {
path := "account/185972265011/region/us-east-1/instance/i-07f67838ada5879af"
id, err := ParseInstanceId(path)
assert.NilError(t, err)
assert.NotNil(t, err)
assert.Equal(t, id.Account, "185972265011")
assert.Equal(t, id.Region, "us-east-1")
assert.Equal(t, id.Id, "i-07f67838ada5879af")
Expand Down
2 changes: 1 addition & 1 deletion cli/reporter/json_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.mondoo.com/cnquery/llx"
"go.mondoo.com/cnquery/providers-sdk/v1/testutils"
"go.mondoo.com/cnquery/shared"
"gotest.tools/assert"
)

var x = testutils.InitTester(testutils.LinuxMock())
Expand Down
53 changes: 26 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ require (
github.com/BurntSushi/toml v1.3.2
github.com/GoogleCloudPlatform/berglas v1.0.3
github.com/Masterminds/semver v1.5.0
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c
github.com/StackExchange/wmi v1.2.1
github.com/alecthomas/participle v0.3.0
github.com/alecthomas/participle/v2 v2.1.0
github.com/aws/aws-sdk-go v1.45.11
github.com/aws/aws-sdk-go v1.45.19
github.com/aws/aws-sdk-go-v2 v1.21.0
github.com/aws/aws-sdk-go-v2/config v1.18.39
github.com/aws/aws-sdk-go-v2/credentials v1.13.37
github.com/aws/aws-sdk-go-v2/config v1.18.42
github.com/aws/aws-sdk-go-v2/credentials v1.13.40
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11
github.com/aws/aws-sdk-go-v2/service/ec2 v1.118.0
github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.16.5
github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0
github.com/aws/aws-sdk-go-v2/service/ec2instanceconnect v1.17.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.3
github.com/aws/aws-sdk-go-v2/service/ssm v1.37.5
github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0
github.com/aws/smithy-go v1.14.2
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20230906235100-ae4cac8b496c
github.com/c-bata/go-prompt v0.2.6
Expand All @@ -43,7 +43,7 @@ require (
github.com/google/go-containerregistry v0.16.1
github.com/google/uuid v1.3.1
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-plugin v1.5.1
github.com/hashicorp/go-plugin v1.5.2
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/vault/api v1.10.0
github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f
Expand All @@ -69,30 +69,29 @@ require (
github.com/segmentio/fasthash v1.0.3
github.com/segmentio/ksuid v1.0.4
github.com/sethvargo/go-password v0.2.0
github.com/spf13/afero v1.9.5
github.com/spf13/afero v1.10.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
github.com/toravir/csd v0.0.0-20200911003203-13ae77ad849c
github.com/ulikunitz/xz v0.5.11
go.mondoo.com/ranger-rpc v0.5.1
go.opentelemetry.io/otel v1.18.0
go.opentelemetry.io/otel v1.19.0
golang.org/x/crypto v0.13.0
golang.org/x/net v0.15.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.12.0
golang.org/x/term v0.12.0
golang.org/x/text v0.13.0
golang.org/x/tools v0.13.0
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb
google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13
google.golang.org/grpc v1.58.1
google.golang.org/grpc v1.58.2
google.golang.org/protobuf v1.31.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools v2.2.0+incompatible
howett.net/plist v1.0.0
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
Expand All @@ -116,10 +115,10 @@ require (
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.opentelemetry.io/otel/metric v1.18.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

Expand Down Expand Up @@ -149,13 +148,13 @@ require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bkielbasa/cyclop v1.2.1 // indirect
Expand Down Expand Up @@ -226,7 +225,7 @@ require (
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
Expand Down Expand Up @@ -346,7 +345,7 @@ require (
github.com/ykadowak/zerologlint v0.1.3 // indirect
gitlab.com/bosi/decorder v0.4.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/trace v1.18.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.tmz.dev/musttag v0.7.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
Expand All @@ -356,9 +355,9 @@ require (
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.141.0 // indirect
google.golang.org/api v0.143.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
Expand All @@ -367,8 +366,8 @@ require (
k8s.io/klog/v2 v2.100.1 // indirect
modernc.org/libc v1.24.1 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.1 // indirect
modernc.org/sqlite v1.25.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/sqlite v1.26.0 // indirect
moul.io/http2curl v1.0.0 // indirect
mvdan.cc/gofumpt v0.5.0 // indirect
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
Expand Down
Loading

0 comments on commit 31bd54e

Please sign in to comment.