[release-v0.24.0] Update spec file & kafka tests (knative#814)

* [release-v0.24.0] Update spec file version

* [release-v0.24.0] Add kafka plugin tests

go.mod

@@ -4,6 +4,7 @@ go 1.15
 
 require (
 	github.com/google/go-cmp v0.5.6
+	github.com/maximilien/kn-source-pkg v0.6.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5

openshift-serverless-clients.spec

@@ -3,7 +3,7 @@
 %global package_name openshift-serverless-clients
 %global product_name OpenShift Serverless
 %global golang_version 1.15
-%global kn_version 0.23.2
+%global kn_version 0.24.0
 %global kn_release 1
 %global kn_cli_version v%{kn_version}
 %global source_dir knative-client
@@ -68,6 +68,9 @@ Obsoletes:      %{package_name} < %{kn_version}
 %{_datadir}/%{name}-redistributable/windows/kn-windows-amd64.exe
 
 %changelog
+* Mon Sep 13 2021 David Simansky <[email protected]> v0.24.0-1
+- Bump kn release v0.24.0
+
 * Mon Aug 2 2021 David Simansky <[email protected]> v0.23.2-1
 - Bump kn release v0.23.2
 

test/e2e/source_kafka_test.go

@@ -0,0 +1,123 @@
+// 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 implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build e2e
+// +build !serving
+
+package e2e
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	testcommon "github.com/maximilien/kn-source-pkg/test/e2e"
+	"gotest.tools/v3/assert"
+	"knative.dev/client/lib/test"
+	"knative.dev/client/pkg/util"
+)
+
+const (
+	kafkaBootstrapUrl     = "my-cluster-kafka-bootstrap.kafka.svc:9092"
+	kafkaClusterName      = "my-cluster"
+	kafkaClusterNamespace = "kafka"
+	kafkaTopic            = "test-topic"
+	ceo                   = "type=foo"
+)
+
+type e2eTest struct {
+	it *testcommon.E2ETest
+}
+
+func newE2ETest(t *testing.T) *e2eTest {
+	currentDir, err := os.Getwd()
+	if err != nil {
+		return nil
+	}
+
+	it, err := testcommon.NewE2ETest("kn-source-kafka", filepath.Join(currentDir, "../.."), false)
+	if err != nil {
+		return nil
+	}
+
+	e2eTest := &e2eTest{
+		it: it,
+	}
+	return e2eTest
+}
+
+func TestSourceKafka(t *testing.T) {
+	t.Parallel()
+
+	e2eTest := newE2ETest(t)
+	assert.Assert(t, e2eTest != nil)
+	defer func() {
+		assert.NilError(t, e2eTest.it.KnTest().Teardown())
+	}()
+
+	r := test.NewKnRunResultCollector(t, e2eTest.it.KnTest())
+	defer r.DumpIfFailed()
+
+	//err := e2eTest.it.KnPlugin().Install()
+	//assert.NilError(t, err)
+
+	serviceCreate(r, "sinksvc")
+
+	t.Log("test kn-plugin-source-kafka create source-name")
+	e2eTest.knSourceKafkaCreate(t, r, "mykafka1", "sinksvc")
+
+	t.Log("test kn-plugin-source-kafka describe source-name")
+	e2eTest.knSourceKafkaDescribe(t, r, "mykafka1", "sinksvc", "cloudevent")
+
+	t.Log("test kn-plugin-source-kafka list")
+	e2eTest.knSourceKafkaList(t, r, "mykafka1")
+
+	t.Log("test kn-plugin-source-kafka delete source-name")
+	e2eTest.knSourceKafkaDelete(t, r, "mykafka1")
+
+	//err = e2eTest.it.KnPlugin().Uninstall()
+	//assert.NilError(t, err)
+}
+
+// Private
+
+func (et *e2eTest) knSourceKafkaCreate(t *testing.T, r *test.KnRunResultCollector, sourceName, sinkName string) {
+	out := et.it.KnPlugin().Run("create", sourceName, "--servers", kafkaBootstrapUrl, "--topics", kafkaTopic, "--consumergroup", "test-consumer-group", "--sink", sinkName, "--ce-override", ceo)
+	r.AssertNoError(out)
+	assert.Check(t, util.ContainsAllIgnoreCase(out.Stdout, "create", sourceName))
+}
+
+func (et *e2eTest) knSourceKafkaDelete(t *testing.T, r *test.KnRunResultCollector, sourceName string) {
+	out := et.it.KnPlugin().Run("delete", sourceName)
+	r.AssertNoError(out)
+	assert.Check(t, util.ContainsAllIgnoreCase(out.Stdout, "delete", sourceName))
+}
+
+func (et *e2eTest) knSourceKafkaDescribe(t *testing.T, r *test.KnRunResultCollector, sourceName, sinkName, cloudEvent string) {
+	out := et.it.KnPlugin().Run("describe", sourceName)
+	r.AssertNoError(out)
+	assert.Check(t, util.ContainsAllIgnoreCase(out.Stdout, sourceName, sinkName, cloudEvent))
+}
+
+func serviceCreate(r *test.KnRunResultCollector, serviceName string) {
+	out := r.KnTest().Kn().Run("service", "create", serviceName, "--image", "gcr.io/knative-samples/helloworld-go")
+	r.AssertNoError(out)
+	assert.Check(r.T(), util.ContainsAllIgnoreCase(out.Stdout, "service", serviceName, "creating", "namespace", r.KnTest().Kn().Namespace(), "ready"))
+}
+
+func (et *e2eTest) knSourceKafkaList(t *testing.T, r *test.KnRunResultCollector, sourceName string) {
+	out := et.it.KnPlugin().Run("list")
+	r.AssertNoError(out)
+	assert.Check(t, util.ContainsAll(out.Stdout, "NAME", "AGE", "SINK", "BOOTSTRAPSERVERS", sourceName))
+}

vendor/modules.txt

@@ -256,12 +256,14 @@ github.com/mailru/easyjson/jwriter
 # github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
 github.com/matttproud/golang_protobuf_extensions/pbutil
 # github.com/maximilien/kn-source-pkg v0.6.3
+## explicit
 github.com/maximilien/kn-source-pkg/pkg/client
 github.com/maximilien/kn-source-pkg/pkg/commands/source
 github.com/maximilien/kn-source-pkg/pkg/core
 github.com/maximilien/kn-source-pkg/pkg/factories
 github.com/maximilien/kn-source-pkg/pkg/types
 github.com/maximilien/kn-source-pkg/pkg/types/typesfakes
+github.com/maximilien/kn-source-pkg/test/e2e
 # github.com/mitchellh/go-homedir v1.1.0
 ## explicit
 github.com/mitchellh/go-homedir