Separate accounts/host catalogs/host sets into their own packages (#311)

internal/cmd/commands/authenticate/password.go

@@ -121,7 +121,7 @@ func (c *PasswordCommand) Run(args []string) int {
 	// note: Authenticate() calls SetToken() under the hood to set the
 	// auth bearer on the client so we do not need to do anything with the
 	// returned token after this call, so we ignore it
-	result, apiErr, err := authmethods.NewAuthMethodsClient(client).Authenticate(c.Context, c.flagAuthMethodId, c.flagLoginName, c.flagPassword)
+	result, apiErr, err := authmethods.NewClient(client).Authenticate(c.Context, c.flagAuthMethodId, c.flagLoginName, c.flagPassword)
 	if err != nil {
 		c.UI.Error(fmt.Sprintf("Error trying to perform authentication: %s", err.Error()))
 		return 2

internal/cmd/commands/authmethods/authmethod.go

@@ -127,7 +127,7 @@ func (c *Command) Run(args []string) int {
 		opts = append(opts, authmethods.WithDescription(c.FlagDescription))
 	}
 
-	authmethodClient := authmethods.NewAuthMethodsClient(client)
+	authmethodClient := authmethods.NewClient(client)
 
 	var existed bool
 	var method *authmethods.AuthMethod

internal/cmd/commands/authmethods/password.go

@@ -164,7 +164,7 @@ func (c *PasswordCommand) Run(args []string) int {
 		opts = append(opts, authmethods.WithAttributes(attributes))
 	}
 
-	authmethodClient := authmethods.NewAuthMethodsClient(client)
+	authmethodClient := authmethods.NewClient(client)
 
 	// Perform check-and-set when needed
 	var version uint32

internal/cmd/commands/authtokens/authtokens.go

@@ -83,7 +83,7 @@ func (c *Command) Run(args []string) int {
 		return 2
 	}
 
-	authtokenClient := authtokens.NewAuthTokensClient(client)
+	authtokenClient := authtokens.NewClient(client)
 
 	var existed bool
 	var token *authtokens.AuthToken

internal/cmd/commands/groups/group.go

@@ -141,7 +141,7 @@ func (c *Command) Run(args []string) int {
 		}
 	}
 
-	groupClient := groups.NewGroupsClient(client)
+	groupClient := groups.NewClient(client)
 
 	// Perform check-and-set when needed
 	var version uint32

internal/cmd/commands/hosts/host_create.go

@@ -110,7 +110,7 @@ func (c *CreateCommand) Run(args []string) int {
 		return 2
 	}
 
-	host, apiErr, err := hosts.NewHostsClient(client).Create(c.Context,
+	host, apiErr, err := hosts.NewClient(client).Create(c.Context,
 		c.flagCatalogId,
 		hosts.WithStaticHostAddress(c.flagAddress),
 		hosts.WithName(c.flagName),

internal/cmd/commands/roles/role.go

@@ -188,7 +188,7 @@ func (c *Command) Run(args []string) int {
 		}
 	}
 
-	roleClient := roles.NewRolesClient(client)
+	roleClient := roles.NewClient(client)
 
 	// Perform check-and-set when needed
 	var version uint32

internal/cmd/commands/scopes/scope.go

@@ -113,7 +113,7 @@ func (c *Command) Run(args []string) int {
 
 	opts = append(opts, scopes.WithSkipRoleCreation(c.flagSkipRoleCreation))
 
-	scopeClient := scopes.NewScopesClient(client)
+	scopeClient := scopes.NewClient(client)
 
 	// Perform check-and-set when needed
 	var version uint32

internal/cmd/commands/users/user.go

@@ -102,7 +102,7 @@ func (c *Command) Run(args []string) int {
 		opts = append(opts, users.WithDescription(c.FlagDescription))
 	}
 
-	userClient := users.NewUsersClient(client)
+	userClient := users.NewClient(client)
 
 	// Perform check-and-set when needed
 	var version uint32