Skip to content

Commit

Permalink
feat: upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidebianchi
davidebianchi committed Jan 8, 2022
1 parent 986c55f commit b2c2d47
Show file tree
Hide file tree
Showing 5 changed files with 277 additions and 110 deletions.
6 changes: 1 addition & 5 deletions controllers/sleepinfo/resource/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,16 @@ func (r ResourceClient) SSAPatch(ctx context.Context, newObj client.Object) erro

var errClientEmpty = "client is empty"
var errSleepInfoEmpty = "sleepInfo is nil"
var errLogEmpty = "log is empty"

func (r ResourceClient) IsClientValid() error {
if r.Client != nil && r.SleepInfo != nil && r.Log != nil {
if r.Client != nil && r.SleepInfo != nil {
return nil
}

errStrings := []string{}
if r.Client == nil {
errStrings = append(errStrings, errClientEmpty)
}
if r.Log == nil {
errStrings = append(errStrings, errLogEmpty)
}
if r.SleepInfo == nil {
errStrings = append(errStrings, errSleepInfoEmpty)
}
Expand Down
27 changes: 9 additions & 18 deletions controllers/sleepinfo/resource/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,13 @@ func TestResource(t *testing.T) {
t.Run("without any field", func(t *testing.T) {
r := ResourceClient{}

require.EqualError(t, r.IsClientValid(), fmt.Sprintf("%s: %s and %s and %s", ErrInvalidClient, errClientEmpty, errLogEmpty, errSleepInfoEmpty))
})

t.Run("without Log", func(t *testing.T) {
r := ResourceClient{
Client: fake.NewClientBuilder().Build(),
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
}

require.EqualError(t, r.IsClientValid(), fmt.Sprintf("%s: %s", ErrInvalidClient, errLogEmpty))
require.EqualError(t, r.IsClientValid(), fmt.Sprintf("%s: %s and %s", ErrInvalidClient, errClientEmpty, errSleepInfoEmpty))
})

t.Run("without SleepInfo", func(t *testing.T) {
r := ResourceClient{
Client: fake.NewClientBuilder().Build(),
Log: logr.DiscardLogger{},
Log: logr.Discard(),
}

require.EqualError(t, r.IsClientValid(), fmt.Sprintf("%s: %s", ErrInvalidClient, errSleepInfoEmpty))
Expand All @@ -66,7 +57,7 @@ func TestResource(t *testing.T) {
t.Run("without Client", func(t *testing.T) {
r := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
}

require.EqualError(t, r.IsClientValid(), fmt.Sprintf("%s: %s", ErrInvalidClient, errClientEmpty))
Expand All @@ -75,7 +66,7 @@ func TestResource(t *testing.T) {
t.Run("valid client", func(t *testing.T) {
r := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: fake.NewClientBuilder().Build(),
}

Expand All @@ -94,7 +85,7 @@ func TestResource(t *testing.T) {
k8sClient := fake.NewClientBuilder().WithRuntimeObjects(&deployment).Build()
c := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
}

Expand All @@ -116,7 +107,7 @@ func TestResource(t *testing.T) {
k8sClient := fake.NewClientBuilder().WithRuntimeObjects(&deployment).Build()
c := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
}

Expand All @@ -135,7 +126,7 @@ func TestResource(t *testing.T) {
k8sClient := fake.NewClientBuilder().Build()
c := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
}

Expand All @@ -161,7 +152,7 @@ func TestResource(t *testing.T) {
}
c := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
}

Expand All @@ -188,7 +179,7 @@ func TestResource(t *testing.T) {
}
c := ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
}

Expand Down
2 changes: 1 addition & 1 deletion controllers/sleepinfo/resource/ssa_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var _ = Describe("Server side apply integration tests", func() {
resource = upsertResource(context.Background(), namespace)
c = ResourceClient{
SleepInfo: &kubegreenv1alpha1.SleepInfo{},
Log: logr.DiscardLogger{},
Log: logr.Discard(),
Client: k8sClient,
FieldManagerName: "kube-green-test",
}
Expand Down
55 changes: 28 additions & 27 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ module github.com/kube-green/kube-green
go 1.17

require (
github.com/go-logr/logr v0.4.0
github.com/go-logr/logr v1.2.2
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/robfig/cron/v3 v3.0.1
github.com/stretchr/testify v1.7.0
k8s.io/api v0.22.4
k8s.io/apimachinery v0.22.4
k8s.io/client-go v0.22.4
sigs.k8s.io/controller-runtime v0.10.3
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1
k8s.io/client-go v0.23.1
sigs.k8s.io/controller-runtime v0.11.0
)

require (
cloud.google.com/go v0.54.0 // indirect
cloud.google.com/go v0.81.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
Expand All @@ -25,10 +25,10 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/zapr v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/zapr v1.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand All @@ -37,40 +37,41 @@ require (
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.26.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // 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.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.22.2 // indirect
k8s.io/component-base v0.22.2 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/apiextensions-apiserver v0.23.0 // indirect
k8s.io/component-base v0.23.0 // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

0 comments on commit b2c2d47

Please sign in to comment.