Skip to content

Commit da0ed14

Browse files
sameshaisameshai
authored
Support for update Volume tags via RIAAS (#211)
* 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 * 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 * 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 * 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 * 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 ad8796f commit da0ed14

File tree

28 files changed

+411
-90
lines changed

28 files changed

+411
-90
lines changed

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/IBM/ibm-csi-common/pkg/metrics"
3636
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
3737
"github.com/IBM/ibm-csi-common/pkg/utils"
38-
"github.com/IBM/ibm-csi-common/pkg/watcher"
38+
"github.com/IBM/ibmcloud-volume-vpc/pkg/watcher"
3939
csiConfig "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/config"
4040
driver "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver"
4141
"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.18
7-
github.com/IBM/ibmcloud-volume-interface v1.2.6
8-
github.com/IBM/ibmcloud-volume-vpc v1.1.12
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: 4 additions & 4 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.18 h1:CbzoONFN6vdmPLoXGxygiq3sbr2xtAcVUb0Vqj3/HNI=
1010
github.com/IBM/ibm-csi-common v1.1.18/go.mod h1:bDs9CLfr09kFpSMcR35e9AmyR2pSydx8goHjagFPrHs=
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.12 h1:DSC+YfddhegnixdX3stOgsIqyKlbc5wF5ofWomyMIsI=
14-
github.com/IBM/ibmcloud-volume-vpc v1.1.12/go.mod h1:bdVgIWQmiq4ehs4buHpMYwFh6nlIaKBOxRGJoTh6bwY=
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=

‎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
)
@@ -198,9 +198,8 @@ func TestGetVolumeParameters(t *testing.T) {
198198
},
199199
expectedVolume: &provider.Volume{Name: &volumeName,
200200
Capacity: &volumeSize,
201-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
202-
Tags: []string{createdByIBM},
203-
},
201+
VPCVolume: provider.VPCVolume{
202+
Tags: []string{createdByIBM},
204203
Profile: &provider.Profile{Name: "general-purpose"},
205204
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
206205
},
@@ -333,9 +332,8 @@ func TestGetVolumeParameters(t *testing.T) {
333332
},
334333
expectedVolume: &provider.Volume{Name: &volumeName,
335334
Capacity: &volumeSize,
336-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
337-
Tags: []string{createdByIBM},
338-
},
335+
VPCVolume: provider.VPCVolume{
336+
Tags: []string{createdByIBM},
339337
Profile: &provider.Profile{Name: "general-purpose"},
340338
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
341339
},
@@ -421,9 +419,8 @@ func TestOverrideParams(t *testing.T) {
421419
},
422420
expectedVolume: &provider.Volume{Name: &volumeName,
423421
Capacity: &volumeSize,
424-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
425-
Tags: []string{createdByIBM},
426-
},
422+
VPCVolume: provider.VPCVolume{
423+
Tags: []string{createdByIBM},
427424
Profile: &provider.Profile{Name: "general-purpose"},
428425
ResourceGroup: &provider.ResourceGroup{ID: "secret-rg"},
429426
},
@@ -507,9 +504,8 @@ func TestOverrideParams(t *testing.T) {
507504
},
508505
expectedVolume: &provider.Volume{Name: &volumeName,
509506
Capacity: &volumeSize,
510-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
511-
Tags: []string{createdByIBM},
512-
},
507+
VPCVolume: provider.VPCVolume{
508+
Tags: []string{createdByIBM},
513509
Profile: &provider.Profile{Name: "custom"},
514510
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
515511
},
@@ -604,9 +600,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
604600
{
605601
testCaseName: "Valid volume response",
606602
requestVol: provider.Volume{VolumeID: volumeID,
607-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
608-
Tags: []string{createdByIBM},
609-
},
603+
VPCVolume: provider.VPCVolume{
604+
Tags: []string{createdByIBM},
610605
Profile: &provider.Profile{Name: "general-purpose"},
611606
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
612607
},
@@ -636,9 +631,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
636631
{
637632
testCaseName: "Valid volume response with region in vol request empty",
638633
requestVol: provider.Volume{VolumeID: volumeID,
639-
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
640-
Tags: []string{createdByIBM},
641-
},
634+
VPCVolume: provider.VPCVolume{
635+
Tags: []string{createdByIBM},
642636
Profile: &provider.Profile{Name: "general-purpose"},
643637
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
644638
},

‎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
@@ -22,10 +22,10 @@ import (
2222

2323
testingexec "k8s.io/utils/exec/testing"
2424

25-
cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
2625
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
2726
nodeInfo "github.com/IBM/ibm-csi-common/pkg/metadata/fake"
2827
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
28+
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
2929
"github.com/stretchr/testify/assert"
3030
)
3131

‎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)