Skip to content

Commit 27c842b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1086 from shiftstack/OSASINFRA-3527
OCPBUGS-38287: bump gophercloud to latest v2
2 parents db6df03 + b5fa369 commit 27c842b

File tree

186 files changed

+5326
-2456
lines changed

Some content is hidden

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

186 files changed

+5326
-2456
lines changed

‎go.mod

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ require (
2626
github.com/google/go-cmp v0.6.0
2727
github.com/google/uuid v1.6.0
2828
github.com/googleapis/gax-go/v2 v2.12.3
29-
github.com/gophercloud/gophercloud v1.1.0
30-
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99
29+
github.com/gophercloud/gophercloud/v2 v2.1.0
30+
github.com/gophercloud/utils/v2 v2.0.0-20240807081201-990d90b23c70
3131
github.com/goware/urlx v0.3.2
3232
github.com/jongio/azidext/go/azidext v0.5.0
3333
github.com/openshift/api v0.0.0-20240805090819-b8f07e1d8f62
@@ -90,6 +90,7 @@ require (
9090
github.com/go-playground/locales v0.14.1 // indirect
9191
github.com/go-playground/universal-translator v0.18.1 // indirect
9292
github.com/go-playground/validator/v10 v10.13.0 // indirect
93+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
9394
github.com/gogo/protobuf v1.3.2 // indirect
9495
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
9596
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
@@ -144,12 +145,12 @@ require (
144145
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
145146
go.uber.org/multierr v1.11.0 // indirect
146147
go.uber.org/zap v1.26.0 // indirect
147-
golang.org/x/crypto v0.21.0 // indirect
148+
golang.org/x/crypto v0.25.0 // indirect
148149
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
149-
golang.org/x/sync v0.6.0 // indirect
150-
golang.org/x/sys v0.20.0 // indirect
151-
golang.org/x/term v0.18.0 // indirect
152-
golang.org/x/text v0.14.0 // indirect
150+
golang.org/x/sync v0.8.0 // indirect
151+
golang.org/x/sys v0.23.0 // indirect
152+
golang.org/x/term v0.22.0 // indirect
153+
golang.org/x/text v0.17.0 // indirect
153154
google.golang.org/appengine v1.6.8 // indirect
154155
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
155156
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect

‎go.sum

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
697697
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
698698
github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
699699
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
700+
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
701+
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
700702
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
701703
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
702704
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
@@ -828,11 +830,10 @@ github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/
828830
github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4=
829831
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
830832
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
831-
github.com/gophercloud/gophercloud v1.0.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c=
832-
github.com/gophercloud/gophercloud v1.1.0 h1:xlsBMeBi0KJ56RBW6GJ2laJJKbtlpObj5HwQzggYAsA=
833-
github.com/gophercloud/gophercloud v1.1.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
834-
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99 h1:fCv3q8eZ06quhZ5xXHET10R/wOyK8OSsH+tM/wnk63w=
835-
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99/go.mod h1:RZub3bZJK1VLM2aMjSZxNYb1HvXtWoo9l1Yd3l2VFiA=
833+
github.com/gophercloud/gophercloud/v2 v2.1.0 h1:91p6c+uMckXyx39nSIYjDirDBnPVFQq0q1njLNPX+NY=
834+
github.com/gophercloud/gophercloud/v2 v2.1.0/go.mod h1:f2hMRC7Kakbv5vM7wSGHrIPZh6JZR60GVHryJlF/K44=
835+
github.com/gophercloud/utils/v2 v2.0.0-20240807081201-990d90b23c70 h1:UFRmN3w9eSxwHsOGjA3BiYGEBDUAFaHHv5alaMHbbFE=
836+
github.com/gophercloud/utils/v2 v2.0.0-20240807081201-990d90b23c70/go.mod h1:ZNbSKwPYzyQ7PKmlCvVdI2JvwVHsl/ZVVXnpJRNkLrQ=
836837
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
837838
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
838839
github.com/goware/urlx v0.3.2 h1:gdoo4kBHlkqZNaf6XlQ12LGtQOmpKJrR04Rc3RnpJEo=
@@ -853,7 +854,6 @@ github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB1
853854
github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
854855
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
855856
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
856-
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
857857
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
858858
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
859859
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
@@ -1101,13 +1101,11 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
11011101
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
11021102
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
11031103
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1104-
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
11051104
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
11061105
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1107-
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
11081106
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
1109-
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
1110-
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
1107+
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
1108+
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
11111109
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
11121110
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
11131111
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1264,8 +1262,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
12641262
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12651263
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12661264
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1267-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
1268-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1265+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
1266+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
12691267
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
12701268
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12711269
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1342,16 +1340,16 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13421340
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13431341
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13441342
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1345-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
1346-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1343+
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
1344+
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
13471345
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
13481346
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
13491347
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
13501348
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
13511349
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
13521350
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
1353-
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
1354-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
1351+
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
1352+
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
13551353
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13561354
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13571355
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1366,8 +1364,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
13661364
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
13671365
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
13681366
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
1369-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1370-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1367+
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
1368+
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
13711369
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
13721370
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
13731371
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1437,8 +1435,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
14371435
golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
14381436
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
14391437
golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
1440-
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
1441-
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
1438+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
1439+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
14421440
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
14431441
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
14441442
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/storage/swift/swift.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package swift
22

33
import (
4+
"context"
45
"crypto/tls"
56
"crypto/x509"
67
"errors"
@@ -10,12 +11,12 @@ import (
1011
"strconv"
1112
"strings"
1213

13-
"github.com/gophercloud/gophercloud"
14-
"github.com/gophercloud/gophercloud/openstack"
15-
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers"
16-
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"
17-
"github.com/gophercloud/gophercloud/pagination"
18-
"github.com/gophercloud/utils/openstack/clientconfig"
14+
"github.com/gophercloud/gophercloud/v2"
15+
"github.com/gophercloud/gophercloud/v2/openstack"
16+
"github.com/gophercloud/gophercloud/v2/openstack/objectstorage/v1/containers"
17+
"github.com/gophercloud/gophercloud/v2/openstack/objectstorage/v1/objects"
18+
"github.com/gophercloud/gophercloud/v2/pagination"
19+
"github.com/gophercloud/utils/v2/openstack/clientconfig"
1920
"github.com/goware/urlx"
2021
yamlv2 "gopkg.in/yaml.v2"
2122

@@ -77,7 +78,7 @@ func IsSwiftEnabled(listers *regopclient.StorageListers) (bool, error) {
7778
}
7879

7980
// Try to list containers to make sure the user has required permissions to do that
80-
if err := containers.List(conn, containers.ListOpts{}).EachPage(func(_ pagination.Page) (bool, error) {
81+
if err := containers.List(conn, containers.ListOpts{}).EachPage(context.TODO(), func(ctx context.Context, _ pagination.Page) (bool, error) {
8182
return false, nil
8283
}); err != nil {
8384
klog.Errorf("error listing swift containers: %v", err)
@@ -250,7 +251,7 @@ func (d *driver) getSwiftClient() (*gophercloud.ServiceClient, error) {
250251
provider.HTTPClient = client
251252
}
252253

253-
err = openstack.Authenticate(provider, *opts)
254+
err = openstack.Authenticate(context.TODO(), provider, *opts)
254255
if err != nil {
255256
return nil, fmt.Errorf("failed to authenticate against OpenStack: %w", err)
256257
}
@@ -388,7 +389,7 @@ func ensureAuthURLHasAPIVersion(authURL, authVersion string) (string, error) {
388389
}
389390

390391
func (d *driver) containerExists(client *gophercloud.ServiceClient, containerName string) error {
391-
_, err := containers.Get(client, containerName, containers.GetOpts{}).Extract()
392+
_, err := containers.Get(context.TODO(), client, containerName, containers.GetOpts{}).Extract()
392393
return err
393394
}
394395

@@ -448,7 +449,7 @@ func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
448449
if err != nil {
449450
// If the error is not ErrResourceNotFound
450451
// return the error
451-
if _, ok := err.(gophercloud.ErrDefault404); !ok {
452+
if !gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
452453
util.UpdateCondition(cr, defaults.StorageExists, operatorapi.ConditionFalse, "Unable to check if container exists", fmt.Sprintf("Error occurred checking if container exists: %v", err))
453454
return err
454455
}
@@ -481,7 +482,7 @@ func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
481482
},
482483
}
483484

484-
_, err = containers.Create(client, cr.Spec.Storage.Swift.Container, createOps).Extract()
485+
_, err = containers.Create(context.TODO(), client, cr.Spec.Storage.Swift.Container, createOps).Extract()
485486
if err != nil {
486487
util.UpdateCondition(cr, defaults.StorageExists, operatorapi.ConditionFalse, "Creation Failed", err.Error())
487488
return err
@@ -517,12 +518,12 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
517518
pager := objects.List(client, cr.Spec.Storage.Swift.Container, &objects.ListOpts{
518519
Limit: 50,
519520
})
520-
if err := pager.EachPage(func(page pagination.Page) (bool, error) {
521+
if err := pager.EachPage(context.TODO(), func(ctx context.Context, page pagination.Page) (bool, error) {
521522
objectsOnPage, err := objects.ExtractNames(page)
522523
if err != nil {
523524
return false, err
524525
}
525-
resp, err := objects.BulkDelete(client, cr.Spec.Storage.Swift.Container, objectsOnPage).Extract()
526+
resp, err := objects.BulkDelete(ctx, client, cr.Spec.Storage.Swift.Container, objectsOnPage).Extract()
526527
if err != nil {
527528
return false, err
528529
}
@@ -540,14 +541,14 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
540541

541542
return true, nil
542543
}); err != nil {
543-
if _, ok := err.(gophercloud.ErrDefault404); !ok {
544+
if !gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
544545
return false, err
545546
}
546547
}
547548

548-
_, err = containers.Delete(client, cr.Spec.Storage.Swift.Container).Extract()
549+
_, err = containers.Delete(context.TODO(), client, cr.Spec.Storage.Swift.Container).Extract()
549550
if err != nil {
550-
if _, ok := err.(gophercloud.ErrDefault404); !ok {
551+
if !gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
551552
util.UpdateCondition(cr, defaults.StorageExists, operatorapi.ConditionUnknown, err.Error(), err.Error())
552553
return false, err
553554
}

‎pkg/storage/swift/swift_test.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package swift
22

33
import (
4+
"context"
45
"encoding/json"
56
"errors"
67
"fmt"
@@ -9,9 +10,9 @@ import (
910
"testing"
1011

1112
"github.com/davecgh/go-spew/spew"
12-
"github.com/gophercloud/gophercloud"
13-
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers"
14-
th "github.com/gophercloud/gophercloud/testhelper"
13+
"github.com/gophercloud/gophercloud/v2"
14+
"github.com/gophercloud/gophercloud/v2/openstack/objectstorage/v1/containers"
15+
th "github.com/gophercloud/gophercloud/v2/testhelper"
1516

1617
corev1 "k8s.io/api/core/v1"
1718
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -1101,10 +1102,10 @@ func TestNoPermissionsKeystone(t *testing.T) {
11011102
conn, err := d.getSwiftClient()
11021103
th.AssertNoErr(t, err)
11031104

1104-
// if the user doesn't have permissions, gophercloud should return ErrDefault403
1105-
listOpts := containers.ListOpts{Full: false}
1106-
_, err = containers.List(conn, listOpts).AllPages()
1107-
_, ok := err.(gophercloud.ErrDefault403)
1105+
// if the user doesn't have permissions, gophercloud should return StatusForbidden
1106+
listOpts := containers.ListOpts{}
1107+
_, err = containers.List(conn, listOpts).AllPages(context.TODO())
1108+
ok := gophercloud.ResponseCodeIs(err, http.StatusForbidden)
11081109
th.AssertEquals(t, true, ok)
11091110

11101111
// IsSwiftEnabled should return false in this case
@@ -1153,10 +1154,10 @@ func TestNoPermissionsSwauth(t *testing.T) {
11531154
conn, err := d.getSwiftClient()
11541155
th.AssertNoErr(t, err)
11551156

1156-
// if the user doesn't have permissions, gophercloud should return ErrDefault401
1157-
listOpts := containers.ListOpts{Full: false}
1158-
_, err = containers.List(conn, listOpts).AllPages()
1159-
_, ok := err.(gophercloud.ErrDefault401)
1157+
// if the user doesn't have permissions, gophercloud should return Status.Unauthorized
1158+
listOpts := containers.ListOpts{}
1159+
_, err = containers.List(conn, listOpts).AllPages(context.TODO())
1160+
ok := gophercloud.ResponseCodeIs(err, http.StatusUnauthorized)
11601161
th.AssertEquals(t, true, ok)
11611162

11621163
// IsSwiftEnabled should return false in this case

‎vendor/github.com/gofrs/uuid/v5/.gitignore

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gofrs/uuid/v5/.pre-commit-config.yaml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gofrs/uuid/v5/LICENSE

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)