Replace knative.dev/client references to knative.dev/client-pkg

cmd/deploy.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ory/viper"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
 	"knative.dev/func/pkg/builders"
 	"knative.dev/func/pkg/builders/buildpacks"
 	"knative.dev/func/pkg/builders/s2i"

cmd/root.go

@@ -13,7 +13,7 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/term"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
 
 	"knative.dev/func/cmd/templates"
 	"knative.dev/func/pkg/config"

cmd/root_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/ory/viper"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
 
 	fn "knative.dev/func/pkg/functions"
 	. "knative.dev/func/pkg/testing"

cmd/run.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ory/viper"
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
 
 	"knative.dev/func/pkg/builders"
 	"knative.dev/func/pkg/builders/buildpacks"

cmd/templates/command_groups_test.go

@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
 
-	"knative.dev/client/lib/test"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
+	"knative.dev/client-pkg/pkg/util/test"
 )
 
 var groups = CommandGroups{

cmd/templates/template_engine_test.go

@@ -23,8 +23,8 @@ import (
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
 
-	"knative.dev/client/lib/test"
-	"knative.dev/client/pkg/util"
+	"knative.dev/client-pkg/pkg/util"
+	"knative.dev/client-pkg/pkg/util/test"
 )
 
 type testData struct {

go.mod

@@ -45,7 +45,7 @@ require (
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
 	k8s.io/client-go v1.5.2
-	knative.dev/client v0.36.1-0.20230323163555-3a8d646264ba
+	knative.dev/client-pkg v0.0.0-20230406095919-30a17e519723
 	knative.dev/eventing v0.36.1-0.20230405220638-d9910407d0f4
 	knative.dev/hack v0.0.0-20230330174700-1421f120c36b
 	knative.dev/pkg v0.0.0-20230404101938-ee73c9355c9d
@@ -185,7 +185,6 @@ require (
 	github.com/opencontainers/selinux v1.10.2 // indirect
 	github.com/openzipkin/zipkin-go v0.4.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
@@ -205,7 +204,6 @@ require (
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.14.0 // indirect
 	github.com/stoewer/go-strcase v1.2.1 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect

go.sum

@@ -1348,8 +1348,6 @@ github.com/pelletier/go-toml v1.9.1/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
-github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
@@ -1543,8 +1541,6 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y
 github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
-github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU=
-github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stoewer/go-strcase v1.2.1 h1:/1JWd+AcWPzkcGLEmjUCka99YqGOtTnp1H/wcP+uap4=
@@ -2531,8 +2527,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20230115233650-391b47cb4029 h1:L8zDtT4jrxj+TaQYD0k8KNlr556WaVQylDXswKmX+dE=
 k8s.io/utils v0.0.0-20230115233650-391b47cb4029/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/client v0.36.1-0.20230323163555-3a8d646264ba h1:xj14uQfTiXfbtyAYC7CrTi38/1kpnov7IczR6tV+wRM=
-knative.dev/client v0.36.1-0.20230323163555-3a8d646264ba/go.mod h1:Ftn1Y9JpySkX0AGqiul3nl+Varw2sztAc7zDupbu+cQ=
+knative.dev/client-pkg v0.0.0-20230406095919-30a17e519723 h1:n3iELlJqzAflaQDWqFodtnf2AVRcWTBkw2xFuOiaItM=
+knative.dev/client-pkg v0.0.0-20230406095919-30a17e519723/go.mod h1:ay34oweJk5AiUQ2XuZ9VxoQYwFmSjUDEYxklv6USy1M=
 knative.dev/eventing v0.36.1-0.20230405220638-d9910407d0f4 h1:c8MyN4z5Fe7uaRxLnNJRM89v0apzOidrBgEoE3TRDoA=
 knative.dev/eventing v0.36.1-0.20230405220638-d9910407d0f4/go.mod h1:04GSGLHjBkgDEGRIg2wM7n5BB27BRIoMqb9emFp/YNU=
 knative.dev/hack v0.0.0-20230330174700-1421f120c36b h1:20HMZEfXRdMPObZcV2MiZmcoJ9ms98qeWx0aUoHUAnc=

pkg/knative/client.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	clienteventingv1 "knative.dev/client/pkg/eventing/v1"
-	clientservingv1 "knative.dev/client/pkg/serving/v1"
+	clienteventingv1 "knative.dev/client-pkg/pkg/eventing/v1"
+	clientservingv1 "knative.dev/client-pkg/pkg/serving/v1"
 	eventingv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1"
 	servingv1 "knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1"
 

pkg/knative/deployer.go

@@ -14,10 +14,10 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"knative.dev/client/pkg/kn/flags"
-	servingclientlib "knative.dev/client/pkg/serving"
-	clientservingv1 "knative.dev/client/pkg/serving/v1"
-	"knative.dev/client/pkg/wait"
+	"knative.dev/client-pkg/pkg/kn/flags"
+	servingclientlib "knative.dev/client-pkg/pkg/serving"
+	clientservingv1 "knative.dev/client-pkg/pkg/serving/v1"
+	"knative.dev/client-pkg/pkg/wait"
 	"knative.dev/serving/pkg/apis/autoscaling"
 	v1 "knative.dev/serving/pkg/apis/serving/v1"
 

pkg/knative/describer.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"k8s.io/apimachinery/pkg/api/errors"
-	clientservingv1 "knative.dev/client/pkg/serving/v1"
+	clientservingv1 "knative.dev/client-pkg/pkg/serving/v1"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 
 	fn "knative.dev/func/pkg/functions"

pkg/knative/lister.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	corev1 "k8s.io/api/core/v1"
-	clientservingv1 "knative.dev/client/pkg/serving/v1"
+	clientservingv1 "knative.dev/client-pkg/pkg/serving/v1"
 	"knative.dev/pkg/apis"
 
 	fn "knative.dev/func/pkg/functions"

plugin/plugin.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	"knative.dev/client/pkg/kn/plugin"
+	"knative.dev/client-pkg/pkg/kn/plugin"
 
 	"knative.dev/func/cmd"
 )