Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 20 additions & 35 deletions internal/openstack/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,26 @@ func (c *Context) Activate(other *Context) {
c.serviceClients = sync.Map{}
}

type clientServiceBuilder func(*gophercloud.ProviderClient, gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error)

func (c *Context) getClientService(key string, opts gophercloud.EndpointOpts, builder clientServiceBuilder) (*gophercloud.ServiceClient, error) {
if c.Provider == nil {
return nil, fmt.Errorf("context %q is not connected", c.Cloud)
}

if client, ok := c.serviceClients.Load(key); ok {
return client.(*gophercloud.ServiceClient), nil
}

client, err := builder(c.Provider, opts)
if err != nil {
return nil, fmt.Errorf("creating %s client: %w", key, err)
}

actual, _ := c.serviceClients.LoadOrStore(key, client)
return actual.(*gophercloud.ServiceClient), nil
}

func (c *Context) ServiceCatalog() (*identitytokens.ServiceCatalog, error) {
if c.Provider == nil {
return nil, fmt.Errorf("context %q is not connected", c.Cloud)
Expand Down Expand Up @@ -136,41 +156,6 @@ func (c *Context) ObjectStorageV1() (*gophercloud.ServiceClient, error) {
return c.getClientService("object-storage", gophercloud.EndpointOpts{Region: c.Region}, openstack.NewObjectStorageV1)
}

//
//func (c *Context) SharedFileSystemV2() (*gophercloud.ServiceClient, error) {
// return c.getClientService("shared-file-system", gophercloud.EndpointOpts{Region: c.Region}, openstack.NewSharedFileSystemV2)
//}

type clientServiceBuilder func(*gophercloud.ProviderClient, gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error)

func (c *Context) getClientService(key string, opts gophercloud.EndpointOpts, builder clientServiceBuilder) (*gophercloud.ServiceClient, error) {
if c.Provider == nil {
return nil, fmt.Errorf("context %q is not connected", c.Cloud)
}

if client, ok := c.serviceClients.Load(key); ok {
return client.(*gophercloud.ServiceClient), nil
}

client, err := builder(c.Provider, opts)
if err != nil {
return nil, fmt.Errorf("creating %s client: %w", key, err)
}

actual, _ := c.serviceClients.LoadOrStore(key, client)
return actual.(*gophercloud.ServiceClient), nil
}

func (c *Context) SharedFileSystemV2() (*gophercloud.ServiceClient, error) {
return c.getClientService("shared-file-system", gophercloud.EndpointOpts{Region: c.Region}, newSharedFileSystemV2)
}

func newSharedFileSystemV2(provider *gophercloud.ProviderClient, opts gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
client, err := openstack.NewSharedFileSystemV2(provider, opts)
if err != nil {
return nil, err
}

client.Microversion = "2.60"
return client, nil
}
38 changes: 38 additions & 0 deletions internal/openstack/context_serviceclients.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package openstack

import (
"context"
"fmt"

"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/apiversions"
)

func newSharedFileSystemV2(provider *gophercloud.ProviderClient, opts gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
client, err := openstack.NewSharedFileSystemV2(provider, opts)
if err != nil {
return nil, err
}

pages, err := apiversions.List(client).AllPages(context.Background())
if err != nil {
return nil, fmt.Errorf("listing shared file system API versions: %w", err)
}

versions, err := apiversions.ExtractAPIVersions(pages)
if err != nil {
return nil, fmt.Errorf("extracting shared file system API versions: %w", err)
}

for _, version := range versions {
if version.ID != "v2.0" {
continue
}

client.Microversion = min(version.Version, "2.60")
return client, nil
}

return nil, fmt.Errorf("shared file system API v2 not found")
}
Loading