config: add validation of domain name (#607)

FlexibleEngineCloud · Sep 10, 2021 · 2dc5ce0 · 2dc5ce0
1 parent f26b34f
commit 2dc5ce0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/flexibleengine/config.go b/flexibleengine/config.go
@@ -342,10 +342,8 @@ func (c *Config) getDomainID() (string, error) {
 
 	identityClient.ResourceBase = identityClient.Endpoint + "auth/"
 
-	opts := domains.ListOpts{
-		Name: c.DomainName,
-	}
-	allPages, err := domains.List(identityClient, &opts).AllPages()
+	// the List request does not support query options
+	allPages, err := domains.List(identityClient, nil).AllPages()
 	if err != nil {
 		return "", fmt.Errorf("List domains failed, err=%s", err)
 	}
@@ -359,6 +357,10 @@ func (c *Config) getDomainID() (string, error) {
 		return "", fmt.Errorf("domain was not found")
 	}
 
+	if c.DomainName != "" && c.DomainName != all[0].Name {
+		return "", fmt.Errorf("domain %s was not found, got %s", c.DomainName, all[0].Name)
+	}
+
 	return all[0].ID, nil
 }