Give specific domain id for user/project

Keystone supports "domain" and users, groups and projects belong to
a specific domain, and it's possible that multiple entries with
the same name exist in different domains.

This introduces the interface to specify the domain where the user or
the project should exist, to avoid unexpected behavior caused by such
"duplicate" entities.

Author: kajinamit

modules/openstack/project.go

@@ -27,6 +27,7 @@ import (
 type Project struct {
 	Name        string
 	Description string
+	DomainID    string
 }
 
 // CreateProject - creates project with projectName and projectDescription if it does not exist
@@ -35,7 +36,7 @@ func (o *OpenStack) CreateProject(
 	p Project,
 ) (string, error) {
 	var projectID string
-	allPages, err := projects.List(o.osclient, projects.ListOpts{Name: p.Name}).AllPages()
+	allPages, err := projects.List(o.osclient, projects.ListOpts{Name: p.Name, DomainID: p.DomainID}).AllPages()
 	if err != nil {
 		return projectID, err
 	}
@@ -49,8 +50,9 @@ func (o *OpenStack) CreateProject(
 		createOpts := projects.CreateOpts{
 			Name:        p.Name,
 			Description: p.Description,
+			DomainID:    p.DomainID,
 		}
-		log.Info(fmt.Sprintf("Creating project %s", p.Name))
+		log.Info(fmt.Sprintf("Creating project %s in %s", p.Name, p.DomainID))
 		project, err := projects.Create(o.osclient, createOpts).Extract()
 		if err != nil {
 			return projectID, err

modules/openstack/user.go

@@ -32,6 +32,7 @@ type User struct {
 	Name      string
 	Password  string
 	ProjectID string
+	DomainID  string
 }
 
 // CreateUser - creates user with userName, password and default project projectID
@@ -44,6 +45,7 @@ func (o *OpenStack) CreateUser(
 	user, err := o.GetUser(
 		log,
 		u.Name,
+		u.DomainID,
 	)
 	// If the user is not found, don't count that as an error here
 	if err != nil && !strings.Contains(err.Error(), UserNotFound) {
@@ -59,6 +61,7 @@ func (o *OpenStack) CreateUser(
 			Name:             u.Name,
 			DefaultProjectID: u.ProjectID,
 			Password:         u.Password,
+			DomainID:         u.DomainID,
 		}
 		user, err := users.Create(o.GetOSClient(), createOpts).Extract()
 		if err != nil {
@@ -76,8 +79,9 @@ func (o *OpenStack) CreateUser(
 func (o *OpenStack) GetUser(
 	log logr.Logger,
 	userName string,
+	domainID string,
 ) (*users.User, error) {
-	allPages, err := users.List(o.GetOSClient(), users.ListOpts{Name: userName}).AllPages()
+	allPages, err := users.List(o.GetOSClient(), users.ListOpts{Name: userName, DomainID: domainID}).AllPages()
 	if err != nil {
 		return nil, err
 	}
@@ -97,18 +101,20 @@ func (o *OpenStack) GetUser(
 func (o *OpenStack) DeleteUser(
 	log logr.Logger,
 	userName string,
+	domainID string,
 ) error {
 	user, err := o.GetUser(
 		log,
 		userName,
+		domainID,
 	)
 	// If the user is not found, don't count that as an error here
 	if err != nil && !strings.Contains(err.Error(), "user not found in keystone") {
 		return err
 	}
 
 	if user != nil {
-		log.Info(fmt.Sprintf("Deleting user %s", user.Name))
+		log.Info(fmt.Sprintf("Deleting user %s in %s", user.Name, user.DomainID))
 		err = users.Delete(o.GetOSClient(), user.ID).ExtractErr()
 		if err != nil {
 			return err