diff --git a/go.mod b/go.mod index f96e5f089..e380005e3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/evanphx/json-patch v4.12.0+incompatible github.com/fsnotify/fsnotify v1.6.0 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.3 github.com/google/gofuzz v1.2.0 github.com/kubernetes-csi/csi-lib-utils v0.12.0 github.com/kubernetes-csi/csi-test/v4 v4.0.2 @@ -17,6 +16,7 @@ require ( github.com/prometheus/common v0.37.0 github.com/spf13/cobra v1.6.1 google.golang.org/grpc v1.51.0 + google.golang.org/protobuf v1.28.1 k8s.io/api v0.27.0 k8s.io/apimachinery v0.27.0 k8s.io/client-go v0.27.0 @@ -38,6 +38,7 @@ require ( github.com/go-openapi/swag v0.22.3 // 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.3 // indirect github.com/google/gnostic v0.6.9 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/uuid v1.3.0 // indirect @@ -61,7 +62,6 @@ require ( golang.org/x/time v0.1.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect - google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/pkg/snapshotter/snapshotter.go b/pkg/snapshotter/snapshotter.go index 20a8cd4d2..2a85b35a6 100644 --- a/pkg/snapshotter/snapshotter.go +++ b/pkg/snapshotter/snapshotter.go @@ -22,7 +22,6 @@ import ( "time" "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/golang/protobuf/ptypes" csirpc "github.com/kubernetes-csi/csi-lib-utils/rpc" "google.golang.org/grpc" @@ -74,10 +73,8 @@ func (s *snapshot) CreateSnapshot(ctx context.Context, snapshotName string, volu } klog.V(5).Infof("CSI CreateSnapshot: %s driver name [%s] snapshot ID [%s] time stamp [%v] size [%d] readyToUse [%v]", snapshotName, driverName, rsp.Snapshot.SnapshotId, rsp.Snapshot.CreationTime, rsp.Snapshot.SizeBytes, rsp.Snapshot.ReadyToUse) - creationTime, err := ptypes.Timestamp(rsp.Snapshot.CreationTime) - if err != nil { - return "", "", time.Time{}, 0, false, err - } + + creationTime := rsp.Snapshot.CreationTime.AsTime() return driverName, rsp.Snapshot.SnapshotId, creationTime, rsp.Snapshot.SizeBytes, rsp.Snapshot.ReadyToUse, nil } @@ -138,9 +135,6 @@ func (s *snapshot) GetSnapshotStatus(ctx context.Context, snapshotID string, sna return false, time.Time{}, 0, fmt.Errorf("can not find snapshot for snapshotID %s", snapshotID) } - creationTime, err := ptypes.Timestamp(rsp.Entries[0].Snapshot.CreationTime) - if err != nil { - return false, time.Time{}, 0, err - } + creationTime := rsp.Entries[0].Snapshot.CreationTime.AsTime() return rsp.Entries[0].Snapshot.ReadyToUse, creationTime, rsp.Entries[0].Snapshot.SizeBytes, nil } diff --git a/pkg/snapshotter/snapshotter_test.go b/pkg/snapshotter/snapshotter_test.go index 14bc59620..1f450dc2e 100644 --- a/pkg/snapshotter/snapshotter_test.go +++ b/pkg/snapshotter/snapshotter_test.go @@ -25,7 +25,6 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/golang/mock/gomock" - "github.com/golang/protobuf/ptypes" "github.com/kubernetes-csi/csi-lib-utils/connection" "github.com/kubernetes-csi/csi-lib-utils/metrics" "github.com/kubernetes-csi/csi-test/v4/driver" @@ -33,6 +32,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/timestamppb" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -68,11 +68,8 @@ func createMockServer(t *testing.T) (*gomock.Controller, *driver.MockCSIDriver, func TestCreateSnapshot(t *testing.T) { defaultName := "snapshot-test" defaultID := "testid" - createTimestamp := ptypes.TimestampNow() - createTime, err := ptypes.Timestamp(createTimestamp) - if err != nil { - t.Fatalf("Failed to convert timestamp to time: %v", err) - } + createTimestamp := timestamppb.Now() + createTime := createTimestamp.AsTime() createSecrets := map[string]string{"foo": "bar"} defaultParameter := map[string]string{ @@ -338,11 +335,8 @@ func TestDeleteSnapshot(t *testing.T) { func TestGetSnapshotStatus(t *testing.T) { defaultID := "testid" size := int64(1000) - createTimestamp := ptypes.TimestampNow() - createTime, err := ptypes.Timestamp(createTimestamp) - if err != nil { - t.Fatalf("Failed to convert timestamp to time: %v", err) - } + createTimestamp := timestamppb.Now() + createTime := createTimestamp.AsTime() defaultRequest := &csi.ListSnapshotsRequest{ SnapshotId: defaultID,