refactor user role functions to use v3

commands/apply.go

@@ -14,13 +14,16 @@ type ApplyCommand struct {
 func (c *ApplyCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err != nil {
+	ldapMgr, err := InitializeLdapManager(c.BaseCFConfigCommand, c.BaseLDAPCommand)
+	if err != nil {
 		return err
 	}
-	if err = cfMgmt.UserManager.InitializeLdap(c.LdapUser, c.LdapPassword, c.LdapServer); err != nil {
+	if ldapMgr != nil {
+		defer ldapMgr.Close()
+	}
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, ldapMgr); err != nil {
 		return err
 	}
-	defer cfMgmt.UserManager.DeinitializeLdap()
 	fmt.Println("*********  Creating Orgs")
 	if err = cfMgmt.OrgManager.CreateOrgs(); err != nil {
 		return err

commands/assign_default_security_groups.go

@@ -9,7 +9,7 @@ type AssignDefaultSecurityGroups struct {
 func (c *AssignDefaultSecurityGroups) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SecurityGroupManager.AssignDefaultSecurityGroups()
 	}
 	return err

commands/cleanup_org_users.go

@@ -9,7 +9,7 @@ type CleanupOrgUsersCommand struct {
 
 // Execute - removes org users
 func (c *CleanupOrgUsersCommand) Execute([]string) error {
-	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		errs := cfMgmt.UserManager.CleanupOrgUsers()
 		if len(errs) > 0 {
 			return fmt.Errorf("got errors processing cleanup users %v", errs)

commands/create_orgs.go

@@ -9,7 +9,7 @@ type CreateOrgsCommand struct {
 func (c *CreateOrgsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.OrgManager.CreateOrgs()
 	}
 	return err

commands/create_private_domains.go

@@ -9,7 +9,7 @@ type CreatePrivateDomainsCommand struct {
 func (c *CreatePrivateDomainsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.PrivateDomainManager.CreatePrivateDomains()
 	}
 	return err

commands/create_security_groups.go

@@ -9,7 +9,7 @@ type CreateSecurityGroupsCommand struct {
 func (c *CreateSecurityGroupsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SecurityGroupManager.CreateGlobalSecurityGroups()
 	}
 	return err

commands/create_space_security_groups.go

@@ -9,7 +9,7 @@ type CreateSpaceSecurityGroupsCommand struct {
 func (c *CreateSpaceSecurityGroupsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SecurityGroupManager.CreateApplicationSecurityGroups()
 	}
 	return err

commands/create_spaces.go

@@ -9,7 +9,7 @@ type CreateSpacesCommand struct {
 func (c *CreateSpacesCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SpaceManager.CreateSpaces()
 	}
 	return err

commands/delete_orgs.go

@@ -9,7 +9,7 @@ type DeleteOrgsCommand struct {
 func (c *DeleteOrgsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.OrgManager.DeleteOrgs()
 	}
 	return err

commands/delete_spaces.go

@@ -9,7 +9,7 @@ type DeleteSpacesCommand struct {
 func (c *DeleteSpacesCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SpaceManager.DeleteSpaces()
 	}
 	return err

commands/export_config.go

@@ -31,6 +31,7 @@ func (c *ExportConfigurationCommand) Execute([]string) error {
 			cfMgmt.SharedDomainManager,
 			cfMgmt.ServiceAccessManager,
 			cfMgmt.QuotaManager,
+			cfMgmt.RoleManager,
 		)
 		exportManager.SkipRoutingGroups = c.SkipRoutingGroups
 		excludedOrgs := make(map[string]string)

commands/export_service_access_config.go

@@ -23,7 +23,7 @@ func (c *ExportServiceAccessCommand) Execute([]string) error {
 			cfMgmt.PrivateDomainManager,
 			cfMgmt.SharedDomainManager,
 			cfMgmt.ServiceAccessManager,
-			cfMgmt.QuotaManager)
+			cfMgmt.QuotaManager, cfMgmt.RoleManager)
 
 		return exportManager.ExportServiceAccess()
 	}

commands/initialize.go

@@ -12,10 +12,12 @@ import (
 	"github.com/vmwarepivotallabs/cf-mgmt/config"
 	"github.com/vmwarepivotallabs/cf-mgmt/configcommands"
 	"github.com/vmwarepivotallabs/cf-mgmt/isosegment"
+	"github.com/vmwarepivotallabs/cf-mgmt/ldap"
 	"github.com/vmwarepivotallabs/cf-mgmt/organization"
 	"github.com/vmwarepivotallabs/cf-mgmt/organizationreader"
 	"github.com/vmwarepivotallabs/cf-mgmt/privatedomain"
 	"github.com/vmwarepivotallabs/cf-mgmt/quota"
+	"github.com/vmwarepivotallabs/cf-mgmt/role"
 	"github.com/vmwarepivotallabs/cf-mgmt/securitygroup"
 	"github.com/vmwarepivotallabs/cf-mgmt/serviceaccess"
 	"github.com/vmwarepivotallabs/cf-mgmt/shareddomain"
@@ -40,6 +42,7 @@ type CFMgmt struct {
 	IsolationSegmentManager isosegment.Manager
 	ServiceAccessManager    *serviceaccess.Manager
 	SharedDomainManager     *shareddomain.Manager
+	RoleManager             role.Manager
 }
 
 type Initialize struct {
@@ -48,10 +51,26 @@ type Initialize struct {
 }
 
 func InitializeManagers(baseCommand BaseCFConfigCommand) (*CFMgmt, error) {
-	return InitializePeekManagers(baseCommand, false)
+	return InitializePeekManagers(baseCommand, false, nil)
 }
 
-func InitializePeekManagers(baseCommand BaseCFConfigCommand, peek bool) (*CFMgmt, error) {
+func InitializeLdapManager(baseCommand BaseCFConfigCommand, ldapCommand BaseLDAPCommand) (*ldap.Manager, error) {
+	cfg := config.NewManager(baseCommand.ConfigDirectory)
+	ldapConfig, err := cfg.LdapConfig(ldapCommand.LdapUser, ldapCommand.LdapPassword, ldapCommand.LdapServer)
+	if err != nil {
+		return nil, err
+	}
+	if ldapConfig.Enabled {
+		ldapMgr, err := ldap.NewManager(ldapConfig)
+		if err != nil {
+			return nil, err
+		}
+		return ldapMgr, nil
+	}
+	return nil, nil
+}
+
+func InitializePeekManagers(baseCommand BaseCFConfigCommand, peek bool, ldapMgr *ldap.Manager) (*CFMgmt, error) {
 	lo.G.Debugf("Using %s of cf-mgmt", configcommands.GetFormattedVersion())
 	if baseCommand.SystemDomain == "" ||
 		baseCommand.UserID == "" ||
@@ -118,7 +137,9 @@ func InitializePeekManagers(baseCommand BaseCFConfigCommand, peek bool) (*CFMgmt
 	cfMgmt.OrgReader = organizationreader.NewReader(client, v3client.Organizations, cfg, peek)
 	cfMgmt.SpaceManager = space.NewManager(v3client.Spaces, v3client.SpaceFeatures, cfMgmt.UAAManager, cfMgmt.OrgReader, cfg, peek)
 	cfMgmt.OrgManager = organization.NewManager(v3client.Organizations, cfMgmt.OrgReader, cfg, peek)
-	userManager, err := user.NewManager(client, cfg, cfMgmt.SpaceManager, cfMgmt.OrgReader, cfMgmt.UAAManager, peek)
+	cfMgmt.RoleManager = role.New(v3client.Roles, v3client.Users, v3client.Jobs, uaaMgr, peek)
+
+	userManager, err := user.NewManager(cfg, cfMgmt.SpaceManager, cfMgmt.OrgReader, cfMgmt.UAAManager, cfMgmt.RoleManager, ldapMgr, peek)
 	if err != nil {
 		return nil, err
 	}

commands/isolation_segments.go

@@ -7,7 +7,7 @@ type IsolationSegmentsCommand struct {
 
 // Execute - updates spaces
 func (c *IsolationSegmentsCommand) Execute([]string) error {
-	cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek)
+	cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil)
 	if err != nil {
 		return err
 	}

commands/service_access.go

@@ -9,7 +9,7 @@ type ServiceAccessCommand struct {
 func (c *ServiceAccessCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.ServiceAccessManager.Apply()
 	}
 	return err

commands/share_private_domains.go

@@ -9,7 +9,7 @@ type SharePrivateDomainsCommand struct {
 func (c *SharePrivateDomainsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.PrivateDomainManager.SharePrivateDomains()
 	}
 	return err

commands/shared_domains.go

@@ -9,7 +9,7 @@ type SharedDomainsCommand struct {
 func (c *SharedDomainsCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SharedDomainManager.Apply()
 	}
 	return err

commands/update_org_quota.go

@@ -9,7 +9,7 @@ type UpdateOrgQuotasCommand struct {
 func (c *UpdateOrgQuotasCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.QuotaManager.CreateOrgQuotas()
 	}
 	return err

commands/update_org_users.go

@@ -10,11 +10,14 @@ type UpdateOrgUsersCommand struct {
 
 // Execute - updates orgs quotas
 func (c *UpdateOrgUsersCommand) Execute([]string) error {
-	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
-		if err := cfMgmt.UserManager.InitializeLdap(c.LdapUser, c.LdapPassword, c.LdapServer); err != nil {
-			return err
-		}
-		defer cfMgmt.UserManager.DeinitializeLdap()
+	ldapMgr, err := InitializeLdapManager(c.BaseCFConfigCommand, c.BaseLDAPCommand)
+	if err != nil {
+		return err
+	}
+	if ldapMgr != nil {
+		defer ldapMgr.Close()
+	}
+	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, ldapMgr); err == nil {
 		errs := cfMgmt.UserManager.UpdateOrgUsers()
 		if len(errs) > 0 {
 			return fmt.Errorf("got errors processing update org users %v", errs)

commands/update_orgs_metadata.go

@@ -9,7 +9,7 @@ type UpdateOrgsMetadataCommand struct {
 func (c *UpdateOrgsMetadataCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.OrgManager.UpdateOrgsMetadata()
 	}
 	return err

commands/update_space_quota.go

@@ -9,7 +9,7 @@ type UpdateSpaceQuotasCommand struct {
 func (c *UpdateSpaceQuotasCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.QuotaManager.CreateSpaceQuotas()
 	}
 	return err

commands/update_space_users.go

@@ -10,11 +10,14 @@ type UpdateSpaceUsersCommand struct {
 
 // Execute - updates space users
 func (c *UpdateSpaceUsersCommand) Execute([]string) error {
-	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
-		if err := cfMgmt.UserManager.InitializeLdap(c.LdapUser, c.LdapPassword, c.LdapServer); err != nil {
-			return err
-		}
-		defer cfMgmt.UserManager.DeinitializeLdap()
+	ldapMgr, err := InitializeLdapManager(c.BaseCFConfigCommand, c.BaseLDAPCommand)
+	if err != nil {
+		return err
+	}
+	if ldapMgr != nil {
+		defer ldapMgr.Close()
+	}
+	if cfMgmt, err := InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, ldapMgr); err == nil {
 		errs := cfMgmt.UserManager.UpdateSpaceUsers()
 		if len(errs) > 0 {
 			return fmt.Errorf("got errors processing update space users %v", errs)

commands/update_spaces.go

@@ -9,7 +9,7 @@ type UpdateSpacesCommand struct {
 func (c *UpdateSpacesCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SpaceManager.UpdateSpaces()
 	}
 	return err

commands/update_spaces_metadata.go

@@ -9,7 +9,7 @@ type UpdateSpacesMetadataCommand struct {
 func (c *UpdateSpacesMetadataCommand) Execute([]string) error {
 	var cfMgmt *CFMgmt
 	var err error
-	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek); err == nil {
+	if cfMgmt, err = InitializePeekManagers(c.BaseCFConfigCommand, c.Peek, nil); err == nil {
 		err = cfMgmt.SpaceManager.UpdateSpacesMetadata()
 	}
 	return err