Add BaseVersionedEndpoint helper

stephenfin · stephenfin · commit 2bf97ce67e24 · 2025-05-16T12:48:47.000+01:00
This retrieves the base endpoint without stripping the version information.
This is helpful for service catalog entries that include project IDs, like
those historically preferred by Cinder for some reason.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/openstack/utils/base_endpoint.go b/openstack/utils/base_endpoint.go
@@ -6,9 +6,7 @@ import (
 	"strings"
 )
 
-// BaseEndpoint will return a URL without the /vX.Y
-// portion of the URL.
-func BaseEndpoint(endpoint string) (string, error) {
+func parseEndpoint(endpoint string, includeVersion bool) (string, error) {
 	u, err := url.Parse(endpoint)
 	if err != nil {
 		return "", err
@@ -21,8 +19,23 @@ func BaseEndpoint(endpoint string) (string, error) {
 
 	if version := versionRe.FindString(path); version != "" {
 		versionIndex := strings.Index(path, version)
+		if includeVersion {
+			versionIndex += len(version)
+		}
 		u.Path = path[:versionIndex]
 	}
 
 	return u.String(), nil
 }
+
+// BaseEndpoint will return a URL without the /vX.Y
+// portion of the URL.
+func BaseEndpoint(endpoint string) (string, error) {
+	return parseEndpoint(endpoint, false)
+}
+
+// BaseVersionedEndpoint will return a URL with the /vX.Y portion of the URL,
+// if present, but without a project ID or similar
+func BaseVersionedEndpoint(endpoint string) (string, error) {
+	return parseEndpoint(endpoint, true)
+}
