Use client-pkg code

knative · Apr 16, 2024 · 9ef3520 · 9ef3520
1 parent 6ebd9ab
commit 9ef3520
Show file tree

Hide file tree

Showing 343 changed files with 9,194 additions and 3,252 deletions.
diff --git a/cmd/kn/main_test.go b/cmd/kn/main_test.go
@@ -26,10 +26,10 @@ import (
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
 
-	"knative.dev/client/lib/test"
+	"knative.dev/client-pkg/pkg/util"
+	"knative.dev/client-pkg/pkg/util/test"
 	"knative.dev/client/pkg/kn/config"
 	"knative.dev/client/pkg/kn/root"
-	"knative.dev/client/pkg/util"
 )
 
 func TestValidatePlugin(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -2,6 +2,11 @@ module knative.dev/client
 
 go 1.21
 
+// TODO: remove when https://github.com/knative/client-pkg/pull/177 is merged
+replace knative.dev/client-pkg => github.com/cardil/knative-client-pkg v0.0.0-20240416095801-87f6a5d7889a
+
+//replace knative.dev/client-pkg => ../knative-client-pkg
+
 require (
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
@@ -15,7 +20,7 @@ require (
 	golang.org/x/term v0.18.0
 	gotest.tools/v3 v3.3.0
 	k8s.io/api v0.29.2
-	k8s.io/apiextensions-apiserver v0.29.2
+	k8s.io/apiextensions-apiserver v0.29.2 // indirect
 	k8s.io/apimachinery v0.29.2
 	k8s.io/cli-runtime v0.29.2
 	k8s.io/client-go v0.29.2

diff --git a/go.sum b/go.sum
@@ -59,6 +59,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
+github.com/cardil/knative-client-pkg v0.0.0-20240416095801-87f6a5d7889a h1:jca8T6JyUYzMkB6OeaJ1R1ETAFyjIiuIN8XNeO7eBUY=
+github.com/cardil/knative-client-pkg v0.0.0-20240416095801-87f6a5d7889a/go.mod h1:PYodo1bmKTrxnNCfLJa6a8wdg3QQH0XTOPlZJwrY64A=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
 github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
@@ -839,8 +841,6 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/client-pkg v0.0.0-20240327121233-6984d81a90ec h1:gG8AzUJDHrYONInTv0wm1gSPzWp3n8tooewl+yGpe/I=
-knative.dev/client-pkg v0.0.0-20240327121233-6984d81a90ec/go.mod h1:PYodo1bmKTrxnNCfLJa6a8wdg3QQH0XTOPlZJwrY64A=
 knative.dev/eventing v0.40.1-0.20240327131403-47543259ceba h1:uX9UsYNHJQDpqVSMVijhSljmCSLZm5ocPdQJ4jrkyig=
 knative.dev/eventing v0.40.1-0.20240327131403-47543259ceba/go.mod h1:19sfPiy4dK2jBIHgszOTk43qOvfCXz1GTIncRY3trB8=
 knative.dev/hack v0.0.0-20240327150553-47368d631660 h1:tW6NgyjMnSXBS75+k+Xh5uNiLhJ9TFswS9hrkC3OQOc=

diff --git a/lib/printing/describe.go b/lib/printing/describe.go
@@ -19,7 +19,7 @@ package printing
 import (
 	"fmt"
 
-	"knative.dev/client/pkg/printers"
+	"knative.dev/client-pkg/pkg/printers"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 )
 

diff --git a/pkg/dynamic/client_mock_test.go b/pkg/dynamic/client_mock_test.go