Switch clients to versioned endpoint discovery helpers

stephenfin · stephenfin · commit 8139f993585d · 2025-05-16T12:48:47.000+01:00
And deprecate the old ones since they are no longer used.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/openstack/client.go b/openstack/client.go
@@ -163,7 +163,7 @@ func v2auth(ctx context.Context, client *gophercloud.ProviderClient, endpoint st
 		}
 	}
 	client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {
-		return V2EndpointURL(catalog, opts)
+		return V2Endpoint(ctx, client, catalog, opts)
 	}
 
 	return nil
@@ -284,7 +284,7 @@ func v3auth(ctx context.Context, client *gophercloud.ProviderClient, endpoint st
 		}
 	}
 	client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {
-		return V3EndpointURL(catalog, opts)
+		return V3Endpoint(ctx, client, catalog, opts)
 	}
 
 	return nil
diff --git a/openstack/endpoint_location.go b/openstack/endpoint_location.go
@@ -8,6 +8,8 @@ import (
 	tokens3 "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
 )
 
+// TODO(stephenfin): Remove this module in v3. The functions below are no longer used.
+
 /*
 V2EndpointURL discovers the endpoint URL for a specific service from a
 ServiceCatalog acquired during the v2 identity service.

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func v2auth(ctx context.Context, client *gophercloud.ProviderClient, endpoint st`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {`
`166`		`- return V2EndpointURL(catalog, opts)`
	`166`	`+ return V2Endpoint(ctx, client, catalog, opts)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`return nil`
`@@ -284,7 +284,7 @@ func v3auth(ctx context.Context, client *gophercloud.ProviderClient, endpoint st`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`	`client.EndpointLocator = func(opts gophercloud.EndpointOpts) (string, error) {`
`287`		`- return V3EndpointURL(catalog, opts)`
	`287`	`+ return V3Endpoint(ctx, client, catalog, opts)`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ import (`
`8`	`8`	`tokens3 "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"`
`9`	`9`	`)`
`10`	`10`
	`11`	`+// TODO(stephenfin): Remove this module in v3. The functions below are no longer used.`
	`12`	`+`
`11`	`13`	`/*`
`12`	`14`	`V2EndpointURL discovers the endpoint URL for a specific service from a`
`13`	`15`	`ServiceCatalog acquired during the v2 identity service.`