refactor(context): remove context handler struct

redhat-developer · Apr 11, 2022 · bb51d04 · bb51d04
1 parent f733fb4
commit bb51d04
Show file tree

Hide file tree

Showing 55 changed files with 174 additions and 870 deletions.
diff --git a/pkg/cmd/context/contextcmdutil/validator.go b/pkg/cmd/context/contextcmdutil/validator.go
@@ -5,13 +5,14 @@ import (
 
 	"github.com/redhat-developer/app-services-cli/pkg/core/errors"
 	"github.com/redhat-developer/app-services-cli/pkg/core/localize"
+	"github.com/redhat-developer/app-services-cli/pkg/core/servicecontext"
 	"github.com/redhat-developer/app-services-cli/pkg/shared/contextutil"
 )
 
 // Validator is a type for validating service context inputs
 type Validator struct {
-	Localizer      localize.Localizer
-	ProfileHandler *contextutil.ContextHandler
+	Localizer  localize.Localizer
+	SvcContext *servicecontext.Context
 }
 
 const (
@@ -42,7 +43,7 @@ func (v *Validator) ValidateName(val interface{}) error {
 // ValidateNameIsAvailable validates if the name provided is a unique context name
 func (v *Validator) ValidateNameIsAvailable(name string) error {
 
-	context, _ := v.ProfileHandler.GetContext(name)
+	context, _ := contextutil.GetContext(v.SvcContext, v.Localizer, name)
 	if context != nil {
 		return v.Localizer.MustLocalizeError("context.create.log.alreadyExists", localize.NewEntry("Name", name))
 	}

diff --git a/pkg/cmd/context/create/create.go b/pkg/cmd/context/create/create.go
@@ -68,14 +68,9 @@ func runCreate(opts *options) error {
 		return err
 	}
 
-	profileHandler := &contextutil.ContextHandler{
-		Context:   svcContext,
-		Localizer: opts.localizer,
-	}
-
 	profileValidator := &contextcmdutil.Validator{
-		Localizer:      opts.localizer,
-		ProfileHandler: profileHandler,
+		Localizer:  opts.localizer,
+		SvcContext: svcContext,
 	}
 
 	svcContextsMap := svcContext.Contexts
@@ -94,7 +89,7 @@ func runCreate(opts *options) error {
 		return err
 	}
 
-	context, _ := profileHandler.GetContext(opts.name)
+	context, _ := contextutil.GetContext(svcContext, opts.localizer, opts.name)
 	if context != nil {
 		return opts.localizer.MustLocalizeError("context.create.log.alreadyExists", localize.NewEntry("Name", opts.name))
 	}

diff --git a/pkg/cmd/context/delete/delete.go b/pkg/cmd/context/delete/delete.go
@@ -61,11 +61,6 @@ func runDelete(opts *options) error {
 		return err
 	}
 
-	profileHandler := &contextutil.ContextHandler{
-		Context:   svcContext,
-		Localizer: opts.localizer,
-	}
-
 	currCtx := svcContext.CurrentContext
 
 	if opts.name == "" || opts.name == currCtx {
@@ -81,7 +76,7 @@ func runDelete(opts *options) error {
 		opts.Logger.Info(opts.localizer.MustLocalize("context.delete.log.warning.currentUnset"))
 	}
 
-	if _, err = profileHandler.GetContext(opts.name); err != nil {
+	if _, err = contextutil.GetContext(svcContext, opts.localizer, opts.name); err != nil {
 		return err
 	}
 

diff --git a/pkg/cmd/context/use/use.go b/pkg/cmd/context/use/use.go
@@ -75,12 +75,7 @@ func runUse(opts *options) error {
 		}
 	}
 
-	profileHandler := &contextutil.ContextHandler{
-		Context:   svcContext,
-		Localizer: opts.localizer,
-	}
-
-	_, err = profileHandler.GetContext(opts.name)
+	_, err = contextutil.GetContext(svcContext, opts.localizer, opts.name)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/cmd/kafka/acl/admin/admin.go b/pkg/cmd/kafka/acl/admin/admin.go
@@ -61,22 +61,8 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command {
 		RunE: func(cmd *cobra.Command, _ []string) error {
 
 			if opts.kafkaID == "" {
-				svcContext, err := opts.serviceContext.Load()
-				if err != nil {
-					return err
-				}
-
-				profileHandler := &contextutil.ContextHandler{
-					Context:   svcContext,
-					Localizer: opts.localizer,
-				}
-
-				conn, err := opts.connection(connection.DefaultConfigRequireMasAuth)
-				if err != nil {
-					return err
-				}
 
-				kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 				if err != nil {
 					return err
 				}

diff --git a/pkg/cmd/kafka/acl/create/create.go b/pkg/cmd/kafka/acl/create/create.go
@@ -78,6 +78,16 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 				return aclcmdutil.BuildInstructions(errorCollection)
 			}
 
+			if opts.InstanceID == "" {
+
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
+				if err != nil {
+					return err
+				}
+
+				opts.InstanceID = kafkaInstance.GetId()
+			}
+
 			return runAdd(opts.InstanceID, opts)
 		},
 	}
@@ -231,29 +241,5 @@ func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error {
 		opts.Principal = serviceAccount
 	}
 
-	if opts.InstanceID == "" {
-		svcContext, err := opts.ServiceContext.Load()
-		if err != nil {
-			return err
-		}
-
-		profileHandler := &contextutil.ContextHandler{
-			Context:   svcContext,
-			Localizer: opts.Localizer,
-		}
-
-		conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-		if err != nil {
-			return err
-		}
-
-		kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
-		if err != nil {
-			return err
-		}
-
-		opts.InstanceID = kafkaInstance.GetId()
-	}
-
 	return nil
 }
diff --git a/pkg/cmd/kafka/acl/delete/delete.go b/pkg/cmd/kafka/acl/delete/delete.go
@@ -71,6 +71,16 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command {
 				return aclcmdutil.BuildInstructions(errorCollection)
 			}
 
+			if opts.InstanceID == "" {
+
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
+				if err != nil {
+					return err
+				}
+
+				opts.InstanceID = kafkaInstance.GetId()
+			}
+
 			return runDelete(opts.InstanceID, opts)
 		},
 	}
@@ -277,29 +287,5 @@ func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error {
 		opts.Principal = serviceAccount
 	}
 
-	if opts.InstanceID == "" {
-		svcContext, err := opts.ServiceContext.Load()
-		if err != nil {
-			return err
-		}
-
-		profileHandler := &contextutil.ContextHandler{
-			Context:   svcContext,
-			Localizer: opts.Localizer,
-		}
-
-		conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-		if err != nil {
-			return err
-		}
-
-		kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
-		if err != nil {
-			return err
-		}
-
-		opts.InstanceID = kafkaInstance.GetId()
-	}
-
 	return nil
 }
diff --git a/pkg/cmd/kafka/acl/grant/grant.go b/pkg/cmd/kafka/acl/grant/grant.go
@@ -68,22 +68,7 @@ func NewGrantPermissionsACLCommand(f *factory.Factory) *cobra.Command {
 
 			if opts.kafkaID == "" {
 
-				svcContext, err := opts.ServiceContext.Load()
-				if err != nil {
-					return err
-				}
-
-				profileHandler := &contextutil.ContextHandler{
-					Context:   svcContext,
-					Localizer: opts.localizer,
-				}
-
-				conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-				if err != nil {
-					return err
-				}
-
-				kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 				if err != nil {
 					return err
 				}

diff --git a/pkg/cmd/kafka/acl/list/list.go b/pkg/cmd/kafka/acl/list/list.go
@@ -75,22 +75,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command {
 
 			if opts.kafkaID == "" {
 
-				svcContext, err := opts.serviceContext.Load()
-				if err != nil {
-					return err
-				}
-
-				profileHandler := &contextutil.ContextHandler{
-					Context:   svcContext,
-					Localizer: opts.localizer,
-				}
-
-				conn, err := opts.connection(connection.DefaultConfigRequireMasAuth)
-				if err != nil {
-					return err
-				}
-
-				kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 				if err != nil {
 					return err
 				}

diff --git a/pkg/cmd/kafka/consumergroup/delete/delete.go b/pkg/cmd/kafka/consumergroup/delete/delete.go
@@ -53,22 +53,7 @@ func NewDeleteConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 				return runCmd(opts)
 			}
 
-			svcContext, err := opts.ServiceContext.Load()
-			if err != nil {
-				return err
-			}
-
-			profileHandler := &contextutil.ContextHandler{
-				Context:   svcContext,
-				Localizer: opts.localizer,
-			}
-
-			conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-			if err != nil {
-				return err
-			}
-
-			kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+			kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 			if err != nil {
 				return err
 			}

diff --git a/pkg/cmd/kafka/consumergroup/describe/describe.go b/pkg/cmd/kafka/consumergroup/describe/describe.go
@@ -70,22 +70,7 @@ func NewDescribeConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 				return runCmd(opts)
 			}
 
-			svcContext, err := opts.ServiceContext.Load()
-			if err != nil {
-				return err
-			}
-
-			profileHandler := &contextutil.ContextHandler{
-				Context:   svcContext,
-				Localizer: opts.localizer,
-			}
-
-			conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-			if err != nil {
-				return err
-			}
-
-			kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+			kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 			if err != nil {
 				return err
 			}

diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go
@@ -78,22 +78,8 @@ func NewListConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 			}
 
 			if opts.kafkaID == "" {
-				svcContext, err := opts.ServiceContext.Load()
-				if err != nil {
-					return err
-				}
-
-				profileHandler := &contextutil.ContextHandler{
-					Context:   svcContext,
-					Localizer: opts.localizer,
-				}
-
-				conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-				if err != nil {
-					return err
-				}
 
-				kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+				kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 				if err != nil {
 					return err
 				}

diff --git a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go
@@ -77,22 +77,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command {
 				return runCmd(opts)
 			}
 
-			svcContext, err := opts.ServiceContext.Load()
-			if err != nil {
-				return err
-			}
-
-			profileHandler := &contextutil.ContextHandler{
-				Context:   svcContext,
-				Localizer: opts.localizer,
-			}
-
-			conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth)
-			if err != nil {
-				return err
-			}
-
-			kafkaInstance, err := profileHandler.GetCurrentKafkaInstance(conn.API().KafkaMgmt())
+			kafkaInstance, err := contextutil.GetCurrentKafkaInstance(f)
 			if err != nil {
 				return err
 			}

diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go
@@ -143,17 +143,7 @@ func runCreate(opts *options) error {
 		return err
 	}
 
-	profileHandler := &contextutil.ContextHandler{
-		Context:   svcContext,
-		Localizer: opts.localizer,
-	}
-
-	currCtx, err := profileHandler.GetCurrentContext()
-	if err != nil {
-		return err
-	}
-
-	svcConfig, err := profileHandler.GetContext(currCtx)
+	currCtx, err := contextutil.GetCurrentContext(svcContext, opts.localizer)
 	if err != nil {
 		return err
 	}
@@ -248,8 +238,8 @@ func runCreate(opts *options) error {
 
 	if opts.autoUse {
 		opts.Logger.Debug("Auto-use is set, updating the current instance")
-		svcConfig.KafkaID = response.GetId()
-		svcContext.Contexts[svcContext.CurrentContext] = *svcConfig
+		currCtx.KafkaID = response.GetId()
+		svcContext.Contexts[svcContext.CurrentContext] = *currCtx
 
 		if err = opts.ServiceContext.Save(svcContext); err != nil {
 			return fmt.Errorf("%v: %w", opts.localizer.MustLocalize("kafka.common.error.couldNotUseKafka"), err)