From 51a5d36bc3526fbb92eb8007d0cc958dd6878485 Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Fri, 11 Sep 2020 13:09:57 +0100 Subject: [PATCH] Fix linting errors --- pkg/odo/cli/component/component.go | 1 + pkg/odo/cli/component/devfile.go | 10 ++-------- pkg/util/util_test.go | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkg/odo/cli/component/component.go b/pkg/odo/cli/component/component.go index 9ead59dc2ed..709285ec878 100644 --- a/pkg/odo/cli/component/component.go +++ b/pkg/odo/cli/component/component.go @@ -9,6 +9,7 @@ import ( "github.com/openshift/odo/pkg/log" "github.com/openshift/odo/pkg/occlient" "github.com/openshift/odo/pkg/odo/util/completion" + "github.com/openshift/odo/pkg/odo/util/experimental" "github.com/openshift/odo/pkg/url" "github.com/pkg/errors" diff --git a/pkg/odo/cli/component/devfile.go b/pkg/odo/cli/component/devfile.go index 74fc5e3ad45..88a5d4d8ea3 100644 --- a/pkg/odo/cli/component/devfile.go +++ b/pkg/odo/cli/component/devfile.go @@ -146,10 +146,7 @@ func (po *PushOptions) devfilePushInner() (err error) { //DevfileDeploy func (do *DeployOptions) DevfileDeploy() (err error) { - componentName, err := getComponentName(do.componentContext) - if err != nil { - return errors.Wrap(err, "unable to get component name") - } + componentName := do.EnvSpecificInfo.GetName() // Set the source path to either the context or current working directory (if context not set) do.sourcePath, err = util.GetAbsPath(do.componentContext) @@ -223,10 +220,7 @@ func (ddo *DeployDeleteOptions) DevfileDeployDelete() error { return err } - componentName, err := getComponentName(ddo.componentContext) - if err != nil { - return err - } + componentName := ddo.EnvSpecificInfo.GetName() componentName = componentName + "-deploy" kc := kubernetes.KubernetesContext{ diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go index f3c8b050fdb..2afd10f95d1 100644 --- a/pkg/util/util_test.go +++ b/pkg/util/util_test.go @@ -2065,7 +2065,7 @@ func TestDownloadInMemory(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := DownloadFileInMemory(tt.url) + _, err := DownloadFileInMemory(HTTPRequestParams{URL: tt.url}) got := err == nil