Skip to content

Commit ad9d3f2

Browse files
sameshaisameshai
authored
Support for update Volume tags via RIAAS (#212)
* Support for update Volume tags via RIAAS * Support for update Volume tags via RIAAS * Support for update Volume tags via RIAAS * Support for update Volume tags via RIAAS * Support for update Volume tags via RIAAS
1 parent 398e155 commit ad9d3f2

29 files changed

+430
-102
lines changed

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"github.com/IBM/ibm-csi-common/pkg/metrics"
3333
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
3434
"github.com/IBM/ibm-csi-common/pkg/utils"
35-
"github.com/IBM/ibm-csi-common/pkg/watcher"
3635
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
36+
"github.com/IBM/ibmcloud-volume-vpc/pkg/watcher"
3737
csiConfig "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/config"
3838
driver "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver"
3939
"go.uber.org/zap"

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.22.0
44

55
require (
66
github.com/IBM/ibm-csi-common v1.1.15
7-
github.com/IBM/ibmcloud-volume-interface v1.2.6
8-
github.com/IBM/ibmcloud-volume-vpc v1.1.11
7+
github.com/IBM/ibmcloud-volume-interface v1.2.9
8+
github.com/IBM/ibmcloud-volume-vpc v1.1.14
99
github.com/IBM/secret-utils-lib v1.1.11
1010
github.com/container-storage-interface/spec v1.9.0
1111
github.com/golang/glog v1.2.1

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ github.com/IBM/go-sdk-core/v5 v5.17.4 h1:VGb9+mRrnS2HpHZFM5hy4J6ppIWnwNrw0G+tLSg
88
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
99
github.com/IBM/ibm-csi-common v1.1.15 h1:oJ0NsrVBqfXKCZXSc/EI+s7/RlUK/TpzTI+jcdoAqpI=
1010
github.com/IBM/ibm-csi-common v1.1.15/go.mod h1:oKYsmovJ4HAmbHfhQvVn1dJ+xeQHqaa3hQsN/Z5itlc=
11-
github.com/IBM/ibmcloud-volume-interface v1.2.6 h1:OLumrSQ0XTOp6gW+k0z2X53uTYOIt1wWSkTCXzK/vAM=
12-
github.com/IBM/ibmcloud-volume-interface v1.2.6/go.mod h1:sDeQiPuN8k9yTRl9FbE2GZCXPNg4cV3oldUfL8wwGNA=
13-
github.com/IBM/ibmcloud-volume-vpc v1.1.11 h1:HnDPi7ZN+iAPVLZ29sLeQnJ7y0lvorc8/q4csDnxht4=
14-
github.com/IBM/ibmcloud-volume-vpc v1.1.11/go.mod h1:V4Xw+ETu4nnIHn8lZ8T/tD6UlCTSDLt4kT8oEs4o80w=
11+
github.com/IBM/ibmcloud-volume-interface v1.2.9 h1:ug55V2mzK/IaFkfuKDOt74yzhLapSR/+qVgfQblfAjw=
12+
github.com/IBM/ibmcloud-volume-interface v1.2.9/go.mod h1:sDeQiPuN8k9yTRl9FbE2GZCXPNg4cV3oldUfL8wwGNA=
13+
github.com/IBM/ibmcloud-volume-vpc v1.1.14 h1:rs8f4OO+lP3jOIi5tpgiWVyVEL6g4lazGfMEsLpsfUI=
14+
github.com/IBM/ibmcloud-volume-vpc v1.1.14/go.mod h1:CSAsBgEXN6WL8y/EpEj9GA+w+vs3fVLoRadtuCWUAz8=
1515
github.com/IBM/secret-common-lib v1.1.11 h1:EpfEe1gT1bnFQ3bxQPrh6bzTPeGjUo1NReVkCCP+TOc=
1616
github.com/IBM/secret-common-lib v1.1.11/go.mod h1:7YJF0ipT979nHIPkiCpvjFboFoIhrmYnIliE1vjCjZM=
1717
github.com/IBM/secret-utils-lib v1.1.11 h1:w87BzkddoFFlhRuWRteuGj3/561lEUg6Oo0RajVC87A=
@@ -121,8 +121,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
121121
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
122122
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
123123
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
124-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
125-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
124+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
125+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
126126
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
127127
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
128128
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -299,8 +299,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
299299
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
300300
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
301301
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
302-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
303-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
302+
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
303+
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
304304
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
305305
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
306306
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/ibmcsidriver/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
"strings"
2323
"time"
2424

25-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
2625
commonError "github.com/IBM/ibm-csi-common/pkg/messages"
2726
"github.com/IBM/ibm-csi-common/pkg/metrics"
2827
"github.com/IBM/ibm-csi-common/pkg/utils"
2928
"github.com/IBM/ibmcloud-volume-interface/lib/provider"
3029
providerError "github.com/IBM/ibmcloud-volume-interface/lib/utils"
3130
utilReasonCode "github.com/IBM/ibmcloud-volume-interface/lib/utils/reasoncode"
3231
userError "github.com/IBM/ibmcloud-volume-vpc/common/messages"
32+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
3333
csi "github.com/container-storage-interface/spec/lib/go/csi"
3434

3535
"go.uber.org/zap"

‎pkg/ibmcsidriver/controller_helper_test.go‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"fmt"
2222
"testing"
2323

24-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
2524
"github.com/IBM/ibm-csi-common/pkg/utils"
2625
"github.com/IBM/ibmcloud-volume-interface/config"
2726
"github.com/IBM/ibmcloud-volume-interface/lib/provider"
27+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2828
csi "github.com/container-storage-interface/spec/lib/go/csi"
2929
"github.com/stretchr/testify/assert"
3030
)
@@ -177,9 +177,8 @@ func TestGetVolumeParameters(t *testing.T) {
177177
},
178178
expectedVolume: &provider.Volume{Name: &volumeName,
179179
Capacity: &volumeSize,
180-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
181-
Tags: []string{createdByIBM},
182-
},
180+
VPCVolume: provider.VPCVolume{
181+
Tags: []string{createdByIBM},
183182
Profile: &provider.Profile{Name: "general-purpose"},
184183
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
185184
},
@@ -312,9 +311,8 @@ func TestGetVolumeParameters(t *testing.T) {
312311
},
313312
expectedVolume: &provider.Volume{Name: &volumeName,
314313
Capacity: &volumeSize,
315-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
316-
Tags: []string{createdByIBM},
317-
},
314+
VPCVolume: provider.VPCVolume{
315+
Tags: []string{createdByIBM},
318316
Profile: &provider.Profile{Name: "general-purpose"},
319317
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
320318
},
@@ -444,9 +442,8 @@ func TestOverrideParams(t *testing.T) {
444442
},
445443
expectedVolume: &provider.Volume{Name: &volumeName,
446444
Capacity: &volumeSize,
447-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
448-
Tags: []string{createdByIBM},
449-
},
445+
VPCVolume: provider.VPCVolume{
446+
Tags: []string{createdByIBM},
450447
Profile: &provider.Profile{Name: "general-purpose"},
451448
ResourceGroup: &provider.ResourceGroup{ID: "secret-rg"},
452449
},
@@ -530,9 +527,8 @@ func TestOverrideParams(t *testing.T) {
530527
},
531528
expectedVolume: &provider.Volume{Name: &volumeName,
532529
Capacity: &volumeSize,
533-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
534-
Tags: []string{createdByIBM},
535-
},
530+
VPCVolume: provider.VPCVolume{
531+
Tags: []string{createdByIBM},
536532
Profile: &provider.Profile{Name: "custom"},
537533
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
538534
},
@@ -650,9 +646,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
650646
{
651647
testCaseName: "Valid volume response",
652648
requestVol: provider.Volume{VolumeID: volumeID,
653-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
654-
Tags: []string{createdByIBM},
655-
},
649+
VPCVolume: provider.VPCVolume{
650+
Tags: []string{createdByIBM},
656651
Profile: &provider.Profile{Name: "general-purpose"},
657652
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
658653
},
@@ -682,9 +677,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
682677
{
683678
testCaseName: "Valid volume response with region in vol request empty",
684679
requestVol: provider.Volume{VolumeID: volumeID,
685-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
686-
Tags: []string{createdByIBM},
687-
},
680+
VPCVolume: provider.VPCVolume{
681+
Tags: []string{createdByIBM},
688682
Profile: &provider.Profile{Name: "general-purpose"},
689683
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
690684
},

‎pkg/ibmcsidriver/controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
csi "github.com/container-storage-interface/spec/lib/go/csi"
3434
"github.com/stretchr/testify/assert"
3535

36-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
3736
"github.com/IBM/ibmcloud-volume-interface/lib/provider/fake"
37+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
3838
"golang.org/x/net/context"
3939
"google.golang.org/grpc/codes"
4040
"google.golang.org/grpc/status"

‎pkg/ibmcsidriver/fileOps_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222
"testing"
2323

24-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
24+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2525
"github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver/ibmcsidriverfakes"
2626
"github.com/stretchr/testify/assert"
2727
)

‎pkg/ibmcsidriver/ibm_csi_driver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ package ibmcsidriver
2020
import (
2121
"fmt"
2222

23-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
2423
commonError "github.com/IBM/ibm-csi-common/pkg/messages"
2524
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
2625
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
2726
"github.com/IBM/ibm-csi-common/pkg/utils"
27+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2828
csi "github.com/container-storage-interface/spec/lib/go/csi"
2929
"go.uber.org/zap"
3030
)

‎pkg/ibmcsidriver/ibm_csi_driver_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
testingexec "k8s.io/utils/exec/testing"
2222
"testing"
2323

24-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
2524
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
2625
nodeInfo "github.com/IBM/ibm-csi-common/pkg/metadata/fake"
2726
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
27+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2828
"github.com/stretchr/testify/assert"
2929
)
3030

‎pkg/ibmcsidriver/node_helper_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package ibmcsidriver
1919
import (
2020
"testing"
2121

22-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
22+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2323
"github.com/stretchr/testify/assert"
2424
)
2525

0 commit comments

Comments
 (0)