change default options not pointer

Signed-off-by: Andrea Falzetti <andrea@okteto.com>
okteto · Feb 21, 2024 · e0b7d6b · e0b7d6b
1 parent 04d2425
commit e0b7d6b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/cmd/context/utils.go b/cmd/context/utils.go
@@ -224,7 +224,7 @@ func LoadStackWithContext(ctx context.Context, name, namespace string, stackPath
 }
 
 // LoadContextFromPath initializes the okteto context taking into account command flags and manifest namespace/context fields
-func LoadContextFromPath(ctx context.Context, namespace, k8sContext, path string, defaultCtxOpts *Options) error {
+func LoadContextFromPath(ctx context.Context, namespace, k8sContext, path string, defaultCtxOpts Options) error {
 	ctxResource, err := getCtxResource(path)
 	if err != nil {
 		return err
@@ -238,14 +238,9 @@ func LoadContextFromPath(ctx context.Context, namespace, k8sContext, path string
 		return err
 	}
 
-	var ctxOptions *Options
-
-	if defaultCtxOpts != nil {
-		ctxOptions = defaultCtxOpts
-	}
-
+	ctxOptions := defaultCtxOpts
 	ctxOptions.Context = ctxResource.Context
 	ctxOptions.Namespace = ctxResource.Namespace
 
-	return NewContextCommand().Run(ctx, ctxOptions)
+	return NewContextCommand().Run(ctx, &ctxOptions)
 }
diff --git a/cmd/deploy/deploy.go b/cmd/deploy/deploy.go
@@ -172,7 +172,7 @@ func Deploy(ctx context.Context, at analyticsTrackerInterface, ioCtrl *io.Contro
 			}
 
 			// Loads, updates and uses the context from path. If not found, it creates and uses a new context
-			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, &contextCMD.Options{Show: true}); err != nil {
+			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, contextCMD.Options{Show: true}); err != nil {
 				if err.Error() == fmt.Errorf(oktetoErrors.ErrNotLogged, okteto.CloudURL).Error() {
 					return err
 				}

diff --git a/cmd/deploy/endpoints.go b/cmd/deploy/endpoints.go
@@ -104,7 +104,7 @@ func Endpoints(ctx context.Context, k8sLogger *io.K8sLogger) *cobra.Command {
 			}
 
 			// Loads, updates and uses the context from path. If not found, it creates and uses a new context
-			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, &contextCMD.Options{Show: options.Output == ""}); err != nil {
+			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, contextCMD.Options{Show: options.Output == ""}); err != nil {
 				if err := contextCMD.NewContextCommand().Run(ctx, &contextCMD.Options{Namespace: options.Namespace, Show: false}); err != nil {
 					return err
 				}

diff --git a/cmd/destroy/destroy.go b/cmd/destroy/destroy.go
@@ -132,7 +132,7 @@ func Destroy(ctx context.Context, at analyticsTrackerInterface, ioCtrl *io.Contr
 				}
 				options.ManifestPath = uptManifestPath
 			}
-			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, &contextCMD.Options{Show: true}); err != nil {
+			if err := contextCMD.LoadContextFromPath(ctx, options.Namespace, options.K8sContext, options.ManifestPath, contextCMD.Options{Show: true}); err != nil {
 				if err.Error() == fmt.Errorf(oktetoErrors.ErrNotLogged, okteto.CloudURL).Error() {
 					return err
 				}