Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating deprecated packages #326

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Updating deprecated packages #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
github.com/fsnotify/fsnotify v1.7.0
github.com/go-openapi/strfmt v0.21.3
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/kubernetes-csi/csi-lib-utils v0.11.0
Expand Down Expand Up @@ -56,6 +55,7 @@ require (
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/dell/csi-powerstore/v2/pkg/common"
"github.com/dell/gopowerstore"
"github.com/golang/protobuf/ptypes"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/timestamppb"
)

const (
Expand Down Expand Up @@ -117,7 +117,7 @@ func getCSISnapshot(snapshotID string, sourceVolumeID string, sizeInBytes int64)
SizeBytes: sizeInBytes,
SnapshotId: snapshotID,
SourceVolumeId: sourceVolumeID,
CreationTime: ptypes.TimestampNow(),
CreationTime: timestamppb.Now(),
ReadyToUse: true,
}
return snap
Expand Down
3 changes: 1 addition & 2 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
vgsext "github.com/dell/dell-csi-extensions/volumeGroupSnapshot"
csictx "github.com/dell/gocsi/context"
"github.com/dell/gopowerstore"
"github.com/golang/protobuf/ptypes/wrappers"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -1328,7 +1327,7 @@ func (s *Service) RegisterAdditionalServers(server *grpc.Server) {

// ProbeController probes the controller service
func (s *Service) ProbeController(_ context.Context, _ *commonext.ProbeControllerRequest) (*commonext.ProbeControllerResponse, error) {
ready := new(wrappers.BoolValue)
ready := new(wrapperspb.BoolValue)
ready.Value = true
rep := new(commonext.ProbeControllerResponse)
rep.Ready = ready
Expand Down
4 changes: 2 additions & 2 deletions pkg/identity/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"context"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/protobuf/ptypes/wrappers"
"google.golang.org/protobuf/types/known/wrapperspb"
)

// NewIdentityService creates new identity service
Expand Down Expand Up @@ -92,5 +92,5 @@ func (s Service) GetPluginCapabilities(_ context.Context, _ *csi.GetPluginCapabi

// Probe returns current state of the driver and if it is ready to receive requests
func (s Service) Probe(_ context.Context, _ *csi.ProbeRequest) (*csi.ProbeResponse, error) {
return &csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: s.ready}}, nil
return &csi.ProbeResponse{Ready: &wrapperspb.BoolValue{Value: s.ready}}, nil
}
4 changes: 2 additions & 2 deletions pkg/identity/identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/dell/csi-powerstore/v2/pkg/common"
"github.com/golang/protobuf/ptypes/wrappers"
ginkgo "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/reporters"
gomega "github.com/onsi/gomega"
"google.golang.org/protobuf/types/known/wrapperspb"
)

var idntySvc *Service
Expand Down Expand Up @@ -103,7 +103,7 @@ var _ = ginkgo.Describe("CSIIdentityService", func() {
ginkgo.It("should return current status'", func() {
res, err := idntySvc.Probe(context.Background(), &csi.ProbeRequest{})
gomega.Expect(err).To(gomega.BeNil())
gomega.Expect(res).To(gomega.Equal(&csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: idntySvc.ready}}))
gomega.Expect(res).To(gomega.Equal(&csi.ProbeResponse{Ready: &wrapperspb.BoolValue{Value: idntySvc.ready}}))
})
})
})
4 changes: 2 additions & 2 deletions tests/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.22.0

require (
github.com/onsi/gomega v1.29.0
k8s.io/kubernetes v1.29.0
k8s.io/kubernetes v1.29.4
//sigs.k8s.io/vsphere-csi-driver/v2 v2.5.1
sigs.k8s.io/yaml v1.4.0 // indirect
)
Expand Down Expand Up @@ -70,7 +70,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cadvisor v0.48.1 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
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.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
Expand Down Expand Up @@ -716,8 +716,8 @@ k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
k8s.io/kubelet v0.29.0 h1:SX5hlznTBcGIrS1scaf8r8p6m3e475KMifwt9i12iOk=
k8s.io/kubelet v0.29.0/go.mod h1:kvKS2+Bz2tgDOG1S1q0TH2z1DasNuVF+8p6Aw7xvKkI=
k8s.io/kubernetes v1.29.0 h1:DOLN7g8+nnAYBi8JHoW0+/MCrZKDPIqAxzLCXDXd0cg=
k8s.io/kubernetes v1.29.0/go.mod h1:9kztbUQf9stVDcIYXx+BX3nuGCsAQDsuClkGMpPs3pA=
k8s.io/kubernetes v1.29.4 h1:n4VCbX9cUhxHI+zw+m2iZlzT73/mrEJBHIMeauh9g4U=
k8s.io/kubernetes v1.29.4/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk=
k8s.io/mount-utils v0.29.0 h1:KcUE0bFHONQC10V3SuLWQ6+l8nmJggw9lKLpDftIshI=
k8s.io/mount-utils v0.29.0/go.mod h1:N3lDK/G1B8R/IkAt4NhHyqB07OqEr7P763z3TNge94U=
k8s.io/pod-security-admission v0.29.0 h1:tY/ldtkbBCulMYVSWg6ZDLlgDYDWy6rLj8e/AgmwSj4=
Expand Down