Skip to content

Commit

Permalink
Merge pull request #2943 from gophercloud/bp-v2-1b7c1ce
Browse files Browse the repository at this point in the history
[v2] Make Gophercloud context-aware
  • Loading branch information
pierreprinetti committed Feb 26, 2024
2 parents 8bb1709 + 070d5fb commit 2444539
Show file tree
Hide file tree
Showing 694 changed files with 5,954 additions and 5,250 deletions.
49 changes: 25 additions & 24 deletions internal/acceptance/clients/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package clients

import (
"context"
"fmt"
"net/http"
"os"
Expand Down Expand Up @@ -143,7 +144,7 @@ func NewBlockStorageV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -164,7 +165,7 @@ func NewBlockStorageV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -185,7 +186,7 @@ func NewBlockStorageV3Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -244,7 +245,7 @@ func NewComputeV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -265,7 +266,7 @@ func NewBareMetalV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -306,7 +307,7 @@ func NewBareMetalIntrospectionV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -327,7 +328,7 @@ func NewDBV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -348,7 +349,7 @@ func NewDNSV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -369,7 +370,7 @@ func NewIdentityV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -390,7 +391,7 @@ func NewIdentityV2AdminClient() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -431,7 +432,7 @@ func NewIdentityV3Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -471,7 +472,7 @@ func NewImageServiceV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -492,7 +493,7 @@ func NewNetworkV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -513,7 +514,7 @@ func NewObjectStorageV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -534,7 +535,7 @@ func NewSharedFileSystemV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -555,7 +556,7 @@ func NewLoadBalancerV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -576,7 +577,7 @@ func NewClusteringV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -597,7 +598,7 @@ func NewMessagingV2Client(clientID string) (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -618,7 +619,7 @@ func NewContainerV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -639,7 +640,7 @@ func NewKeyManagerV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -674,7 +675,7 @@ func NewContainerInfraV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -695,7 +696,7 @@ func NewWorkflowV2Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -716,7 +717,7 @@ func NewOrchestrationV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand All @@ -737,7 +738,7 @@ func NewPlacementV1Client() (*gophercloud.ServiceClient, error) {
return nil, err
}

client, err := openstack.AuthenticatedClient(ao)
client, err := openstack.AuthenticatedClient(context.TODO(), ao)
if err != nil {
return nil, err
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package httpbasic

import (
"context"
"testing"

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

found := false
err = allocations.List(client, allocations.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
err = allocations.List(client, allocations.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
allocationList, err := allocations.ExtractAllocations(page)
if err != nil {
return false, err
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package httpbasic

import (
"context"
"testing"

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

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

updated, err := nodes.Update(client, node.UUID, nodes.UpdateOpts{
updated, err := nodes.Update(context.TODO(), client, node.UUID, nodes.UpdateOpts{
nodes.UpdateOperation{
Op: nodes.ReplaceOp,
Path: "/maintenance",
Expand Down Expand Up @@ -84,7 +85,7 @@ func TestNodesRAIDConfig(t *testing.T) {
sizeGB := 100
isTrue := true

err = nodes.SetRAIDConfig(client, node.UUID, nodes.RAIDConfigOpts{
err = nodes.SetRAIDConfig(context.TODO(), client, node.UUID, nodes.RAIDConfigOpts{
LogicalDisks: []nodes.LogicalDisk{
{
SizeGB: &sizeGB,
Expand Down Expand Up @@ -113,7 +114,7 @@ func TestNodesFirmwareInterface(t *testing.T) {

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

nodeFirmwareCmps, err := nodes.ListFirmware(client, node.UUID).Extract()
nodeFirmwareCmps, err := nodes.ListFirmware(context.TODO(), client, node.UUID).Extract()
th.AssertNoErr(t, err)
th.AssertDeepEquals(t, nodeFirmwareCmps, []nodes.FirmwareComponent{})
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package httpbasic

import (
"context"
"testing"

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

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

updated, err := ports.Update(client, port.UUID, ports.UpdateOpts{
updated, err := ports.Update(context.TODO(), client, port.UUID, ports.UpdateOpts{
ports.UpdateOperation{
Op: ports.ReplaceOp,
Path: "/address",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package noauth

import (
"context"
"testing"

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

found := false
err = allocations.List(client, allocations.ListOpts{}).EachPage(func(page pagination.Page) (bool, error) {
err = allocations.List(client, allocations.ListOpts{}).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
allocationList, err := allocations.ExtractAllocations(page)
if err != nil {
return false, err
Expand Down
7 changes: 4 additions & 3 deletions internal/acceptance/openstack/baremetal/noauth/nodes_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package noauth

import (
"context"
"testing"

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

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

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

err = nodes.SetRAIDConfig(client, node.UUID, nodes.RAIDConfigOpts{
err = nodes.SetRAIDConfig(context.TODO(), client, node.UUID, nodes.RAIDConfigOpts{
LogicalDisks: []nodes.LogicalDisk{
{
SizeGB: &sizeGB,
Expand Down
5 changes: 3 additions & 2 deletions internal/acceptance/openstack/baremetal/noauth/ports_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package noauth

import (
"context"
"testing"

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

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

updated, err := ports.Update(client, port.UUID, ports.UpdateOpts{
updated, err := ports.Update(context.TODO(), client, port.UUID, ports.UpdateOpts{
ports.UpdateOperation{
Op: ports.ReplaceOp,
Path: "/address",
Expand Down

0 comments on commit 2444539

Please sign in to comment.