Add initial test

- Remove unneeded ccloud parameters from mds iam apis
confluentinc · Sep 17, 2019 · 124d692 · 124d692
1 parent 9f0dada
commit 124d692
Show file tree

Hide file tree

Showing 8 changed files with 397 additions and 19 deletions.
diff --git a/internal/cmd/command.go b/internal/cmd/command.go
@@ -146,9 +146,7 @@ func NewConfluentCommand(cliName string, cfg *configs.Config, ver *versions.Vers
 		//conn.Hidden = true // The connect feature isn't finished yet, so let's hide it
 		//cli.AddCommand(conn)
 	} else if cliName == "confluent" {
-		ch := &pcmd.ConfigHelper{Config: cfg, Client: client}
-
-		cli.AddCommand(iam.New(prerunner, cfg, ch, ver, mdsClient))
+		cli.AddCommand(iam.New(prerunner, cfg, mdsClient))
 
 		bash, err := basher.NewContext("/bin/bash", false)
 		if err != nil {

diff --git a/internal/cmd/iam/command.go b/internal/cmd/iam/command.go
@@ -7,28 +7,25 @@ import (
 
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
 	"github.com/confluentinc/cli/internal/pkg/config"
-	"github.com/confluentinc/cli/internal/pkg/version"
 	"github.com/confluentinc/mds-sdk-go"
 )
 
 type command struct {
 	*cobra.Command
 	config *config.Config
-	ch     *pcmd.ConfigHelper
 	client *mds.APIClient
 }
 
 // New returns the default command object for interacting with RBAC.
-func New(prerunner pcmd.PreRunner, config *config.Config, ch *pcmd.ConfigHelper, version *version.Version, client *mds.APIClient) *cobra.Command {
+func New(prerunner pcmd.PreRunner, config *config.Config, client *mds.APIClient) *cobra.Command {
 	cmd := &command{
 		Command: &cobra.Command{
 			Use:               "iam",
 			Short:             "Manage RBAC, ACL and IAM permissions.",
 			Long:              "Manage Role Based Access (RBAC), Access Control Lists (ACL), and Identity and Access Management (IAM) permissions.",
-			//PersistentPreRunE: prerunner.Authenticated(),
+			PersistentPreRunE: prerunner.Authenticated(),
 		},
 		config: config,
-		ch:     ch,
 		client: client,
 	}
 
@@ -38,9 +35,9 @@ func New(prerunner pcmd.PreRunner, config *config.Config, ch *pcmd.ConfigHelper,
 
 func (c *command) init() {
 	c.AddCommand(NewRoleCommand(c.config, c.client))
-	c.AddCommand(NewRolebindingCommand(c.config, c.ch, c.client))
+	c.AddCommand(NewRolebindingCommand(c.config, c.client))
 	if os.Getenv("XX_FLAG_CENTRALIZED_ACL_ENABLE") != "" {
-		// TODO: Remove the feature flag if statement once 5.4 is released
-		c.AddCommand(NewACLCommand(c.config, c.ch, c.client))
+		// TODO: Remove this feature flag if statement once 5.4 is released
+		c.AddCommand(NewACLCommand(c.config, c.client))
 	}
 }
diff --git a/internal/cmd/iam/command_acl.go b/internal/cmd/iam/command_acl.go
@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/spf13/cobra"
 
-	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
 	"github.com/confluentinc/cli/internal/pkg/config"
 	"github.com/confluentinc/cli/internal/pkg/errors"
 	"github.com/confluentinc/mds-sdk-go"
@@ -25,7 +24,7 @@ type aclCommand struct {
 }
 
 // NewACLCommand returns the Cobra command for ACLs.
-func NewACLCommand(config *config.Config, ch *pcmd.ConfigHelper, client *mds.APIClient) *cobra.Command {
+func NewACLCommand(config *config.Config, client *mds.APIClient) *cobra.Command {
 	cmd := &aclCommand{
 		Command: &cobra.Command{
 			Use:   "acl",