image.Build*: Use values from ctx instead of parameters

redhat-developer · Nov 8, 2022 · 2544714 · 2544714
1 parent ae46de3
commit 2544714
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/pkg/deploy/deploy.go b/pkg/deploy/deploy.go
@@ -69,7 +69,7 @@ func newDeployHandler(ctx context.Context, fs filesystem.Filesystem, devfileObj
 
 // ApplyImage builds and pushes the OCI image to be used on Kubernetes
 func (o *deployHandler) ApplyImage(img v1alpha2.Component) error {
-	return image.BuildPushSpecificImage(o.ctx, o.fs, o.path, img, true)
+	return image.BuildPushSpecificImage(o.ctx, o.fs, img, true)
 }
 
 // ApplyKubernetes applies inline Kubernetes YAML from the devfile.yaml file

diff --git a/pkg/devfile/adapters/kubernetes/component/handler.go b/pkg/devfile/adapters/kubernetes/component/handler.go
@@ -32,7 +32,7 @@ type runHandler struct {
 var _ libdevfile.Handler = (*runHandler)(nil)
 
 func (a *runHandler) ApplyImage(img devfilev1.Component) error {
-	return image.BuildPushSpecificImage(a.ctx, a.fs, a.path, img, true)
+	return image.BuildPushSpecificImage(a.ctx, a.fs, img, true)
 }
 
 func (a *runHandler) ApplyKubernetes(kubernetes devfilev1.Component) error {

diff --git a/pkg/devfile/image/image.go b/pkg/devfile/image/image.go
@@ -5,14 +5,15 @@ import (
 	"context"
 	"errors"
 	"os/exec"
+	"path/filepath"
 
 	devfile "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser"
 	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
 
 	envcontext "github.com/redhat-developer/odo/pkg/config/context"
 	"github.com/redhat-developer/odo/pkg/libdevfile"
 	"github.com/redhat-developer/odo/pkg/log"
+	odocontext "github.com/redhat-developer/odo/pkg/odo/context"
 	"github.com/redhat-developer/odo/pkg/testingutil/filesystem"
 
 	"k8s.io/utils/pointer"
@@ -33,7 +34,12 @@ var lookPathCmd = exec.LookPath
 
 // BuildPushImages build all images defined in the devfile with the detected backend
 // If push is true, also push the images to their registries
-func BuildPushImages(ctx context.Context, fs filesystem.Filesystem, devfileObj parser.DevfileObj, path string, push bool) error {
+func BuildPushImages(ctx context.Context, fs filesystem.Filesystem, push bool) error {
+	var (
+		devfileObj  = odocontext.GetDevfileObj(ctx)
+		devfilePath = odocontext.GetDevfilePath(ctx)
+		path        = filepath.Dir(devfilePath)
+	)
 
 	backend, err := selectBackend(ctx)
 	if err != nil {
@@ -61,12 +67,14 @@ func BuildPushImages(ctx context.Context, fs filesystem.Filesystem, devfileObj p
 
 // BuildPushSpecificImage build an image defined in the devfile present in devfilePath
 // If push is true, also push the image to its registry
-func BuildPushSpecificImage(ctx context.Context, fs filesystem.Filesystem, devfilePath string, component devfile.Component, push bool) error {
+func BuildPushSpecificImage(ctx context.Context, fs filesystem.Filesystem, component devfile.Component, push bool) error {
+	var (
+		devfilePath = odocontext.GetDevfilePath(ctx)
+	)
 	backend, err := selectBackend(ctx)
 	if err != nil {
 		return err
 	}
-
 	return buildPushImage(backend, fs, component.Image, devfilePath, push)
 }
 

diff --git a/pkg/odo/cli/build_images/build_images.go b/pkg/odo/cli/build_images/build_images.go
@@ -3,7 +3,6 @@ package build_images
 import (
 	"context"
 	"fmt"
-	"path/filepath"
 
 	"github.com/spf13/cobra"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -63,12 +62,7 @@ func (o *BuildImagesOptions) Validate(ctx context.Context) (err error) {
 
 // Run contains the logic for the odo command
 func (o *BuildImagesOptions) Run(ctx context.Context) (err error) {
-	var (
-		devfileObj  = odocontext.GetDevfileObj(ctx)
-		devfilePath = odocontext.GetDevfilePath(ctx)
-		path        = filepath.Dir(devfilePath)
-	)
-	return image.BuildPushImages(ctx, o.clientset.FS, *devfileObj, path, o.pushFlag)
+	return image.BuildPushImages(ctx, o.clientset.FS, o.pushFlag)
 }
 
 // NewCmdBuildImages implements the odo command