Skip to content

Commit 7304aa7

Browse files
deepakkinnideepakkinni
committed
Update CSI spec dependency
Signed-off-by: Deepak Kinni <[email protected]>
1 parent 4479e24 commit 7304aa7

File tree

10 files changed

+99
-86
lines changed

10 files changed

+99
-86
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.8
55
require (
66
github.com/agiledragon/gomonkey/v2 v2.3.1
77
github.com/akutz/gofsutil v0.1.2
8-
github.com/container-storage-interface/spec v1.9.0
8+
github.com/container-storage-interface/spec v1.11.0
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1010
github.com/evanphx/json-patch/v5 v5.9.0
1111
github.com/fsnotify/fsnotify v1.7.0
@@ -27,6 +27,7 @@ require (
2727
go.uber.org/zap v1.26.0
2828
golang.org/x/crypto v0.26.0
2929
golang.org/x/sync v0.10.0
30+
golang.org/x/sys v0.24.0
3031
google.golang.org/grpc v1.67.1
3132
google.golang.org/protobuf v1.34.2
3233
gopkg.in/gcfg.v1 v1.2.3
@@ -164,7 +165,6 @@ require (
164165
go.uber.org/multierr v1.11.0 // indirect
165166
golang.org/x/net v0.28.0 // indirect
166167
golang.org/x/oauth2 v0.22.0 // indirect
167-
golang.org/x/sys v0.24.0 // indirect
168168
golang.org/x/term v0.23.0 // indirect
169169
golang.org/x/text v0.21.0 // indirect
170170
golang.org/x/time v0.5.0 // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnx
6464
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6565
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
6666
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
67-
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
68-
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
67+
github.com/container-storage-interface/spec v1.11.0 h1:H/YKTOeUZwHtyPOr9raR+HgFmGluGCklulxDYxSdVNM=
68+
github.com/container-storage-interface/spec v1.11.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI=
6969
github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
7070
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
7171
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=

‎pkg/csi/service/common/types.go

+6-14
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,17 @@ var (
3030
// BlockVolumeCaps represents how the block volume could be accessed.
3131
// CNS block volumes support only SINGLE_NODE_WRITER where the volume is
3232
// attached to a single node at any given time.
33-
BlockVolumeCaps = []csi.VolumeCapability_AccessMode{
34-
{
35-
Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
36-
},
33+
BlockVolumeCaps = []csi.VolumeCapability_AccessMode_Mode{
34+
csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
3735
}
3836

3937
// FileVolumeCaps represents how the file volume could be accessed.
4038
// CNS file volumes supports MULTI_NODE_READER_ONLY, MULTI_NODE_SINGLE_WRITER
4139
// and MULTI_NODE_MULTI_WRITER
42-
FileVolumeCaps = []csi.VolumeCapability_AccessMode{
43-
{
44-
Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
45-
},
46-
{
47-
Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
48-
},
49-
{
50-
Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
51-
},
40+
FileVolumeCaps = []csi.VolumeCapability_AccessMode_Mode{
41+
csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY,
42+
csi.VolumeCapability_AccessMode_MULTI_NODE_SINGLE_WRITER,
43+
csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
5244
}
5345

5446
// ErrNotFound represents not found error

‎pkg/csi/service/common/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ func IsVolumeReadOnly(capability *csi.VolumeCapability) bool {
165165
// validateVolumeCapabilities validates the access mode in given volume
166166
// capabilities in validAccessModes.
167167
func validateVolumeCapabilities(volCaps []*csi.VolumeCapability,
168-
validAccessModes []csi.VolumeCapability_AccessMode, volumeType string) error {
168+
validAccessModes []csi.VolumeCapability_AccessMode_Mode, volumeType string) error {
169169
// Validate if all capabilities of the volume are supported.
170170
for _, volCap := range volCaps {
171171
found := false
172172
for _, validAccessMode := range validAccessModes {
173-
if volCap.AccessMode.GetMode() == validAccessMode.GetMode() {
173+
if volCap.AccessMode.GetMode() == validAccessMode {
174174
found = true
175175
break
176176
}

‎pkg/csi/service/driver.go

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ type vsphereCSIDriver struct {
6767
// A map storing all volumes with ongoing operations so that additional operations
6868
// for that same volume (as defined by VolumeID) return an Aborted error
6969
volumeLocks *node.VolumeLocks
70+
csi.UnimplementedNodeServer
71+
csi.UnimplementedIdentityServer
7072
}
7173

7274
// If k8s node died unexpectedly in an earlier run, the unix socket is left

‎pkg/csi/service/node.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"os"
2222
"strconv"
2323

24+
"google.golang.org/protobuf/encoding/prototext"
25+
2426
"github.com/container-storage-interface/spec/lib/go/csi"
2527
cnstypes "github.com/vmware/govmomi/cns/types"
2628
"github.com/vmware/govmomi/units"
@@ -52,7 +54,7 @@ func (driver *vsphereCSIDriver) NodeStageVolume(
5254
*csi.NodeStageVolumeResponse, error) {
5355
ctx = logger.NewContextWithLogger(ctx)
5456
log := logger.GetLogger(ctx)
55-
log.Infof("NodeStageVolume: called with args %+v", *req)
57+
log.Infof("NodeStageVolume: called with args %+v", prototext.Format(req))
5658

5759
volumeID := req.GetVolumeId()
5860
volCap := req.GetVolumeCapability()
@@ -113,7 +115,7 @@ func (driver *vsphereCSIDriver) NodeUnstageVolume(
113115
*csi.NodeUnstageVolumeResponse, error) {
114116
ctx = logger.NewContextWithLogger(ctx)
115117
log := logger.GetLogger(ctx)
116-
log.Infof("NodeUnstageVolume: called with args %+v", *req)
118+
log.Infof("NodeUnstageVolume: called with args %+v", prototext.Format(req))
117119

118120
// Validate arguments
119121
volumeID := req.GetVolumeId()
@@ -178,7 +180,7 @@ func (driver *vsphereCSIDriver) NodePublishVolume(
178180
*csi.NodePublishVolumeResponse, error) {
179181
ctx = logger.NewContextWithLogger(ctx)
180182
log := logger.GetLogger(ctx)
181-
log.Infof("NodePublishVolume: called with args %+v", *req)
183+
log.Infof("NodePublishVolume: called with args %+v", prototext.Format(req))
182184
var err error
183185
volumeID := req.GetVolumeId()
184186
if len(volumeID) == 0 {
@@ -246,7 +248,7 @@ func (driver *vsphereCSIDriver) NodeUnpublishVolume(
246248
*csi.NodeUnpublishVolumeResponse, error) {
247249
ctx = logger.NewContextWithLogger(ctx)
248250
log := logger.GetLogger(ctx)
249-
log.Infof("NodeUnpublishVolume: called with args %+v", *req)
251+
log.Infof("NodeUnpublishVolume: called with args %+v", prototext.Format(req))
250252

251253
volID := req.GetVolumeId()
252254
target := req.GetTargetPath()
@@ -276,7 +278,7 @@ func (driver *vsphereCSIDriver) NodeGetVolumeStats(
276278
*csi.NodeGetVolumeStatsResponse, error) {
277279
ctx = logger.NewContextWithLogger(ctx)
278280
log := logger.GetLogger(ctx)
279-
log.Infof("NodeGetVolumeStats: called with args %+v", *req)
281+
log.Infof("NodeGetVolumeStats: called with args %+v", prototext.Format(req))
280282

281283
var err error
282284
targetPath := req.GetVolumePath()
@@ -378,7 +380,7 @@ func (driver *vsphereCSIDriver) NodeGetInfo(
378380
*csi.NodeGetInfoResponse, error) {
379381
ctx = logger.NewContextWithLogger(ctx)
380382
log := logger.GetLogger(ctx)
381-
log.Infof("NodeGetInfo: called with args %+v", *req)
383+
log.Infof("NodeGetInfo: called with args %+v", prototext.Format(req))
382384

383385
driver.osUtils.ShouldContinue(ctx)
384386

@@ -514,7 +516,7 @@ func (driver *vsphereCSIDriver) NodeExpandVolume(
514516
*csi.NodeExpandVolumeResponse, error) {
515517
ctx = logger.NewContextWithLogger(ctx)
516518
log := logger.GetLogger(ctx)
517-
log.Infof("NodeExpandVolume: called with args %+v", *req)
519+
log.Infof("NodeExpandVolume: called with args %+v", prototext.Format(req))
518520

519521
volumeID := req.GetVolumeId()
520522
if len(volumeID) == 0 {

‎pkg/csi/service/vanilla/controller.go

+21-18
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23+
"google.golang.org/protobuf/encoding/prototext"
2324
"net/http"
2425
"os"
2526
"path/filepath"
@@ -79,6 +80,7 @@ type controller struct {
7980
authMgr common.AuthorizationService
8081
authMgrs map[string]*common.AuthManager
8182
topologyMgr commoncotypes.ControllerTopologyService
83+
csi.UnimplementedControllerServer
8284
}
8385

8486
var (
@@ -1958,7 +1960,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
19581960
volumeType := prometheus.PrometheusUnknownVolumeType
19591961
createVolumeInternal := func() (
19601962
*csi.CreateVolumeResponse, string, error) {
1961-
log.Infof("CreateVolume: called with args %+v", *req)
1963+
log.Infof("CreateVolume: called with args %+v", prototext.Format(req))
19621964
// TODO: If the err is returned by invoking CNS API, then faultType should be
19631965
// populated by the underlying layer.
19641966
// If the request failed due to validate the request, "csi.fault.InvalidArgument" will be return.
@@ -2051,7 +2053,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
20512053

20522054
deleteVolumeInternal := func() (
20532055
*csi.DeleteVolumeResponse, string, error) {
2054-
log.Infof("DeleteVolume: called with args: %+v", *req)
2056+
log.Infof("DeleteVolume: called with args: %+v", prototext.Format(req))
20552057
// TODO: If the err is returned by invoking CNS API, then faultType should be
20562058
// populated by the underlying layer.
20572059
// If the request failed due to validate the request, "csi.fault.InvalidArgument" will be return.
@@ -2194,7 +2196,7 @@ func (c *controller) ControllerPublishVolume(ctx context.Context, req *csi.Contr
21942196

21952197
controllerPublishVolumeInternal := func() (
21962198
*csi.ControllerPublishVolumeResponse, string, error) {
2197-
log.Infof("ControllerPublishVolume: called with args %+v", *req)
2199+
log.Infof("ControllerPublishVolume: called with args %+v", prototext.Format(req))
21982200
// TODO: If the err is returned by invoking CNS API, then faultType should be
21992201
// populated by the underlying layer.
22002202
// If the request failed due to validate the request, "csi.fault.InvalidArgument" will be return.
@@ -2205,7 +2207,7 @@ func (c *controller) ControllerPublishVolume(ctx context.Context, req *csi.Contr
22052207
if err != nil {
22062208

22072209
return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.Internal,
2208-
"validation for PublishVolume Request: %+v has failed. Error: %v", *req, err)
2210+
"validation for PublishVolume Request: %+v has failed. Error: %v", prototext.Format(req), err)
22092211
}
22102212
publishInfo := make(map[string]string)
22112213
_, volumeManager, err := getVCenterAndVolumeManagerForVolumeID(ctx, c, req.VolumeId, volumeInfoService)
@@ -2342,7 +2344,7 @@ func (c *controller) ControllerUnpublishVolume(ctx context.Context, req *csi.Con
23422344
controllerUnpublishVolumeInternal := func() (
23432345
*csi.ControllerUnpublishVolumeResponse, string, error) {
23442346
var faultType string
2345-
log.Infof("ControllerUnpublishVolume: called with args %+v", *req)
2347+
log.Infof("ControllerUnpublishVolume: called with args %+v", prototext.Format(req))
23462348
// TODO: If the err is returned by invoking CNS API, then faultType should be
23472349
// populated by the underlying layer.
23482350
// If the request failed due to validate the request, "csi.fault.InvalidArgument" will be return.
@@ -2352,7 +2354,7 @@ func (c *controller) ControllerUnpublishVolume(ctx context.Context, req *csi.Con
23522354
err := validateVanillaControllerUnpublishVolumeRequest(ctx, req)
23532355
if err != nil {
23542356
return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.Internal,
2355-
"validation for UnpublishVolume Request: %+v has failed. Error: %v", *req, err)
2357+
"validation for UnpublishVolume Request: %+v has failed. Error: %v", prototext.Format(req), err)
23562358
}
23572359

23582360
_, volumeManager, err := getVCenterAndVolumeManagerForVolumeID(ctx, c, req.VolumeId, volumeInfoService)
@@ -2485,7 +2487,7 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
24852487
faultType string
24862488
)
24872489

2488-
log.Infof("ControllerExpandVolume: called with args %+v", *req)
2490+
log.Infof("ControllerExpandVolume: called with args %+v", prototext.Format(req))
24892491
// TODO: If the err is returned by invoking CNS API, then faultType should be
24902492
// populated by the underlying layer.
24912493
// If the request failed due to validate the request, "csi.fault.InvalidArgument" will be return.
@@ -2522,7 +2524,8 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
25222524
isOnlineExpansionEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.OnlineVolumeExtend)
25232525
err = validateVanillaControllerExpandVolumeRequest(ctx, req, isOnlineExpansionEnabled, isOnlineExpansionSupported)
25242526
if err != nil {
2525-
msg := fmt.Sprintf("validation for ExpandVolume Request: %+v has failed. Error: %v", *req, err)
2527+
msg := fmt.Sprintf("validation for ExpandVolume Request: %+v has failed. Error: %v",
2528+
prototext.Format(req), err)
25262529
log.Error(msg)
25272530
return nil, csifault.CSIInternalFault, err
25282531
}
@@ -2607,7 +2610,7 @@ func (c *controller) ValidateVolumeCapabilities(ctx context.Context, req *csi.Va
26072610
*csi.ValidateVolumeCapabilitiesResponse, error) {
26082611
ctx = logger.NewContextWithLogger(ctx)
26092612
log := logger.GetLogger(ctx)
2610-
log.Infof("ControllerGetCapabilities: called with args %+v", *req)
2613+
log.Infof("ControllerGetCapabilities: called with args %+v", prototext.Format(req))
26112614
volCaps := req.GetVolumeCapabilities()
26122615
var confirmed *csi.ValidateVolumeCapabilitiesResponse_Confirmed
26132616
if err := common.IsValidVolumeCapabilities(ctx, volCaps); err == nil {
@@ -2639,7 +2642,7 @@ func (c *controller) ListVolumes(ctx context.Context, req *csi.ListVolumesReques
26392642
}
26402643

26412644
listVolumesInternal := func() (*csi.ListVolumesResponse, string, error) {
2642-
log.Debugf("ListVolumes: called with args %+v", *req)
2645+
log.Debugf("ListVolumes: called with args %+v", prototext.Format(req))
26432646

26442647
startingToken := 0
26452648
if req.StartingToken != "" {
@@ -2871,7 +2874,7 @@ func (c *controller) GetCapacity(ctx context.Context, req *csi.GetCapacityReques
28712874
*csi.GetCapacityResponse, error) {
28722875
ctx = logger.NewContextWithLogger(ctx)
28732876
log := logger.GetLogger(ctx)
2874-
log.Infof("GetCapacity: called with args %+v", *req)
2877+
log.Infof("GetCapacity: called with args %+v", prototext.Format(req))
28752878
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "getCapacity")
28762879
}
28772880

@@ -2915,7 +2918,7 @@ func (c *controller) ControllerGetCapabilities(ctx context.Context, req *csi.Con
29152918
*csi.ControllerGetCapabilitiesResponse, error) {
29162919
ctx = logger.NewContextWithLogger(ctx)
29172920
log := logger.GetLogger(ctx)
2918-
log.Infof("ControllerGetCapabilities: called with args %+v", *req)
2921+
log.Infof("ControllerGetCapabilities: called with args %+v", prototext.Format(req))
29192922

29202923
controllerCaps := []csi.ControllerServiceCapability_RPC_Type{
29212924
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
@@ -2956,7 +2959,7 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
29562959
granularMaxSnapshotsPerBlockVolumeInVSAN int
29572960
granularMaxSnapshotsPerBlockVolumeInVVOL int
29582961
)
2959-
log.Infof("CreateSnapshot: called with args %+v", *req)
2962+
log.Infof("CreateSnapshot: called with args %+v", prototext.Format(req))
29602963

29612964
isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
29622965
if !isBlockVolumeSnapshotEnabled {
@@ -2986,7 +2989,7 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
29862989
// Validate CreateSnapshotRequest
29872990
if err := validateVanillaCreateSnapshotRequestRequest(ctx, req); err != nil {
29882991
return nil, logger.LogNewErrorCodef(log, codes.Internal,
2989-
"validation for CreateSnapshot Request: %+v has failed. Error: %v", *req, err)
2992+
"validation for CreateSnapshot Request: %+v has failed. Error: %v", prototext.Format(req), err)
29902993
}
29912994

29922995
// Check if the source volume is migrated vSphere volume
@@ -3117,7 +3120,7 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
31173120
volumeManager cnsvolume.Manager
31183121
err error
31193122
)
3120-
log.Infof("DeleteSnapshot: called with args %+v", *req)
3123+
log.Infof("DeleteSnapshot: called with args %+v", prototext.Format(req))
31213124

31223125
isBlockVolumeSnapshotEnabled :=
31233126
commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
@@ -3193,7 +3196,7 @@ func (c *controller) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRe
31933196
nextToken string
31943197
err error
31953198
)
3196-
log.Infof("ListSnapshots: called with args %+v", *req)
3199+
log.Infof("ListSnapshots: called with args %+v", prototext.Format(req))
31973200
err = validateVanillaListSnapshotRequest(ctx, req)
31983201
if err != nil {
31993202
return nil, err
@@ -3468,14 +3471,14 @@ func (c *controller) ControllerGetVolume(ctx context.Context, req *csi.Controlle
34683471
*csi.ControllerGetVolumeResponse, error) {
34693472
ctx = logger.NewContextWithLogger(ctx)
34703473
log := logger.GetLogger(ctx)
3471-
log.Infof("ControllerGetVolume: called with args %+v", *req)
3474+
log.Infof("ControllerGetVolume: called with args %+v", prototext.Format(req))
34723475
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "controllerGetVolume")
34733476
}
34743477

34753478
func (c *controller) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest) (
34763479
*csi.ControllerModifyVolumeResponse, error) {
34773480
ctx = logger.NewContextWithLogger(ctx)
34783481
log := logger.GetLogger(ctx)
3479-
log.Infof("ControllerModifyVolume: called with args %+v", *req)
3482+
log.Infof("ControllerModifyVolume: called with args %+v", prototext.Format(req))
34803483
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "ControllerModifyVolume")
34813484
}

‎pkg/csi/service/vanilla/controller_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23+
"google.golang.org/protobuf/encoding/prototext"
2324
"os"
2425
"strconv"
2526
"strings"
@@ -766,7 +767,7 @@ func TestExtendVolume(t *testing.T) {
766767
},
767768
VolumeCapability: capabilities[0],
768769
}
769-
t.Logf("ControllerExpandVolume will be called with req +%v", *reqExpand)
770+
t.Logf("ControllerExpandVolume will be called with req +%v", prototext.Format(reqExpand))
770771
respExpand, err := ct.controller.ControllerExpandVolume(ctx, reqExpand)
771772
if err != nil {
772773
t.Fatal(err)
@@ -824,7 +825,7 @@ func TestMigratedExtendVolume(t *testing.T) {
824825
RequiredBytes: 1024,
825826
},
826827
}
827-
t.Logf("ControllerExpandVolume will be called with req +%v", *reqExpand)
828+
t.Logf("ControllerExpandVolume will be called with req +%v", prototext.Format(reqExpand))
828829
_, err := ct.controller.ControllerExpandVolume(ctx, reqExpand)
829830
if err != nil {
830831
t.Logf("Expected error received. migrated volume with VMDK path can not be expanded")
@@ -913,7 +914,7 @@ func TestCompleteControllerFlow(t *testing.T) {
913914
VolumeCapability: capabilities[0],
914915
Readonly: false,
915916
}
916-
t.Logf("ControllerPublishVolume will be called with req +%v", *reqControllerPublishVolume)
917+
t.Logf("ControllerPublishVolume will be called with req +%v", prototext.Format(reqControllerPublishVolume))
917918
respControllerPublishVolume, err := ct.controller.ControllerPublishVolume(ctx, reqControllerPublishVolume)
918919
if err != nil {
919920
t.Fatal(err)
@@ -926,7 +927,8 @@ func TestCompleteControllerFlow(t *testing.T) {
926927
VolumeId: volID,
927928
NodeId: NodeID,
928929
}
929-
t.Logf("ControllerUnpublishVolume will be called with req +%v", *reqControllerUnpublishVolume)
930+
t.Logf("ControllerUnpublishVolume will be called with req +%v",
931+
prototext.Format(reqControllerUnpublishVolume))
930932
_, err = ct.controller.ControllerUnpublishVolume(ctx, reqControllerUnpublishVolume)
931933
if err != nil {
932934
t.Fatal(err)

0 commit comments

Comments
 (0)