Fix: Move randomPorts and errOut as PushParameters

redhat-developer · Jul 5, 2022 · f6c7d54 · f6c7d54
1 parent 3e51559
commit f6c7d54
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/pkg/dev/dev.go b/pkg/dev/dev.go
@@ -97,6 +97,8 @@ func (o *DevClient) Watch(
 	buildCommand string,
 	runCommand string,
 	variables map[string]string,
+	randomPorts bool,
+	errOut io.Writer,
 ) error {
 	envSpecificInfo, err := envinfo.NewEnvSpecificInfo(path)
 	if err != nil {
@@ -116,6 +118,8 @@ func (o *DevClient) Watch(
 		DevfileRunCmd:       runCommand,
 		DebugPort:           envSpecificInfo.GetDebugPort(),
 		Variables:           variables,
+		RandomPorts:         randomPorts,
+		ErrOut:              errOut,
 	}
 
 	return o.watchClient.WatchAndPush(out, watchParameters, ctx)

diff --git a/pkg/dev/interface.go b/pkg/dev/interface.go
@@ -46,6 +46,8 @@ type Client interface {
 		buildCommand string,
 		runCommand string,
 		variables map[string]string,
+		randomPorts bool,
+		errOut io.Writer,
 	) error
 }
 

diff --git a/pkg/dev/mock.go b/pkg/dev/mock.go
diff --git a/pkg/odo/cli/dev/dev.go b/pkg/odo/cli/dev/dev.go
@@ -223,7 +223,17 @@ func (o *DevOptions) Run(ctx context.Context) (err error) {
 		"odo version: "+version.VERSION)
 
 	log.Section("Deploying to the cluster in developer mode")
-	err = o.clientset.DevClient.Start(devFileObj, platformContext, o.ignorePaths, path, o.debugFlag, o.buildCommandFlag, o.runCommandFlag, o.randomPortsFlag, o.errOut)
+	err = o.clientset.DevClient.Start(
+		devFileObj,
+		platformContext,
+		o.ignorePaths,
+		path,
+		o.debugFlag,
+		o.buildCommandFlag,
+		o.runCommandFlag,
+		o.randomPortsFlag,
+		o.errOut,
+	)
 	if err != nil {
 		return err
 	}
@@ -245,7 +255,20 @@ func (o *DevOptions) Run(ctx context.Context) (err error) {
 			randomPorts: o.randomPortsFlag,
 			errOut:      o.errOut,
 		}
-		err = o.clientset.DevClient.Watch(devFileObj, path, o.ignorePaths, o.out, &d, o.ctx, o.debugFlag, o.buildCommandFlag, o.runCommandFlag, o.variables)
+		err = o.clientset.DevClient.Watch(
+			devFileObj,
+			path,
+			o.ignorePaths,
+			o.out,
+			&d,
+			o.ctx,
+			o.debugFlag,
+			o.buildCommandFlag,
+			o.runCommandFlag,
+			o.variables,
+			o.randomPortsFlag,
+			o.errOut,
+		)
 	}
 	return err
 }

diff --git a/pkg/watch/watch.go b/pkg/watch/watch.go
@@ -78,6 +78,10 @@ type WatchParameters struct {
 	DebugPort int
 	// Variables override Devfile variables
 	Variables map[string]string
+	// RandomPorts is true to forward containers ports on local random ports
+	RandomPorts bool
+	// ErrOut is a Writer to output forwarded port information
+	ErrOut io.Writer
 }
 
 // evaluateChangesFunc evaluates any file changes for the events by ignoring the files in fileIgnores slice and removes
@@ -351,6 +355,8 @@ func processEvents(changedFiles, deletedPaths []string, parameters WatchParamete
 		EnvSpecificInfo:          *parameters.EnvSpecificInfo,
 		Debug:                    parameters.Debug,
 		DebugPort:                parameters.DebugPort,
+		RandomPorts:              parameters.RandomPorts,
+		ErrOut:                   parameters.ErrOut,
 	}
 	err := parameters.DevfileWatchHandler(pushParams, parameters)
 	if err != nil {