This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2704bfed8ad06dfd25b15844a4db3eac18dca3cd Author: pkalsi97 <[email protected]> AuthorDate: Wed Nov 5 12:30:17 2025 +0530 cli(reset): Fix bind force flag correctly in e2e test --- e2e/advanced/reset_test.go | 6 +++--- pkg/cmd/reset.go | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go index bc6564760..5d20474d3 100644 --- a/e2e/advanced/reset_test.go +++ b/e2e/advanced/reset_test.go @@ -46,7 +46,7 @@ func TestKamelReset(t *testing.T) { g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) - g.Expect(Kamel(t, ctx, "reset", "-n", ns, "-f").Execute()).To(Succeed()) + g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--force").Execute()).To(Succeed()) g.Expect(Integration(t, ctx, ns, name)()).To(BeNil()) g.Expect(Kits(t, ctx, ns)()).To(HaveLen(0)) }) @@ -59,7 +59,7 @@ func TestKamelReset(t *testing.T) { g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) - g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--skip-integrations", "-f").Execute()).To(Succeed()) + g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--skip-integrations", "--force").Execute()).To(Succeed()) g.Expect(Integration(t, ctx, ns, name)()).To(Not(BeNil())) g.Expect(Kits(t, ctx, ns)()).To(HaveLen(0)) }) @@ -73,7 +73,7 @@ func TestKamelReset(t *testing.T) { g.Eventually(Kit(t, ctx, ns, kitName)).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) - g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--skip-kits", "-f").Execute()).To(Succeed()) + g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--skip-kits", "--force").Execute()).To(Succeed()) g.Expect(Integration(t, ctx, ns, name)()).To(BeNil()) g.Expect(Kit(t, ctx, ns, kitName)()).To(Not(BeNil())) }) diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go index 59c40a9c4..20cc9d8bf 100644 --- a/pkg/cmd/reset.go +++ b/pkg/cmd/reset.go @@ -19,7 +19,6 @@ package cmd import ( "fmt" - "os" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" "github.com/apache/camel-k/v2/pkg/client" @@ -64,7 +63,7 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) { fmt.Fprint(cmd.OutOrStdout(), "Type the namespace to confirm: ") var input string - if _, err := fmt.Fscan(os.Stdin, &input); err != nil { + if _, err := fmt.Fscan(cmd.InOrStdin(), &input); err != nil { fmt.Fprint(cmd.ErrOrStderr(), err) return }
