Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-09-19 20:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: update module github.com/gophercloud/gophercloud to v2 (#3300)

Browse source 
* deps: update module github.com/gophercloud/gophercloud to v2

* update module github.com/gophercloud/utils to v2 and add context

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

---------

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
renovate[bot] 2024-08-08 10:37:09 +02:00 • committed by GitHub
parent 8b256f20b8
commit 087855ec00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/cloud/openstack/openstack.go
View file

@ -17,10 +17,10 @@ import (
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
"github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/role"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
"github.com/gophercloud/utils/openstack/clientconfig"
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets"
"github.com/gophercloud/utils/v2/openstack/clientconfig"
)
const (
@ -65,13 +65,13 @@ func New(ctx context.Context) (*MetadataClient, error) {
},
}
serversClient, err := clientconfig.NewServiceClient("compute", clientOpts)
serversClient, err := clientconfig.NewServiceClient(ctx, "compute", clientOpts)
if err != nil {
return nil, fmt.Errorf("creating compute client: %w", err)
}
serversClient.Microversion = microversion
networksClient, err := clientconfig.NewServiceClient("network", clientOpts)
networksClient, err := clientconfig.NewServiceClient(ctx, "network", clientOpts)
if err != nil {
return nil, fmt.Errorf("creating network client: %w", err)
}
@ -122,12 +122,12 @@ func (c *MetadataClient) List(ctx context.Context) ([]metadata.InstanceMetadata,
uidTag := fmt.Sprintf("constellation-uid-%s", uid)
subnet, err := c.getSubnetCIDR(uidTag)
subnet, err := c.getSubnetCIDR(ctx, uidTag)
if err != nil {
return nil, err
}
srvs, err := c.getServers(uidTag)
srvs, err := c.getServers(ctx, uidTag)
if err != nil {
return nil, err
}
@ -240,9 +240,9 @@ func (c *MetadataClient) GetLoadBalancerEndpoint(ctx context.Context) (host, por
return host, strconv.FormatInt(constants.KubernetesPort, 10), nil
}
func (c *MetadataClient) getSubnetCIDR(uidTag string) (netip.Prefix, error) {
func (c *MetadataClient) getSubnetCIDR(ctx context.Context, uidTag string) (netip.Prefix, error) {
listNetworksOpts := networks.ListOpts{Tags: uidTag}
networksPage, err := c.api.ListNetworks(listNetworksOpts).AllPages()
networksPage, err := c.api.ListNetworks(listNetworksOpts).AllPages(ctx)
if err != nil {
return netip.Prefix{}, fmt.Errorf("listing networks: %w", err)
}
@ -255,7 +255,7 @@ func (c *MetadataClient) getSubnetCIDR(uidTag string) (netip.Prefix, error) {
}
listSubnetsOpts := subnets.ListOpts{Tags: uidTag}
subnetsPage, err := c.api.ListSubnets(listSubnetsOpts).AllPages()
subnetsPage, err := c.api.ListSubnets(listSubnetsOpts).AllPages(ctx)
if err != nil {
return netip.Prefix{}, fmt.Errorf("listing subnets: %w", err)
}
@ -285,9 +285,9 @@ func (c *MetadataClient) getSubnetCIDR(uidTag string) (netip.Prefix, error) {
return cidr, nil
}
func (c *MetadataClient) getServers(uidTag string) ([]servers.Server, error) {
func (c *MetadataClient) getServers(ctx context.Context, uidTag string) ([]servers.Server, error) {
listServersOpts := servers.ListOpts{Tags: uidTag}
serversPage, err := c.api.ListServers(listServersOpts).AllPages()
serversPage, err := c.api.ListServers(listServersOpts).AllPages(ctx)
if err != nil {
return nil, fmt.Errorf("listing servers: %w", err)
}