Skip to content

Commit e146a80

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1524 from huww98/bump-nas-sdk
bump NAS SDK to v4
2 parents b979cb5 + 59562cb commit e146a80

File tree

377 files changed

+55276
-103793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+55276
-103793
lines changed

‎go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ go 1.24
44

55
require (
66
github.com/alibabacloud-go/darabonba-openapi v0.1.16
7-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11
7+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12
88
github.com/alibabacloud-go/eflo-controller-20221215/v2 v2.7.0
99
github.com/alibabacloud-go/ens-20171110/v3 v3.0.2
10-
github.com/alibabacloud-go/nas-20170626/v3 v3.2.0
11-
github.com/alibabacloud-go/tea v1.3.11
10+
github.com/alibabacloud-go/nas-20170626/v4 v4.1.2
11+
github.com/alibabacloud-go/tea v1.3.12
1212
github.com/aliyun/alibaba-cloud-sdk-go v1.63.107
1313
github.com/aliyun/credentials-go v1.4.5
1414
github.com/container-storage-interface/spec v1.10.0
@@ -99,5 +99,3 @@ require (
9999
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
100100
sigs.k8s.io/yaml v1.4.0 // indirect
101101
)
102-
103-
replace github.com/alibabacloud-go/nas-20170626/v3 => ./staging/src/github.com/alibabacloud-go/nas-20170626

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIp
3131
github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc=
3232
github.com/alibabacloud-go/darabonba-openapi v0.1.16 h1:f6ZspWKTBurQzyLpZKMVxO51HAePY8aedicwuX3+E20=
3333
github.com/alibabacloud-go/darabonba-openapi v0.1.16/go.mod h1:ZjyqRbbZOaUBSh7keeH8VQN/BzCPvxCQwMuJGDdbmXQ=
34-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.7/go.mod h1:TBpgqm3XofZz2LCYjZhektGPU7ArEgascyzbm4SjFo4=
35-
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11 h1:5JIs4BPVpzbgcBrgmUxBdDsMjmsHZvPbTPD1m4aB+ZQ=
3634
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.11/go.mod h1:ue0+WkdPxpCB2JP3iaG4Iawayxp72kyT5uDbozQKaW8=
35+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12 h1:e2yCrhtWd6Qcsy4he2OL+jIAU+93Lx9OcLlPRoFLT1w=
36+
github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12/go.mod h1:f2wDpbM7hK9SvLIH09zSKVU1TsyemUNOqErMscMMl7c=
3737
github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg=
3838
github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ=
3939
github.com/alibabacloud-go/darabonba-string v1.0.0/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA=
@@ -49,6 +49,8 @@ github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgT
4949
github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE=
5050
github.com/alibabacloud-go/ens-20171110/v3 v3.0.2 h1:MOcjqAf7cACXaPKAv37WMjp7zHARcrdmGQm08PYiiPM=
5151
github.com/alibabacloud-go/ens-20171110/v3 v3.0.2/go.mod h1:g1OXoq7qq5G2q3Un2Fzq5ETCPOFa0YytKxdDfRTkEvI=
52+
github.com/alibabacloud-go/nas-20170626/v4 v4.1.2 h1:iJ+1YJbBOwrkfPZNrd1GEZJkuoUyleytBMT8ZTgniVI=
53+
github.com/alibabacloud-go/nas-20170626/v4 v4.1.2/go.mod h1:9wfKsfynyHOblHnoAlwQ/s1KNj7IM6CcdOhLY+F28Tk=
5254
github.com/alibabacloud-go/openapi-util v0.0.10/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
5355
github.com/alibabacloud-go/openapi-util v0.0.11/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
5456
github.com/alibabacloud-go/openapi-util v0.1.0/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws=
@@ -61,9 +63,9 @@ github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/Ke
6163
github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
6264
github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A=
6365
github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
64-
github.com/alibabacloud-go/tea v1.3.8/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
65-
github.com/alibabacloud-go/tea v1.3.11 h1:F7s2HRszY0J+tFckhy5FCpnBEENTijgFcYR68Brg9/Y=
6666
github.com/alibabacloud-go/tea v1.3.11/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
67+
github.com/alibabacloud-go/tea v1.3.12 h1:ir2Io80UlBy1JHf7t+uCTxmaGQtiEta1WpV29NGJTkE=
68+
github.com/alibabacloud-go/tea v1.3.12/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg=
6769
github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE=
6870
github.com/alibabacloud-go/tea-utils v1.4.3 h1:8SzwmmRrOnQ09Hf5a9GyfJc0d7Sjv6fmsZoF4UDbFjo=
6971
github.com/alibabacloud-go/tea-utils v1.4.3/go.mod h1:KNcT0oXlZZxOXINnZBs6YvgOd5aYp9U67G+E3R8fcQw=

‎pkg/bmcpfs/controllerserver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
2727
efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v2/client"
28-
nasclient "github.com/alibabacloud-go/nas-20170626/v3/client"
28+
nasclient "github.com/alibabacloud-go/nas-20170626/v4/client"
2929
"github.com/alibabacloud-go/tea/tea"
3030
"github.com/container-storage-interface/spec/lib/go/csi"
3131
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/bmcpfs/internal"

‎pkg/bmcpfs/internal/vsc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"time"
2626

2727
efloclient "github.com/alibabacloud-go/eflo-controller-20221215/v2/client"
28-
nasclient "github.com/alibabacloud-go/nas-20170626/v3/client"
28+
nasclient "github.com/alibabacloud-go/nas-20170626/v4/client"
2929
"github.com/alibabacloud-go/tea/tea"
3030
"golang.org/x/time/rate"
3131
"k8s.io/client-go/util/workqueue"

‎pkg/nas/accesspoint_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud/metadata"
1111
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/nas/interfaces"
1212

13-
sdk "github.com/alibabacloud-go/nas-20170626/v3/client"
13+
sdk "github.com/alibabacloud-go/nas-20170626/v4/client"
1414
"github.com/alibabacloud-go/tea/tea"
1515
"github.com/container-storage-interface/spec/lib/go/csi"
1616
cnfsv1beta1 "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cnfs/v1beta1"

‎pkg/nas/cloud/nas_client_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88

99
openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
10-
sdk "github.com/alibabacloud-go/nas-20170626/v3/client"
10+
sdk "github.com/alibabacloud-go/nas-20170626/v4/client"
1111
"github.com/alibabacloud-go/tea/tea"
1212
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/nas/interfaces"
1313
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"

‎pkg/nas/cloud/nas_client_v2_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cloud
33
import (
44
"testing"
55

6-
nas "github.com/alibabacloud-go/nas-20170626/v3/client"
6+
nas "github.com/alibabacloud-go/nas-20170626/v4/client"
77
"github.com/alibabacloud-go/tea/tea"
88
"github.com/golang/mock/gomock"
99
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/nas/interfaces"

‎pkg/nas/interfaces/nas_client_v2_interface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package interfaces
22

3-
import sdk "github.com/alibabacloud-go/nas-20170626/v3/client"
3+
import sdk "github.com/alibabacloud-go/nas-20170626/v4/client"
44

55
type NasClientV2Interface interface {
66
CreateDir(req *sdk.CreateDirRequest) error

‎pkg/nas/interfaces/nas_client_v2_mock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package interfaces
22

33
import (
4-
sdk "github.com/alibabacloud-go/nas-20170626/v3/client"
4+
sdk "github.com/alibabacloud-go/nas-20170626/v4/client"
55
"github.com/golang/mock/gomock"
66
)
77

‎pkg/nas/interfaces/nas_v2_interface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package interfaces
22

3-
import nas "github.com/alibabacloud-go/nas-20170626/v3/client"
3+
import nas "github.com/alibabacloud-go/nas-20170626/v4/client"
44

55
type NasV2Interface interface {
66
CancelDirQuota(request *nas.CancelDirQuotaRequest) (*nas.CancelDirQuotaResponse, error)

0 commit comments

Comments
 (0)