Add WithUserCatalog field in AKSKAuthOptions

auth_aksk_options.go

@@ -38,6 +38,9 @@ type AKSKAuthOptions struct {
 
 	// DelegatedProject is the name of delegated project
 	DelegatedProject string
+
+	// whether using the customer catalog, defaults to false
+	WithUserCatalog bool
 }
 
 // GetIdentityEndpoint implements the method of AuthOptionsProvider

openstack/client.go

@@ -357,27 +357,29 @@ func v3AKSKAuth(client *golangsdk.ProviderClient, endpoint string, options golan
 	client.ProjectID = options.ProjectId
 	client.DomainID = options.BssDomainID
 
-	var entries = make([]tokens3.CatalogEntry, 0, 1)
-	err = catalog.List(v3Client).EachPage(func(page pagination.Page) (bool, error) {
-		catalogList, err := catalog.ExtractServiceCatalog(page)
-		if err != nil {
-			return false, err
-		}
+	if !options.WithUserCatalog {
+		var entries = make([]tokens3.CatalogEntry, 0, 1)
+		err = catalog.List(v3Client).EachPage(func(page pagination.Page) (bool, error) {
+			catalogList, err := catalog.ExtractServiceCatalog(page)
+			if err != nil {
+				return false, err
+			}
 
-		entries = append(entries, catalogList...)
+			entries = append(entries, catalogList...)
+			return true, nil
+		})
 
-		return true, nil
-	})
+		if err != nil {
+			return err
+		}
 
-	if err != nil {
-		return err
+		client.EndpointLocator = func(opts golangsdk.EndpointOpts) (string, error) {
+			return V3EndpointURL(&tokens3.ServiceCatalog{
+				Entries: entries,
+			}, opts)
+		}
 	}
 
-	client.EndpointLocator = func(opts golangsdk.EndpointOpts) (string, error) {
-		return V3EndpointURL(&tokens3.ServiceCatalog{
-			Entries: entries,
-		}, opts)
-	}
 	return nil
 }