Skip to content

Commit a894551

Browse files
EmilienMEmilienM
authored
Merge pull request #2936 from shiftstack/ctx_everywhere
Make Gophercloud context-aware
2 parents a0197b7 + 1b7c1ce commit a894551

694 files changed

Lines changed: 5954 additions & 5250 deletions

File tree

Some content is hidden

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

‎internal/acceptance/clients/clients.go‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package clients
55

66
import (
7+
"context"
78
"fmt"
89
"net/http"
910
"os"
@@ -143,7 +144,7 @@ func NewBlockStorageV1Client() (*gophercloud.ServiceClient, error) {
143144
return nil, err
144145
}
145146

146-
client, err := openstack.AuthenticatedClient(ao)
147+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
147148
if err != nil {
148149
return nil, err
149150
}
@@ -164,7 +165,7 @@ func NewBlockStorageV2Client() (*gophercloud.ServiceClient, error) {
164165
return nil, err
165166
}
166167

167-
client, err := openstack.AuthenticatedClient(ao)
168+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
168169
if err != nil {
169170
return nil, err
170171
}
@@ -185,7 +186,7 @@ func NewBlockStorageV3Client() (*gophercloud.ServiceClient, error) {
185186
return nil, err
186187
}
187188

188-
client, err := openstack.AuthenticatedClient(ao)
189+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
189190
if err != nil {
190191
return nil, err
191192
}
@@ -244,7 +245,7 @@ func NewComputeV2Client() (*gophercloud.ServiceClient, error) {
244245
return nil, err
245246
}
246247

247-
client, err := openstack.AuthenticatedClient(ao)
248+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
248249
if err != nil {
249250
return nil, err
250251
}
@@ -265,7 +266,7 @@ func NewBareMetalV1Client() (*gophercloud.ServiceClient, error) {
265266
return nil, err
266267
}
267268

268-
client, err := openstack.AuthenticatedClient(ao)
269+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
269270
if err != nil {
270271
return nil, err
271272
}
@@ -306,7 +307,7 @@ func NewBareMetalIntrospectionV1Client() (*gophercloud.ServiceClient, error) {
306307
return nil, err
307308
}
308309

309-
client, err := openstack.AuthenticatedClient(ao)
310+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
310311
if err != nil {
311312
return nil, err
312313
}
@@ -327,7 +328,7 @@ func NewDBV1Client() (*gophercloud.ServiceClient, error) {
327328
return nil, err
328329
}
329330

330-
client, err := openstack.AuthenticatedClient(ao)
331+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
331332
if err != nil {
332333
return nil, err
333334
}
@@ -348,7 +349,7 @@ func NewDNSV2Client() (*gophercloud.ServiceClient, error) {
348349
return nil, err
349350
}
350351

351-
client, err := openstack.AuthenticatedClient(ao)
352+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
352353
if err != nil {
353354
return nil, err
354355
}
@@ -369,7 +370,7 @@ func NewIdentityV2Client() (*gophercloud.ServiceClient, error) {
369370
return nil, err
370371
}
371372

372-
client, err := openstack.AuthenticatedClient(ao)
373+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
373374
if err != nil {
374375
return nil, err
375376
}
@@ -390,7 +391,7 @@ func NewIdentityV2AdminClient() (*gophercloud.ServiceClient, error) {
390391
return nil, err
391392
}
392393

393-
client, err := openstack.AuthenticatedClient(ao)
394+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
394395
if err != nil {
395396
return nil, err
396397
}
@@ -431,7 +432,7 @@ func NewIdentityV3Client() (*gophercloud.ServiceClient, error) {
431432
return nil, err
432433
}
433434

434-
client, err := openstack.AuthenticatedClient(ao)
435+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
435436
if err != nil {
436437
return nil, err
437438
}
@@ -471,7 +472,7 @@ func NewImageServiceV2Client() (*gophercloud.ServiceClient, error) {
471472
return nil, err
472473
}
473474

474-
client, err := openstack.AuthenticatedClient(ao)
475+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
475476
if err != nil {
476477
return nil, err
477478
}
@@ -492,7 +493,7 @@ func NewNetworkV2Client() (*gophercloud.ServiceClient, error) {
492493
return nil, err
493494
}
494495

495-
client, err := openstack.AuthenticatedClient(ao)
496+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
496497
if err != nil {
497498
return nil, err
498499
}
@@ -513,7 +514,7 @@ func NewObjectStorageV1Client() (*gophercloud.ServiceClient, error) {
513514
return nil, err
514515
}
515516

516-
client, err := openstack.AuthenticatedClient(ao)
517+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
517518
if err != nil {
518519
return nil, err
519520
}
@@ -534,7 +535,7 @@ func NewSharedFileSystemV2Client() (*gophercloud.ServiceClient, error) {
534535
return nil, err
535536
}
536537

537-
client, err := openstack.AuthenticatedClient(ao)
538+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
538539
if err != nil {
539540
return nil, err
540541
}
@@ -555,7 +556,7 @@ func NewLoadBalancerV2Client() (*gophercloud.ServiceClient, error) {
555556
return nil, err
556557
}
557558

558-
client, err := openstack.AuthenticatedClient(ao)
559+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
559560
if err != nil {
560561
return nil, err
561562
}
@@ -576,7 +577,7 @@ func NewClusteringV1Client() (*gophercloud.ServiceClient, error) {
576577
return nil, err
577578
}
578579

579-
client, err := openstack.AuthenticatedClient(ao)
580+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
580581
if err != nil {
581582
return nil, err
582583
}
@@ -597,7 +598,7 @@ func NewMessagingV2Client(clientID string) (*gophercloud.ServiceClient, error) {
597598
return nil, err
598599
}
599600

600-
client, err := openstack.AuthenticatedClient(ao)
601+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
601602
if err != nil {
602603
return nil, err
603604
}
@@ -618,7 +619,7 @@ func NewContainerV1Client() (*gophercloud.ServiceClient, error) {
618619
return nil, err
619620
}
620621

621-
client, err := openstack.AuthenticatedClient(ao)
622+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
622623
if err != nil {
623624
return nil, err
624625
}
@@ -639,7 +640,7 @@ func NewKeyManagerV1Client() (*gophercloud.ServiceClient, error) {
639640
return nil, err
640641
}
641642

642-
client, err := openstack.AuthenticatedClient(ao)
643+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
643644
if err != nil {
644645
return nil, err
645646
}
@@ -674,7 +675,7 @@ func NewContainerInfraV1Client() (*gophercloud.ServiceClient, error) {
674675
return nil, err
675676
}
676677

677-
client, err := openstack.AuthenticatedClient(ao)
678+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
678679
if err != nil {
679680
return nil, err
680681
}
@@ -695,7 +696,7 @@ func NewWorkflowV2Client() (*gophercloud.ServiceClient, error) {
695696
return nil, err
696697
}
697698

698-
client, err := openstack.AuthenticatedClient(ao)
699+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
699700
if err != nil {
700701
return nil, err
701702
}
@@ -716,7 +717,7 @@ func NewOrchestrationV1Client() (*gophercloud.ServiceClient, error) {
716717
return nil, err
717718
}
718719

719-
client, err := openstack.AuthenticatedClient(ao)
720+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
720721
if err != nil {
721722
return nil, err
722723
}
@@ -737,7 +738,7 @@ func NewPlacementV1Client() (*gophercloud.ServiceClient, error) {
737738
return nil, err
738739
}
739740

740-
client, err := openstack.AuthenticatedClient(ao)
741+
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
741742
if err != nil {
742743
return nil, err
743744
}

‎internal/acceptance/openstack/baremetal/httpbasic/allocations_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package httpbasic
55

66
import (
7+
"context"
78
"testing"
89

910
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -27,7 +28,7 @@ func TestAllocationsCreateDestroy(t *testing.T) {
2728
defer v1.DeleteAllocation(t, client, allocation)
2829

2930
found := false
30-
err = allocations.List(client, allocations.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
31+
err = allocations.List(client, allocations.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3132
allocationList, err := allocations.ExtractAllocations(page)
3233
if err != nil {
3334
return false, err

‎internal/acceptance/openstack/baremetal/httpbasic/nodes_test.go‎

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

33
import (
4+
"context"
45
"testing"
56

67
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -24,7 +25,7 @@ func TestNodesCreateDestroy(t *testing.T) {
2425
defer v1.DeleteNode(t, client, node)
2526

2627
found := false
27-
err = nodes.List(client, nodes.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
28+
err = nodes.List(client, nodes.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
2829
nodeList, err := nodes.ExtractNodes(page)
2930
if err != nil {
3031
return false, err
@@ -56,7 +57,7 @@ func TestNodesUpdate(t *testing.T) {
5657
th.AssertNoErr(t, err)
5758
defer v1.DeleteNode(t, client, node)
5859

59-
updated, err := nodes.Update(client, node.UUID, nodes.UpdateOpts{
60+
updated, err := nodes.Update(context.TODO(), client, node.UUID, nodes.UpdateOpts{
6061
nodes.UpdateOperation{
6162
Op: nodes.ReplaceOp,
6263
Path: "/maintenance",
@@ -84,7 +85,7 @@ func TestNodesRAIDConfig(t *testing.T) {
8485
sizeGB := 100
8586
isTrue := true
8687

87-
err = nodes.SetRAIDConfig(client, node.UUID, nodes.RAIDConfigOpts{
88+
err = nodes.SetRAIDConfig(context.TODO(), client, node.UUID, nodes.RAIDConfigOpts{
8889
LogicalDisks: []nodes.LogicalDisk{
8990
{
9091
SizeGB: &sizeGB,
@@ -113,7 +114,7 @@ func TestNodesFirmwareInterface(t *testing.T) {
113114

114115
th.AssertEquals(t, node.FirmwareInterface, "no-firmware")
115116

116-
nodeFirmwareCmps, err := nodes.ListFirmware(client, node.UUID).Extract()
117+
nodeFirmwareCmps, err := nodes.ListFirmware(context.TODO(), client, node.UUID).Extract()
117118
th.AssertNoErr(t, err)
118119
th.AssertDeepEquals(t, nodeFirmwareCmps, []nodes.FirmwareComponent{})
119120
}

‎internal/acceptance/openstack/baremetal/httpbasic/ports_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package httpbasic
55

66
import (
7+
"context"
78
"testing"
89

910
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -29,7 +30,7 @@ func TestPortsCreateDestroy(t *testing.T) {
2930
defer v1.DeletePort(t, client, port)
3031

3132
found := false
32-
err = ports.List(client, ports.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
33+
err = ports.List(client, ports.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3334
portList, err := ports.ExtractPorts(page)
3435
if err != nil {
3536
return false, err
@@ -63,7 +64,7 @@ func TestPortsUpdate(t *testing.T) {
6364
defer v1.DeleteNode(t, client, node)
6465
defer v1.DeletePort(t, client, port)
6566

66-
updated, err := ports.Update(client, port.UUID, ports.UpdateOpts{
67+
updated, err := ports.Update(context.TODO(), client, port.UUID, ports.UpdateOpts{
6768
ports.UpdateOperation{
6869
Op: ports.ReplaceOp,
6970
Path: "/address",

‎internal/acceptance/openstack/baremetal/noauth/allocations_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package noauth
55

66
import (
7+
"context"
78
"testing"
89

910
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -26,7 +27,7 @@ func TestAllocationsCreateDestroy(t *testing.T) {
2627
defer v1.DeleteAllocation(t, client, allocation)
2728

2829
found := false
29-
err = allocations.List(client, allocations.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
30+
err = allocations.List(client, allocations.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3031
allocationList, err := allocations.ExtractAllocations(page)
3132
if err != nil {
3233
return false, err

‎internal/acceptance/openstack/baremetal/noauth/nodes_test.go‎

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

33
import (
4+
"context"
45
"testing"
56

67
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -23,7 +24,7 @@ func TestNodesCreateDestroy(t *testing.T) {
2324
defer v1.DeleteNode(t, client, node)
2425

2526
found := false
26-
err = nodes.List(client, nodes.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
27+
err = nodes.List(client, nodes.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
2728
nodeList, err := nodes.ExtractNodes(page)
2829
if err != nil {
2930
return false, err
@@ -54,7 +55,7 @@ func TestNodesUpdate(t *testing.T) {
5455
th.AssertNoErr(t, err)
5556
defer v1.DeleteNode(t, client, node)
5657

57-
updated, err := nodes.Update(client, node.UUID, nodes.UpdateOpts{
58+
updated, err := nodes.Update(context.TODO(), client, node.UUID, nodes.UpdateOpts{
5859
nodes.UpdateOperation{
5960
Op: nodes.ReplaceOp,
6061
Path: "/maintenance",
@@ -81,7 +82,7 @@ func TestNodesRAIDConfig(t *testing.T) {
8182
sizeGB := 100
8283
isTrue := true
8384

84-
err = nodes.SetRAIDConfig(client, node.UUID, nodes.RAIDConfigOpts{
85+
err = nodes.SetRAIDConfig(context.TODO(), client, node.UUID, nodes.RAIDConfigOpts{
8586
LogicalDisks: []nodes.LogicalDisk{
8687
{
8788
SizeGB: &sizeGB,

‎internal/acceptance/openstack/baremetal/noauth/ports_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package noauth
55

66
import (
7+
"context"
78
"testing"
89

910
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
@@ -28,7 +29,7 @@ func TestPortsCreateDestroy(t *testing.T) {
2829
defer v1.DeletePort(t, client, port)
2930

3031
found := false
31-
err = ports.List(client, ports.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
32+
err = ports.List(client, ports.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
3233
portList, err := ports.ExtractPorts(page)
3334
if err != nil {
3435
return false, err
@@ -61,7 +62,7 @@ func TestPortsUpdate(t *testing.T) {
6162
defer v1.DeleteNode(t, client, node)
6263
defer v1.DeletePort(t, client, port)
6364

64-
updated, err := ports.Update(client, port.UUID, ports.UpdateOpts{
65+
updated, err := ports.Update(context.TODO(), client, port.UUID, ports.UpdateOpts{
6566
ports.UpdateOperation{
6667
Op: ports.ReplaceOp,
6768
Path: "/address",

0 commit comments

Comments
 (0)