From a9ee31fbb7f6ac2121935e16eb35d09342de3252 Mon Sep 17 00:00:00 2001 From: cola <45722758+xiangpingjiang@users.noreply.github.com> Date: Wed, 23 Aug 2023 16:15:55 +0800 Subject: [PATCH] Remove deprecated --inject-broker flag from trigger cmds (#1853) --- pkg/kn/commands/trigger/create.go | 9 ---- pkg/kn/commands/trigger/create_test.go | 30 ----------- pkg/kn/commands/trigger/update_flags.go | 8 +-- test/e2e/trigger_inject_broker_test.go | 67 ------------------------- 4 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 test/e2e/trigger_inject_broker_test.go diff --git a/pkg/kn/commands/trigger/create.go b/pkg/kn/commands/trigger/create.go index 26419dcb7d..181c750551 100644 --- a/pkg/kn/commands/trigger/create.go +++ b/pkg/kn/commands/trigger/create.go @@ -86,15 +86,6 @@ func NewTriggerCreateCommand(p *commands.KnParams) *cobra.Command { Ref: objectRef.Ref, URI: objectRef.URI, }) - // add inject annotation only if flag broker name is `default` - if triggerUpdateFlags.InjectBroker { - if triggerUpdateFlags.Broker == "default" { - triggerBuilder.InjectBroker(true) - } else { - return fmt.Errorf("cannot create trigger '%s' in namespace '%s' "+ - "because broker name must be 'default' if '--inject-broker' flag is used", name, namespace) - } - } err = eventingClient.CreateTrigger(cmd.Context(), triggerBuilder.Build()) if err != nil { diff --git a/pkg/kn/commands/trigger/create_test.go b/pkg/kn/commands/trigger/create_test.go index 634530a762..fafb3f4d56 100644 --- a/pkg/kn/commands/trigger/create_test.go +++ b/pkg/kn/commands/trigger/create_test.go @@ -49,36 +49,6 @@ func TestTriggerCreate(t *testing.T) { eventingRecorder.Validate() } -func TestTriggerWithInjectCreate(t *testing.T) { - eventingClient := clienteventingv1.NewMockKnEventingClient(t) - dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default", &servingv1.Service{ - TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "serving.knative.dev/v1"}, - ObjectMeta: metav1.ObjectMeta{Name: "mysvc", Namespace: "default"}, - }) - - eventingRecorder := eventingClient.Recorder() - eventingRecorder.CreateTrigger(createTriggerWithInject("default", triggerName, map[string]string{"type": "dev.knative.foo"}, "default", "mysvc"), nil) - - out, err := executeTriggerCommand(eventingClient, dynamicClient, "create", triggerName, "--broker", "default", "--inject-broker", - "--filter", "type=dev.knative.foo", "--sink", "ksvc:mysvc") - assert.NilError(t, err, "Trigger should be created") - assert.Assert(t, util.ContainsAll(out, "Trigger", triggerName, "created", "namespace", "default")) - - eventingRecorder.Validate() -} - -func TestTriggerWithInjectError(t *testing.T) { - eventingClient := clienteventingv1.NewMockKnEventingClient(t) - dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default", &servingv1.Service{ - TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "serving.knative.dev/v1"}, - ObjectMeta: metav1.ObjectMeta{Name: "mysvc", Namespace: "default"}, - }) - - _, err := executeTriggerCommand(eventingClient, dynamicClient, "create", triggerName, "--broker", "mybroker", "--inject-broker", - "--filter", "type=dev.knative.foo", "--sink", "ksvc:mysvc") - assert.ErrorContains(t, err, "broker", "name", "'default'", "--inject-broker", "flag") -} - func TestSinkNotFoundError(t *testing.T) { eventingClient := clienteventingv1.NewMockKnEventingClient(t) dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default") diff --git a/pkg/kn/commands/trigger/update_flags.go b/pkg/kn/commands/trigger/update_flags.go index 3c21867e4d..fd3aacf90e 100644 --- a/pkg/kn/commands/trigger/update_flags.go +++ b/pkg/kn/commands/trigger/update_flags.go @@ -54,12 +54,6 @@ func (f *TriggerUpdateFlags) Add(cmd *cobra.Command) { // Spec.Broker is immutable field cmd.Flags().StringVar(&f.Broker, "broker", "default", "Name of the Broker which the trigger associates with.") } - // The Sugar controller was integrated into main Eventing controller. With that the default behavior was changed as well. - // Users need to configure 'Automatic Broker Creation' per linked docs. - // Deprecated in 1.4, remove in 1.6. - cmd.Flags().BoolVar(&f.InjectBroker, "inject-broker", false, "Create new broker with name default through common annotation") - cmd.Flags().MarkDeprecated("inject-broker", "effective since 1.4 and will be removed in 1.6 release. \n"+ - "Please refer to 'Automatic Broker Creation' section for configuration options, "+ - "https://knative.dev/docs/eventing/sugar/#automatic-broker-creation.") + cmd.Flags().StringSliceVar(&f.Filters, "filter", nil, "Key-value pair for exact CloudEvent attribute matching against incoming events, e.g type=dev.knative.foo") } diff --git a/test/e2e/trigger_inject_broker_test.go b/test/e2e/trigger_inject_broker_test.go deleted file mode 100644 index 46e7868a39..0000000000 --- a/test/e2e/trigger_inject_broker_test.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2020 The Knative Authors - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 - -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or im -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build e2e && !serving -// +build e2e,!serving - -package e2e - -import ( - "testing" - - "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" - "knative.dev/client/pkg/util" -) - -func TestInjectBrokerTrigger(t *testing.T) { - t.Parallel() - it, err := test.NewKnTest() - assert.NilError(t, err) - defer func() { - assert.NilError(t, it.Teardown()) - }() - - r := test.NewKnRunResultCollector(t, it) - defer r.DumpIfFailed() - - assert.NilError(t, err) - - test.ServiceCreate(r, "sinksvc0") - test.ServiceCreate(r, "sinksvc1") - - t.Log("create triggers and list them") - triggerCreateWithInject(r, "trigger1", "sinksvc0", []string{"a=b"}) - triggerCreateWithInject(r, "trigger2", "sinksvc1", []string{"type=knative.dev.bar", "source=ping"}) - verifyTriggerList(r, "trigger1", "trigger2") - triggerDelete(r, "trigger1") - triggerDelete(r, "trigger2") - - t.Log("create trigger with error") - out := it.Kn().Run("trigger", "create", "errorTrigger", "--broker", "mybroker", "--inject-broker", - "--sink", "ksvc:sinksvc0", "--filter", "a=b") - r.AssertError(out) - assert.Check(t, util.ContainsAllIgnoreCase(out.Stderr, "broker", "name", "'default'", "--inject-broker", "flag")) -} - -func triggerCreateWithInject(r *test.KnRunResultCollector, name string, sinksvc string, filters []string) { - args := []string{"trigger", "create", name, "--broker", "default", "--inject-broker", "--sink", "ksvc:" + sinksvc} - for _, v := range filters { - args = append(args, "--filter", v) - } - out := r.KnTest().Kn().Run(args...) - r.AssertNoError(out) - assert.Check(r.T(), util.ContainsAllIgnoreCase(out.Stdout, "Trigger", name, "created", "namespace", r.KnTest().Kn().Namespace())) -}