mirror of
https://github.com/opentffoundation/opentf.git
synced 2026-04-24 18:00:57 -04:00
Update deps in unknown state and rever nomad
Nomad was manually updated, so revert that to the version in master, remove it from vendor.json and add it to the ignore list. Update all packages that were in an unknown state to their latest master commits.
This commit is contained in:
30
vendor/github.com/rackspace/gophercloud/openstack/client.go
generated
vendored
30
vendor/github.com/rackspace/gophercloud/openstack/client.go
generated
vendored
@@ -39,20 +39,20 @@ func NewClient(endpoint string) (*gophercloud.ProviderClient, error) {
|
||||
}
|
||||
|
||||
parts := strings.Split(path[0:len(path)-1], "/")
|
||||
for index,version := range(parts) {
|
||||
for index, version := range parts {
|
||||
if 2 <= len(version) && len(version) <= 4 && strings.HasPrefix(version, "v") {
|
||||
_, err := strconv.ParseFloat(version[1:], 64)
|
||||
if err == nil {
|
||||
// post version suffixes in path are not supported
|
||||
// version must be on the last index
|
||||
if index < len(parts) - 1 {
|
||||
if index < len(parts)-1 {
|
||||
return nil, fmt.Errorf("Path suffixes (after version) are not supported.")
|
||||
}
|
||||
switch version {
|
||||
case "v2.0", "v3":
|
||||
// valid version found, strip from base
|
||||
return &gophercloud.ProviderClient{
|
||||
IdentityBase: base[0:len(base)-len(version)-1],
|
||||
IdentityBase: base[0 : len(base)-len(version)-1],
|
||||
IdentityEndpoint: endpoint,
|
||||
}, nil
|
||||
default:
|
||||
@@ -179,7 +179,7 @@ func v3auth(client *gophercloud.ProviderClient, endpoint string, options gopherc
|
||||
}
|
||||
}
|
||||
|
||||
result := tokens3.Create(v3Client, v3Options, scope)
|
||||
result := tokens3.Create(v3Client, tokens3.AuthOptions{AuthOptions: v3Options}, scope)
|
||||
|
||||
token, err := result.ExtractToken()
|
||||
if err != nil {
|
||||
@@ -344,3 +344,25 @@ func NewDBV1(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*
|
||||
}
|
||||
return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url}, nil
|
||||
}
|
||||
|
||||
// NewImageServiceV2 creates a ServiceClient that may be used to access the v2 image service.
|
||||
func NewImageServiceV2(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
|
||||
eo.ApplyDefaults("image")
|
||||
url, err := client.EndpointLocator(eo)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &gophercloud.ServiceClient{ProviderClient: client,
|
||||
Endpoint: url,
|
||||
ResourceBase: url + "v2/"}, nil
|
||||
}
|
||||
|
||||
// NewTelemetryV2 creates a ServiceClient that may be used to access the v2 telemetry service.
|
||||
func NewTelemetryV2(client *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
|
||||
eo.ApplyDefaults("metering")
|
||||
url, err := client.EndpointLocator(eo)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url}, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user