WIP: refactor: place utility methods in pkg/cmd

pkg/kafkautil/aclutil/acl_table.go → pkg/cmd/kafka/acl/aclcmdutil/acl_table.go

@@ -1,4 +1,4 @@
-package aclutil
+package aclcmdutil
 
 import (
 	"fmt"

pkg/kafkautil/aclutil/constants.go → pkg/cmd/kafka/acl/aclcmdutil/constants.go

@@ -1,4 +1,4 @@
-package aclutil
+package aclcmdutil
 
 const (
 	Wildcard     = "*"

pkg/kafkautil/aclutil/enums.go → pkg/cmd/kafka/acl/aclcmdutil/enums.go

@@ -1,4 +1,4 @@
-package aclutil
+package aclcmdutil
 
 import kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client"
 

pkg/kafkautil/aclutil/enums_test.go → pkg/cmd/kafka/acl/aclcmdutil/enums_test.go

@@ -1,4 +1,4 @@
-package aclutil
+package aclcmdutil
 
 import (
 	"reflect"

pkg/kafkautil/aclutil/util.go → pkg/cmd/kafka/acl/aclcmdutil/util.go

@@ -1,4 +1,4 @@
-package aclutil
+package aclcmdutil
 
 import (
 	"context"

pkg/cmd/kafka/acl/admin/admin.go

@@ -3,8 +3,8 @@ package admin
 import (
 	"context"
 
+	"github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil"
 	flagset "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil"
-	"github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
@@ -83,7 +83,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command {
 			}
 
 			// user and service account should not allow wildcard
-			if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias {
+			if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias {
 				return opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")
 			}
 
@@ -96,7 +96,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command {
 			}
 
 			if allAccounts {
-				opts.principal = aclutil.Wildcard
+				opts.principal = aclcmdutil.Wildcard
 			}
 
 			return runAdmin(opts)
@@ -131,17 +131,17 @@ func runAdmin(opts *options) (err error) {
 
 	aclBindClusterAlter := kafkainstanceclient.NewAclBinding(
 		kafkainstanceclient.ACLRESOURCETYPE_CLUSTER,
-		aclutil.KafkaCluster,
+		aclcmdutil.KafkaCluster,
 		kafkainstanceclient.ACLPATTERNTYPE_LITERAL,
-		aclutil.FormatPrincipal(opts.principal),
+		aclcmdutil.FormatPrincipal(opts.principal),
 		kafkainstanceclient.ACLOPERATION_ALTER,
 		kafkainstanceclient.ACLPERMISSIONTYPE_ALLOW,
 	)
 
 	opts.logger.Info(opts.localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview"))
 	opts.logger.Info()
 
-	rows := aclutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer)
+	rows := aclcmdutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer)
 	dump.Table(opts.io.Out, rows)
 	opts.logger.Info()
 
@@ -164,7 +164,7 @@ func runAdmin(opts *options) (err error) {
 
 	req = req.AclBinding(*aclBindClusterAlter)
 
-	err = aclutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName)
+	err = aclcmdutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName)
 	if err != nil {
 		return err
 	}

pkg/cmd/kafka/acl/create/create.go

@@ -2,6 +2,7 @@ package create
 
 import (
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil"
 	aclFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil"
 	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
@@ -10,7 +11,6 @@ import (
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/dump"
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/spinner"
 	"github.com/redhat-developer/app-services-cli/pkg/core/localize"
-	"github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil"
 	kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client"
 	"github.com/spf13/cobra"
 )
@@ -33,7 +33,7 @@ type requestParams struct {
 
 // NewCreateCommand creates a new command to add Kafka ACLs
 func NewCreateCommand(f *factory.Factory) *cobra.Command {
-	opts := &aclutil.CrudOptions{
+	opts := &aclcmdutil.CrudOptions{
 		Config:     f.Config,
 		Connection: f.Connection,
 		Logger:     f.Logger,
@@ -63,7 +63,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 				errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required"))
 			}
 
-			if resourceErrors := aclutil.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil {
+			if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil {
 				errorCollection = append(errorCollection, resourceErrors)
 			}
 
@@ -72,7 +72,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 			}
 
 			if len(errorCollection) > 0 {
-				return aclutil.BuildInstructions(errorCollection)
+				return aclcmdutil.BuildInstructions(errorCollection)
 			}
 
 			return runAdd(opts.InstanceID, opts)
@@ -99,7 +99,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 }
 
 // nolint:funlen
-func runAdd(instanceID string, opts *aclutil.CrudOptions) error {
+func runAdd(instanceID string, opts *aclcmdutil.CrudOptions) error {
 	ctx := opts.Context
 
 	conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
@@ -122,7 +122,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error {
 		return err
 	}
 
-	if isValidOp, validResourceOperations := aclutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp {
+	if isValidOp, validResourceOperations := aclcmdutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation",
 			localize.NewEntry("ResourceType", opts.ResourceType),
 			localize.NewEntry("Operation", opts.Operation),
@@ -136,15 +136,15 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error {
 		kafkainstanceclient.AclResourceType(requestParams.resourceType),
 		requestParams.resourceName,
 		kafkainstanceclient.AclPatternType(requestParams.patternType),
-		aclutil.FormatPrincipal(opts.Principal),
+		aclcmdutil.FormatPrincipal(opts.Principal),
 		kafkainstanceclient.AclOperation(requestParams.operation),
 		kafkainstanceclient.AclPermissionType(requestParams.permission),
 	)
 
 	opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview"))
 	opts.Logger.Info()
 
-	rows := aclutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer)
+	rows := aclcmdutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer)
 	dump.Table(opts.IO.Out, rows)
 	opts.Logger.Info()
 
@@ -173,7 +173,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error {
 
 	req = req.AclBinding(*newAclBinding)
 
-	err = aclutil.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName)
+	err = aclcmdutil.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName)
 	spinnr.Stop()
 	if err != nil {
 		return err
@@ -182,43 +182,43 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error {
 	return nil
 }
 
-func getRequestParams(opts *aclutil.CrudOptions) *requestParams {
+func getRequestParams(opts *aclcmdutil.CrudOptions) *requestParams {
 	return &requestParams{
-		resourceType: kafkainstanceclient.AclResourceType(aclutil.GetMappedResourceTypeFilterValue(opts.ResourceType)),
-		principal:    aclutil.FormatPrincipal(opts.Principal),
-		resourceName: aclutil.GetResourceName(opts.ResourceName),
-		patternType:  aclutil.GetMappedPatternTypeValue(opts.PatternType),
-		operation:    aclutil.GetMappedOperationValue(opts.Operation),
-		permission:   aclutil.GetMappedPermissionTypeValue(opts.Permission),
+		resourceType: kafkainstanceclient.AclResourceType(aclcmdutil.GetMappedResourceTypeFilterValue(opts.ResourceType)),
+		principal:    aclcmdutil.FormatPrincipal(opts.Principal),
+		resourceName: aclcmdutil.GetResourceName(opts.ResourceName),
+		patternType:  aclcmdutil.GetMappedPatternTypeValue(opts.PatternType),
+		operation:    aclcmdutil.GetMappedOperationValue(opts.Operation),
+		permission:   aclcmdutil.GetMappedPermissionTypeValue(opts.Permission),
 	}
 }
 
-func validateAndSetOpts(opts *aclutil.CrudOptions) error {
+func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error {
 
 	// user and service account should not be provided together
 	if userID != "" && serviceAccount != "" {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected")
 	}
 
-	if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias {
+	if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")
 	}
 
 	if allAccounts {
 		if userID != "" || serviceAccount != "" {
 			return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag")
 		}
-		opts.Principal = aclutil.Wildcard
+		opts.Principal = aclcmdutil.Wildcard
 	}
 
 	// check if principal is provided
 	if !allAccounts && (userID == "" && serviceAccount == "") {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected")
 	}
 
-	opts.PatternType = aclutil.PatternTypeLITERAL
+	opts.PatternType = aclcmdutil.PatternTypeLITERAL
 	if prefix {
-		opts.PatternType = aclutil.PatternTypePREFIX
+		opts.PatternType = aclcmdutil.PatternTypePREFIX
 	}
 
 	if userID != "" {

pkg/cmd/kafka/acl/delete/delete.go

@@ -2,6 +2,7 @@ package delete
 
 import (
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil"
 	aclFlagUtil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil"
 	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil"
 	"github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory"
@@ -11,7 +12,6 @@ import (
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon"
 	"github.com/redhat-developer/app-services-cli/pkg/core/ioutil/spinner"
 	"github.com/redhat-developer/app-services-cli/pkg/core/localize"
-	"github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil"
 	kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client"
 	"github.com/spf13/cobra"
 )
@@ -34,7 +34,7 @@ type requestParams struct {
 
 // NewDeleteCommand creates a new command to delete Kafka ACLs
 func NewDeleteCommand(f *factory.Factory) *cobra.Command {
-	opts := &aclutil.CrudOptions{
+	opts := &aclcmdutil.CrudOptions{
 		Config:     f.Config,
 		Connection: f.Connection,
 		Logger:     f.Logger,
@@ -60,7 +60,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
 				errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required"))
 			}
 
-			if resourceErrors := aclutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil {
+			if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil {
 				errorCollection = append(errorCollection, resourceErrors)
 			}
 
@@ -69,7 +69,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
 			}
 
 			if len(errorCollection) > 0 {
-				return aclutil.BuildInstructions(errorCollection)
+				return aclcmdutil.BuildInstructions(errorCollection)
 			}
 
 			return runDelete(opts.InstanceID, opts)
@@ -97,7 +97,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
 }
 
 // nolint:funlen
-func runDelete(instanceID string, opts *aclutil.CrudOptions) error {
+func runDelete(instanceID string, opts *aclcmdutil.CrudOptions) error {
 	ctx := opts.Context
 
 	conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
@@ -118,7 +118,7 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error {
 		return err
 	}
 
-	if isValidOp, validResourceOperations := aclutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp {
+	if isValidOp, validResourceOperations := aclcmdutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation",
 			localize.NewEntry("ResourceType", opts.ResourceType),
 			localize.NewEntry("Operation", opts.Operation),
@@ -162,7 +162,7 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error {
 		defer httpRes.Body.Close()
 	}
 
-	err = aclutil.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName())
+	err = aclcmdutil.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName())
 	spinnr.Stop()
 
 	if err != nil {
@@ -184,50 +184,50 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error {
 
 	opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.delete.info.aclsPreview"))
 	opts.Logger.Info()
-	rows := aclutil.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer)
+	rows := aclcmdutil.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer)
 	dump.Table(opts.IO.Out, rows)
 	opts.Logger.Info()
 
 	return nil
 }
 
-func getRequestParams(opts *aclutil.CrudOptions) *requestParams {
+func getRequestParams(opts *aclcmdutil.CrudOptions) *requestParams {
 	return &requestParams{
-		resourceType: aclutil.GetMappedResourceTypeFilterValue(opts.ResourceType),
-		principal:    aclutil.FormatPrincipal(opts.Principal),
-		resourceName: aclutil.GetResourceName(opts.ResourceName),
-		patternType:  aclutil.GetMappedPatternTypeFilterValue(opts.PatternType),
-		operation:    aclutil.GetMappedOperationFilterValue(opts.Operation),
-		permission:   aclutil.GetMappedPermissionTypeFilterValue(opts.Permission),
+		resourceType: aclcmdutil.GetMappedResourceTypeFilterValue(opts.ResourceType),
+		principal:    aclcmdutil.FormatPrincipal(opts.Principal),
+		resourceName: aclcmdutil.GetResourceName(opts.ResourceName),
+		patternType:  aclcmdutil.GetMappedPatternTypeFilterValue(opts.PatternType),
+		operation:    aclcmdutil.GetMappedOperationFilterValue(opts.Operation),
+		permission:   aclcmdutil.GetMappedPermissionTypeFilterValue(opts.Permission),
 	}
 }
 
-func validateAndSetOpts(opts *aclutil.CrudOptions) error {
+func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error {
 
 	// user and service account should not be provided together
 	if userID != "" && serviceAccount != "" {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected")
 	}
 
-	if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias {
+	if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")
 	}
 
 	if allAccounts {
 		if userID != "" || serviceAccount != "" {
 			return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag")
 		}
-		opts.Principal = aclutil.Wildcard
+		opts.Principal = aclcmdutil.Wildcard
 	}
 
 	// check if principal is provided
 	if !allAccounts && (userID == "" && serviceAccount == "") {
 		return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected")
 	}
 
-	opts.PatternType = aclutil.PatternTypeLITERAL
+	opts.PatternType = aclcmdutil.PatternTypeLITERAL
 	if prefix {
-		opts.PatternType = aclutil.PatternTypePREFIX
+		opts.PatternType = aclcmdutil.PatternTypePREFIX
 	}
 
 	if userID != "" {