Refactor common code to remove deprecated client-pkg (#384)

* Refactor common code to remove deprecated client-pkg

* Fix linter issues and headers

Author: dsimansk

README.md

@@ -90,7 +90,7 @@ kn source kafka create mykafkasrc --servers my-cluster-kafka-bootstrap.kafka.svc
   -l, --label stringArray         Metadata labels to set on the resources. Example: '--label key=value' You may be provide this flag multiple times.
   -n, --namespace string          Specify the namespace to operate in.
       --servers stringArray       Kafka bootstrap servers that the consumer will connect to, consist of a hostname plus a port pair, e.g. my-kafka-bootstrap.kafka:9092. Flag can be used multiple times.
-  -s, --sink string               Addressable sink for events. You can specify a broker, channel, Knative service or URI. Examples: '--sink broker:nest' for a broker 'nest', '--sink channel:pipe' for a channel 'pipe', '--sink ksvc:mysvc:mynamespace' for a Knative service 'mysvc' in another namespace 'mynamespace', '--sink https://event.receiver.uri' for an URI with an 'http://' or 'https://' schema, '--sink ksvc:receiver' or simply '--sink receiver' for a Knative service 'receiver' in the current namespace. If a prefix is not provided, it is considered as a Knative service in the current namespace. If referring to a Knative service in another namespace, 'ksvc:name:namespace' combination must be provided explicitly.
+  -s, --sink string               Addressable sink for events. You can specify a broker, channel, Knative service, Kubernetes service or URI. Examples: '--sink broker:nest' for a broker 'nest', '--sink channel:pipe' for a channel 'pipe', '--sink ksvc:mysvc:mynamespace' for a Knative service 'mysvc' in another namespace 'mynamespace', '--sink https://event.receiver.uri' for an HTTP URI, '--sink ksvc:receiver' or simply '--sink receiver' for a Knative service 'receiver' in the current namespace, '--sink svc:receiver:mynamespace' for a Kubernetes service 'receiver' in the 'mynamespace' namespace, '--sink special.eventing.dev/v1alpha1/channels:pipe' for GroupVersionResource of v1alpha1 'pipe'. If a prefix is not provided, it is considered as a Knative service in the current namespace.
       --topics stringArray        Topics to consume messages from. Flag can be used multiple times.
 ```
 

go.mod

@@ -5,19 +5,21 @@ go 1.24.0
 require (
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/hashicorp/hcl v1.0.1-vault-5
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.6
 	gotest.tools/v3 v3.3.0
+	k8s.io/api v0.33.1
 	k8s.io/apimachinery v0.33.1
 	k8s.io/client-go v0.33.1
-	knative.dev/client-pkg v0.0.0-20250708014830-d390b195d2e7
 	knative.dev/client/pkg v0.0.0-20250717154902-8216e64a8b5a
 	knative.dev/eventing-kafka-broker v0.45.1-0.20250715130359-a50bc61f50c6
 	knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba
 	knative.dev/pkg v0.0.0-20250716115900-19d3cc2da0b9
 )
 
 require (
+	emperror.dev/errors v0.8.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
@@ -54,7 +56,6 @@ require (
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -99,7 +100,6 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.33.1 // indirect
 	k8s.io/apiextensions-apiserver v0.33.1 // indirect
 	k8s.io/apiserver v0.33.1 // indirect
 	k8s.io/cli-runtime v0.29.2 // indirect

go.sum

@@ -36,6 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0=
+emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -372,11 +374,13 @@ go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCg
 go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=
 go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -743,8 +747,6 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
 k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/client-pkg v0.0.0-20250708014830-d390b195d2e7 h1:wKqBJpOy2OWdNQRuk4jdSpobWhPTuXzR02sJ876dTX4=
-knative.dev/client-pkg v0.0.0-20250708014830-d390b195d2e7/go.mod h1:QazBaizv2HgvEGWpCVi4Pzw1fV0b2uzSN1IQajPk0Q0=
 knative.dev/client/pkg v0.0.0-20250717154902-8216e64a8b5a h1:uLflJhDxuRKHvwwwT43R7lM6BSqwlXh0AlfQJb8qQQE=
 knative.dev/client/pkg v0.0.0-20250717154902-8216e64a8b5a/go.mod h1:/Re0d4acx7YTwmNGfgztvqp/T5hJAW/6t87265oCZFE=
 knative.dev/eventing v0.45.1-0.20250716223301-c9821a9395d6 h1:5LJW8k0u/6uGwgj5WVTCbk7idl0LZ18vKIGYN9J9hDg=

hack/generate-docs.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"os"
 
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/core"
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/util"
+	"knative.dev/kn-plugin-source-kafka/pkg/common/core"
+	"knative.dev/kn-plugin-source-kafka/pkg/common/util"
 	"knative.dev/kn-plugin-source-kafka/pkg/factories"
 )
 

pkg/client/client.go

@@ -17,11 +17,11 @@ package client
 import (
 	"context"
 
-	knerrors "knative.dev/client-pkg/pkg/errors"
-	sourceclient "knative.dev/client-pkg/pkg/kn-source-pkg/pkg/client"
-	sourcetypes "knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
+	knerrors "knative.dev/client/pkg/errors"
 	v1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/apis/sources/v1beta1"
 	clientv1beta1 "knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1"
+	sourceclient "knative.dev/kn-plugin-source-kafka/pkg/common/client"
+	sourcetypes "knative.dev/kn-plugin-source-kafka/pkg/common/types"
 	"knative.dev/kn-plugin-source-kafka/pkg/types"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/client/client_fake.go

@@ -17,9 +17,9 @@ package client
 import (
 	"k8s.io/client-go/rest"
 
-	sourcetypes "knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types/typesfakes"
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/client/clientset/versioned/typed/sources/v1beta1/fake"
+	sourcetypes "knative.dev/kn-plugin-source-kafka/pkg/common/types"
+	"knative.dev/kn-plugin-source-kafka/pkg/common/types/typesfakes"
 	"knative.dev/kn-plugin-source-kafka/pkg/types"
 )
 

vendor/knative.dev/client-pkg/pkg/kn-source-pkg/pkg/client/client.go renamed to pkg/common/client/client.go

@@ -15,7 +15,7 @@
 package client
 
 import (
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
+	"knative.dev/kn-plugin-source-kafka/pkg/common/types"
 
 	"k8s.io/client-go/rest"
 )

pkg/common/client/client_test.go

@@ -0,0 +1,51 @@
+// 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.
+
+package client
+
+import (
+	"testing"
+
+	"gotest.tools/v3/assert"
+
+	"knative.dev/kn-plugin-source-kafka/pkg/common/types"
+
+	"k8s.io/client-go/rest"
+)
+
+func TestNewKnSourceClient(t *testing.T) {
+	knSourceClient := newFakeKnSourceClient()
+	assert.Assert(t, knSourceClient != nil)
+}
+
+func TestKnSourceParams(t *testing.T) {
+	knSourceClient := newFakeKnSourceClient()
+	assert.Equal(t, knSourceClient.KnSourceParams(), knSourceClient.knSourceParams)
+}
+
+func TestNamespace(t *testing.T) {
+	knSourceClient := newFakeKnSourceClient()
+	assert.Equal(t, knSourceClient.Namespace(), "fake-namespace")
+}
+
+func TestRestConfig(t *testing.T) {
+	knSourceClient := newFakeKnSourceClient()
+	assert.Assert(t, knSourceClient.RestConfig() != nil)
+}
+
+// Private
+
+func newFakeKnSourceClient() *knSourceClient {
+	return NewKnSourceClient(&types.KnSourceParams{}, &rest.Config{}, "fake-namespace").(*knSourceClient)
+}

vendor/knative.dev/client-pkg/pkg/kn-source-pkg/pkg/commands/source/create.go renamed to pkg/common/commands/source/create.go

@@ -16,7 +16,7 @@ package source
 
 import (
 	"github.com/spf13/cobra"
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
+	"knative.dev/kn-plugin-source-kafka/pkg/common/types"
 )
 
 // NewCreateCommand for creating event sources

pkg/common/commands/source/create_test.go

@@ -0,0 +1,31 @@
+// 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.
+
+package source
+
+import (
+	"testing"
+
+	"gotest.tools/v3/assert"
+
+	"knative.dev/kn-plugin-source-kafka/pkg/common/types"
+)
+
+func TestNewCreateCommand(t *testing.T) {
+	createCmd := NewCreateCommand(&types.KnSourceParams{})
+	assert.Assert(t, createCmd != nil)
+	assert.Equal(t, createCmd.Use, "create NAME [flags]")
+	assert.Equal(t, createCmd.Short, "create {{.Name}} source")
+	assert.Equal(t, createCmd.Example, "{{.CreateExample}}")
+}