From 10f2ededcbc1c62b925ea9e6f1bf4f2253b0d02e Mon Sep 17 00:00:00 2001 From: Sergey Berezansky Date: Thu, 26 Oct 2023 10:48:29 +0300 Subject: [PATCH] feat(CSI-166): update CSI spec to 1.9.0 --- go.mod | 2 +- go.sum | 4 ++-- pkg/wekafs/controllerserver.go | 5 +++++ pkg/wekafs/volumeconstructors.go | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9457833be..c1491b342 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/wekafs/csi-wekafs go 1.20 require ( - github.com/container-storage-interface/spec v1.8.0 + github.com/container-storage-interface/spec v1.9.0 github.com/google/go-querystring v1.1.0 github.com/google/uuid v1.3.1 github.com/hashicorp/go-version v1.6.0 diff --git a/go.sum b/go.sum index d4e6fd947..474056570 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI= -github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0= +github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY= +github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= diff --git a/pkg/wekafs/controllerserver.go b/pkg/wekafs/controllerserver.go index a89c9fd79..b84cc8708 100644 --- a/pkg/wekafs/controllerserver.go +++ b/pkg/wekafs/controllerserver.go @@ -99,6 +99,11 @@ func (cs *ControllerServer) ControllerGetVolume(context.Context, *csi.Controller panic("implement me") } +//goland:noinspection GoUnusedParameter +func (cs *ControllerServer) ControllerModifyVolume(context.Context, *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) { + panic("implement me") +} + func NewControllerServer(nodeID string, api *ApiStore, mounter *wekaMounter, config *DriverConfig) *ControllerServer { exposedCapabilities := []csi.ControllerServiceCapability_RPC_Type{ csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME, diff --git a/pkg/wekafs/volumeconstructors.go b/pkg/wekafs/volumeconstructors.go index 06c96ee7c..b74eeb62c 100644 --- a/pkg/wekafs/volumeconstructors.go +++ b/pkg/wekafs/volumeconstructors.go @@ -263,7 +263,7 @@ func NewVolumeForCloneVolumeRequest(ctx context.Context, req *csi.CreateVolumeRe requestedVolumeName := req.GetName() var mountPath string - + filesystemName := GetFSNameFromRequest(req) sourceVolId := req.GetVolumeContentSource().GetVolume().GetVolumeId() // we can assume no nil pointer as the function is called only if it happens if sourceVolId == "" {