diff --git a/cmd/kn/main.go b/cmd/kn/main.go index c88980fba..e8b93f521 100644 --- a/cmd/kn/main.go +++ b/cmd/kn/main.go @@ -22,9 +22,9 @@ import ( "strings" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/config" - pluginpkg "knative.dev/client/pkg/kn/plugin" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/config" + pluginpkg "knative.dev/client/pkg/plugin" + "knative.dev/client/pkg/root" ) func main() { diff --git a/cmd/kn/main_test.go b/cmd/kn/main_test.go index 3b016fc79..6f6e52456 100644 --- a/cmd/kn/main_test.go +++ b/cmd/kn/main_test.go @@ -21,14 +21,14 @@ import ( "strings" "testing" - pluginpkg "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/config" + pluginpkg "knative.dev/client/pkg/plugin" "github.com/spf13/cobra" "gotest.tools/v3/assert" "knative.dev/client/lib/test" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/root" "knative.dev/client/pkg/util" ) diff --git a/hack/generate-docs.go b/hack/generate-docs.go index ffa2f37b0..2d8a4e99d 100644 --- a/hack/generate-docs.go +++ b/hack/generate-docs.go @@ -20,7 +20,7 @@ import ( "os" "github.com/spf13/cobra/doc" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/root" ) func main() { diff --git a/pkg/kn/commands/broker/broker.go b/pkg/commands/broker/broker.go similarity index 96% rename from pkg/kn/commands/broker/broker.go rename to pkg/commands/broker/broker.go index 52e45478a..c642f757d 100644 --- a/pkg/kn/commands/broker/broker.go +++ b/pkg/commands/broker/broker.go @@ -19,7 +19,7 @@ package broker import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewBrokerCommand represents broker management commands diff --git a/pkg/kn/commands/broker/broker_test.go b/pkg/commands/broker/broker_test.go similarity index 99% rename from pkg/kn/commands/broker/broker_test.go rename to pkg/commands/broker/broker_test.go index aaae5aa44..a4a76caab 100644 --- a/pkg/kn/commands/broker/broker_test.go +++ b/pkg/commands/broker/broker_test.go @@ -26,8 +26,8 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/config_flags.go b/pkg/commands/broker/config_flags.go similarity index 100% rename from pkg/kn/commands/broker/config_flags.go rename to pkg/commands/broker/config_flags.go diff --git a/pkg/kn/commands/broker/config_flags_test.go b/pkg/commands/broker/config_flags_test.go similarity index 100% rename from pkg/kn/commands/broker/config_flags_test.go rename to pkg/commands/broker/config_flags_test.go diff --git a/pkg/kn/commands/broker/create.go b/pkg/commands/broker/create.go similarity index 99% rename from pkg/kn/commands/broker/create.go rename to pkg/commands/broker/create.go index eeca1cb10..758f745d6 100644 --- a/pkg/kn/commands/broker/create.go +++ b/pkg/commands/broker/create.go @@ -24,8 +24,8 @@ import ( v1 "knative.dev/eventing/pkg/apis/duck/v1" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" ) var createExample = ` diff --git a/pkg/kn/commands/broker/create_test.go b/pkg/commands/broker/create_test.go similarity index 100% rename from pkg/kn/commands/broker/create_test.go rename to pkg/commands/broker/create_test.go diff --git a/pkg/kn/commands/broker/delete.go b/pkg/commands/broker/delete.go similarity index 98% rename from pkg/kn/commands/broker/delete.go rename to pkg/commands/broker/delete.go index c62d6323c..ce015d7f0 100644 --- a/pkg/kn/commands/broker/delete.go +++ b/pkg/commands/broker/delete.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var deleteExample = ` diff --git a/pkg/kn/commands/broker/delete_test.go b/pkg/commands/broker/delete_test.go similarity index 100% rename from pkg/kn/commands/broker/delete_test.go rename to pkg/commands/broker/delete_test.go diff --git a/pkg/kn/commands/broker/delivery_option_flags.go b/pkg/commands/broker/delivery_option_flags.go similarity index 98% rename from pkg/kn/commands/broker/delivery_option_flags.go rename to pkg/commands/broker/delivery_option_flags.go index e9c21dea3..b817a3886 100644 --- a/pkg/kn/commands/broker/delivery_option_flags.go +++ b/pkg/commands/broker/delivery_option_flags.go @@ -18,8 +18,8 @@ import ( "reflect" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands/flags" duckv1 "knative.dev/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/broker/describe.go b/pkg/commands/broker/describe.go similarity index 98% rename from pkg/kn/commands/broker/describe.go rename to pkg/commands/broker/describe.go index 31b2d7273..845a390b6 100644 --- a/pkg/kn/commands/broker/describe.go +++ b/pkg/commands/broker/describe.go @@ -28,7 +28,7 @@ import ( v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/broker/describe_test.go b/pkg/commands/broker/describe_test.go similarity index 100% rename from pkg/kn/commands/broker/describe_test.go rename to pkg/commands/broker/describe_test.go diff --git a/pkg/kn/commands/broker/list.go b/pkg/commands/broker/list.go similarity index 98% rename from pkg/kn/commands/broker/list.go rename to pkg/commands/broker/list.go index 438829be8..9182dcd92 100644 --- a/pkg/kn/commands/broker/list.go +++ b/pkg/commands/broker/list.go @@ -26,8 +26,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/list_test.go b/pkg/commands/broker/list_test.go similarity index 100% rename from pkg/kn/commands/broker/list_test.go rename to pkg/commands/broker/list_test.go diff --git a/pkg/kn/commands/broker/update.go b/pkg/commands/broker/update.go similarity index 98% rename from pkg/kn/commands/broker/update.go rename to pkg/commands/broker/update.go index d81ae25cd..22c86632f 100644 --- a/pkg/kn/commands/broker/update.go +++ b/pkg/commands/broker/update.go @@ -25,7 +25,7 @@ import ( v1 "knative.dev/client/pkg/eventing/v1" duckv1 "knative.dev/eventing/pkg/apis/duck/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/update_test.go b/pkg/commands/broker/update_test.go similarity index 100% rename from pkg/kn/commands/broker/update_test.go rename to pkg/commands/broker/update_test.go diff --git a/pkg/kn/commands/channel/channel.go b/pkg/commands/channel/channel.go similarity index 98% rename from pkg/kn/commands/channel/channel.go rename to pkg/commands/channel/channel.go index 0a412d361..930db1202 100644 --- a/pkg/kn/commands/channel/channel.go +++ b/pkg/commands/channel/channel.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" messagingv1 "knative.dev/client/pkg/messaging/v1" clientv1beta1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1" ) diff --git a/pkg/kn/commands/channel/channel_test.go b/pkg/commands/channel/channel_test.go similarity index 98% rename from pkg/kn/commands/channel/channel_test.go rename to pkg/commands/channel/channel_test.go index faefb3608..e6e85d48a 100644 --- a/pkg/kn/commands/channel/channel_test.go +++ b/pkg/commands/channel/channel_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/tools/clientcmd" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/messaging/v1" eventingduck "knative.dev/eventing/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/channel/create.go b/pkg/commands/channel/create.go similarity index 96% rename from pkg/kn/commands/channel/create.go rename to pkg/commands/channel/create.go index 048958895..6a7e11c90 100644 --- a/pkg/kn/commands/channel/create.go +++ b/pkg/commands/channel/create.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/channel/create_test.go b/pkg/commands/channel/create_test.go similarity index 100% rename from pkg/kn/commands/channel/create_test.go rename to pkg/commands/channel/create_test.go diff --git a/pkg/kn/commands/channel/delete.go b/pkg/commands/channel/delete.go similarity index 97% rename from pkg/kn/commands/channel/delete.go rename to pkg/commands/channel/delete.go index ebb3eb5d2..11cfda423 100644 --- a/pkg/kn/commands/channel/delete.go +++ b/pkg/commands/channel/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewChannelDeleteCommand is for deleting a Channel diff --git a/pkg/kn/commands/channel/delete_test.go b/pkg/commands/channel/delete_test.go similarity index 100% rename from pkg/kn/commands/channel/delete_test.go rename to pkg/commands/channel/delete_test.go diff --git a/pkg/kn/commands/channel/describe.go b/pkg/commands/channel/describe.go similarity index 98% rename from pkg/kn/commands/channel/describe.go rename to pkg/commands/channel/describe.go index 38e03cdab..e5b8b4331 100644 --- a/pkg/kn/commands/channel/describe.go +++ b/pkg/commands/channel/describe.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/channel/describe_test.go b/pkg/commands/channel/describe_test.go similarity index 100% rename from pkg/kn/commands/channel/describe_test.go rename to pkg/commands/channel/describe_test.go diff --git a/pkg/kn/commands/channel/flags.go b/pkg/commands/channel/flags.go similarity index 99% rename from pkg/kn/commands/channel/flags.go rename to pkg/commands/channel/flags.go index d5673ee60..668879944 100644 --- a/pkg/kn/commands/channel/flags.go +++ b/pkg/commands/channel/flags.go @@ -22,7 +22,7 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" hprinters "knative.dev/client/pkg/printers" diff --git a/pkg/kn/commands/channel/list.go b/pkg/commands/channel/list.go similarity index 96% rename from pkg/kn/commands/channel/list.go rename to pkg/commands/channel/list.go index ab8137179..a87c66805 100644 --- a/pkg/kn/commands/channel/list.go +++ b/pkg/commands/channel/list.go @@ -21,8 +21,8 @@ import ( messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/eventing/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/kn/commands/channel/list_test.go b/pkg/commands/channel/list_test.go similarity index 100% rename from pkg/kn/commands/channel/list_test.go rename to pkg/commands/channel/list_test.go diff --git a/pkg/kn/commands/channel/list_types.go b/pkg/commands/channel/list_types.go similarity index 97% rename from pkg/kn/commands/channel/list_types.go rename to pkg/commands/channel/list_types.go index 944504224..864fdc6f3 100644 --- a/pkg/kn/commands/channel/list_types.go +++ b/pkg/commands/channel/list_types.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" messagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/channel/list_types_test.go b/pkg/commands/channel/list_types_test.go similarity index 99% rename from pkg/kn/commands/channel/list_types_test.go rename to pkg/commands/channel/list_types_test.go index 49d4e055d..4edc75c27 100644 --- a/pkg/kn/commands/channel/list_types_test.go +++ b/pkg/commands/channel/list_types_test.go @@ -29,8 +29,8 @@ import ( dynamicfakeClient "knative.dev/client/pkg/dynamic/fake" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/util" "knative.dev/eventing/pkg/apis/messaging" ) diff --git a/pkg/kn/commands/completion/completion.go b/pkg/commands/completion/completion.go similarity index 98% rename from pkg/kn/commands/completion/completion.go rename to pkg/commands/completion/completion.go index 39b6b18c4..a731eb0c9 100644 --- a/pkg/kn/commands/completion/completion.go +++ b/pkg/commands/completion/completion.go @@ -18,7 +18,7 @@ import ( "errors" "os" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "github.com/spf13/cobra" ) diff --git a/pkg/kn/commands/completion/completion_test.go b/pkg/commands/completion/completion_test.go similarity index 98% rename from pkg/kn/commands/completion/completion_test.go rename to pkg/commands/completion/completion_test.go index 495f75d99..84ba92d4e 100644 --- a/pkg/kn/commands/completion/completion_test.go +++ b/pkg/commands/completion/completion_test.go @@ -18,7 +18,7 @@ import ( "testing" "knative.dev/client/lib/test" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "github.com/spf13/cobra" diff --git a/pkg/kn/commands/completion_helper.go b/pkg/commands/completion_helper.go similarity index 100% rename from pkg/kn/commands/completion_helper.go rename to pkg/commands/completion_helper.go diff --git a/pkg/kn/commands/completion_helper_test.go b/pkg/commands/completion_helper_test.go similarity index 100% rename from pkg/kn/commands/completion_helper_test.go rename to pkg/commands/completion_helper_test.go diff --git a/pkg/kn/commands/container/add.go b/pkg/commands/container/add.go similarity index 97% rename from pkg/kn/commands/container/add.go rename to pkg/commands/container/add.go index 06a05f5c1..eb7a7bb3c 100644 --- a/pkg/kn/commands/container/add.go +++ b/pkg/commands/container/add.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" sigyaml "sigs.k8s.io/yaml" ) diff --git a/pkg/kn/commands/container/add_test.go b/pkg/commands/container/add_test.go similarity index 100% rename from pkg/kn/commands/container/add_test.go rename to pkg/commands/container/add_test.go diff --git a/pkg/kn/commands/container/container.go b/pkg/commands/container/container.go similarity index 96% rename from pkg/kn/commands/container/container.go rename to pkg/commands/container/container.go index 4745ddab7..ca38a6caa 100644 --- a/pkg/kn/commands/container/container.go +++ b/pkg/commands/container/container.go @@ -16,7 +16,7 @@ package container import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewContainerCommand to manage containers diff --git a/pkg/kn/commands/container/container_test.go b/pkg/commands/container/container_test.go similarity index 97% rename from pkg/kn/commands/container/container_test.go rename to pkg/commands/container/container_test.go index fd79c8ef1..f22ef8706 100644 --- a/pkg/kn/commands/container/container_test.go +++ b/pkg/commands/container/container_test.go @@ -19,7 +19,7 @@ import ( "testing" "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func TestContainerCommand(t *testing.T) { diff --git a/pkg/kn/commands/describe.go b/pkg/commands/describe.go similarity index 100% rename from pkg/kn/commands/describe.go rename to pkg/commands/describe.go diff --git a/pkg/kn/commands/describe_test.go b/pkg/commands/describe_test.go similarity index 100% rename from pkg/kn/commands/describe_test.go rename to pkg/commands/describe_test.go diff --git a/pkg/kn/commands/domain/create.go b/pkg/commands/domain/create.go similarity index 98% rename from pkg/kn/commands/domain/create.go rename to pkg/commands/domain/create.go index 181775e76..828ca2b50 100644 --- a/pkg/kn/commands/domain/create.go +++ b/pkg/commands/domain/create.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/util/validation" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" clientv1beta1 "knative.dev/client/pkg/serving/v1beta1" ) diff --git a/pkg/kn/commands/domain/create_test.go b/pkg/commands/domain/create_test.go similarity index 100% rename from pkg/kn/commands/domain/create_test.go rename to pkg/commands/domain/create_test.go diff --git a/pkg/kn/commands/domain/delete.go b/pkg/commands/domain/delete.go similarity index 97% rename from pkg/kn/commands/domain/delete.go rename to pkg/commands/domain/delete.go index 6d0e65e5b..f308f8c8a 100644 --- a/pkg/kn/commands/domain/delete.go +++ b/pkg/commands/domain/delete.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" ) // NewDomainMappingDeleteCommand to create event channels diff --git a/pkg/kn/commands/domain/delete_test.go b/pkg/commands/domain/delete_test.go similarity index 100% rename from pkg/kn/commands/domain/delete_test.go rename to pkg/commands/domain/delete_test.go diff --git a/pkg/kn/commands/domain/describe.go b/pkg/commands/domain/describe.go similarity index 98% rename from pkg/kn/commands/domain/describe.go rename to pkg/commands/domain/describe.go index 5ebc051e9..1baa49753 100644 --- a/pkg/kn/commands/domain/describe.go +++ b/pkg/commands/domain/describe.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" "knative.dev/serving/pkg/apis/serving/v1beta1" ) diff --git a/pkg/kn/commands/domain/describe_test.go b/pkg/commands/domain/describe_test.go similarity index 100% rename from pkg/kn/commands/domain/describe_test.go rename to pkg/commands/domain/describe_test.go diff --git a/pkg/kn/commands/domain/domain.go b/pkg/commands/domain/domain.go similarity index 98% rename from pkg/kn/commands/domain/domain.go rename to pkg/commands/domain/domain.go index 280b590aa..3c179cb01 100644 --- a/pkg/kn/commands/domain/domain.go +++ b/pkg/commands/domain/domain.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" duckv1 "knative.dev/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/domain/domain_test.go b/pkg/commands/domain/domain_test.go similarity index 98% rename from pkg/kn/commands/domain/domain_test.go rename to pkg/commands/domain/domain_test.go index 9a246627f..3041b7fdd 100644 --- a/pkg/kn/commands/domain/domain_test.go +++ b/pkg/commands/domain/domain_test.go @@ -26,10 +26,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/clientcmd" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" dynamicfake "knative.dev/client/pkg/dynamic/fake" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" clientservingv1beta1 "knative.dev/client/pkg/serving/v1beta1" duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/domain/human_readable_flags.go b/pkg/commands/domain/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/domain/human_readable_flags.go rename to pkg/commands/domain/human_readable_flags.go index 9cba66b4c..ae9e6fb31 100644 --- a/pkg/kn/commands/domain/human_readable_flags.go +++ b/pkg/commands/domain/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "knative.dev/serving/pkg/apis/serving/v1beta1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/domain/list.go b/pkg/commands/domain/list.go similarity index 95% rename from pkg/kn/commands/domain/list.go rename to pkg/commands/domain/list.go index e6dbb99f5..aebce9dc6 100644 --- a/pkg/kn/commands/domain/list.go +++ b/pkg/commands/domain/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewDomainMappingListCommand represents 'kn revision list' command diff --git a/pkg/kn/commands/domain/list_test.go b/pkg/commands/domain/list_test.go similarity index 100% rename from pkg/kn/commands/domain/list_test.go rename to pkg/commands/domain/list_test.go diff --git a/pkg/kn/commands/domain/update.go b/pkg/commands/domain/update.go similarity index 98% rename from pkg/kn/commands/domain/update.go rename to pkg/commands/domain/update.go index 52b0e8ade..5e244b34b 100644 --- a/pkg/kn/commands/domain/update.go +++ b/pkg/commands/domain/update.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" ) // NewDomainMappingUpdateCommand to create event channels diff --git a/pkg/kn/commands/domain/update_test.go b/pkg/commands/domain/update_test.go similarity index 100% rename from pkg/kn/commands/domain/update_test.go rename to pkg/commands/domain/update_test.go diff --git a/pkg/kn/commands/eventtype/create.go b/pkg/commands/eventtype/create.go similarity index 97% rename from pkg/kn/commands/eventtype/create.go rename to pkg/commands/eventtype/create.go index 7c8d557a6..bfbebe26f 100644 --- a/pkg/kn/commands/eventtype/create.go +++ b/pkg/commands/eventtype/create.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/commands/flags" clienteventingv1beta2 "knative.dev/client/pkg/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/commands/flags" "knative.dev/pkg/apis" ) diff --git a/pkg/kn/commands/eventtype/create_test.go b/pkg/commands/eventtype/create_test.go similarity index 100% rename from pkg/kn/commands/eventtype/create_test.go rename to pkg/commands/eventtype/create_test.go diff --git a/pkg/kn/commands/eventtype/delete.go b/pkg/commands/eventtype/delete.go similarity index 98% rename from pkg/kn/commands/eventtype/delete.go rename to pkg/commands/eventtype/delete.go index 72c8b19eb..d247318c8 100644 --- a/pkg/kn/commands/eventtype/delete.go +++ b/pkg/commands/eventtype/delete.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var deleteExample = ` diff --git a/pkg/kn/commands/eventtype/delete_test.go b/pkg/commands/eventtype/delete_test.go similarity index 100% rename from pkg/kn/commands/eventtype/delete_test.go rename to pkg/commands/eventtype/delete_test.go diff --git a/pkg/kn/commands/eventtype/describe.go b/pkg/commands/eventtype/describe.go similarity index 98% rename from pkg/kn/commands/eventtype/describe.go rename to pkg/commands/eventtype/describe.go index 4e292933f..6d89fdb01 100644 --- a/pkg/kn/commands/eventtype/describe.go +++ b/pkg/commands/eventtype/describe.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/eventing/pkg/apis/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/eventtype/describe_test.go b/pkg/commands/eventtype/describe_test.go similarity index 100% rename from pkg/kn/commands/eventtype/describe_test.go rename to pkg/commands/eventtype/describe_test.go diff --git a/pkg/kn/commands/eventtype/eventtype.go b/pkg/commands/eventtype/eventtype.go similarity index 97% rename from pkg/kn/commands/eventtype/eventtype.go rename to pkg/commands/eventtype/eventtype.go index 6e6b75fd2..56c2fbeb8 100644 --- a/pkg/kn/commands/eventtype/eventtype.go +++ b/pkg/commands/eventtype/eventtype.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewEventTypeCommand represents event type management commands diff --git a/pkg/kn/commands/eventtype/eventtype_test.go b/pkg/commands/eventtype/eventtype_test.go similarity index 98% rename from pkg/kn/commands/eventtype/eventtype_test.go rename to pkg/commands/eventtype/eventtype_test.go index f4a44be85..127821d2f 100644 --- a/pkg/kn/commands/eventtype/eventtype_test.go +++ b/pkg/commands/eventtype/eventtype_test.go @@ -22,8 +22,8 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" "k8s.io/client-go/tools/clientcmd" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2" "knative.dev/pkg/apis" ) diff --git a/pkg/kn/commands/eventtype/list.go b/pkg/commands/eventtype/list.go similarity index 98% rename from pkg/kn/commands/eventtype/list.go rename to pkg/commands/eventtype/list.go index 53da78e53..e51c93bd3 100644 --- a/pkg/kn/commands/eventtype/list.go +++ b/pkg/commands/eventtype/list.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2" ) diff --git a/pkg/kn/commands/eventtype/list_test.go b/pkg/commands/eventtype/list_test.go similarity index 100% rename from pkg/kn/commands/eventtype/list_test.go rename to pkg/commands/eventtype/list_test.go diff --git a/pkg/kn/commands/flags/eventtype.go b/pkg/commands/flags/eventtype.go similarity index 100% rename from pkg/kn/commands/flags/eventtype.go rename to pkg/commands/flags/eventtype.go diff --git a/pkg/kn/commands/flags/eventtype_test.go b/pkg/commands/flags/eventtype_test.go similarity index 100% rename from pkg/kn/commands/flags/eventtype_test.go rename to pkg/commands/flags/eventtype_test.go diff --git a/pkg/kn/commands/flags/listfilters.go b/pkg/commands/flags/listfilters.go similarity index 100% rename from pkg/kn/commands/flags/listfilters.go rename to pkg/commands/flags/listfilters.go diff --git a/pkg/kn/commands/flags/listfilters_test.go b/pkg/commands/flags/listfilters_test.go similarity index 100% rename from pkg/kn/commands/flags/listfilters_test.go rename to pkg/commands/flags/listfilters_test.go diff --git a/pkg/kn/commands/flags/listprint.go b/pkg/commands/flags/listprint.go similarity index 98% rename from pkg/kn/commands/flags/listprint.go rename to pkg/commands/flags/listprint.go index da73381c0..ae1337eb2 100644 --- a/pkg/kn/commands/flags/listprint.go +++ b/pkg/commands/flags/listprint.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/flags/listprint_test.go b/pkg/commands/flags/listprint_test.go similarity index 100% rename from pkg/kn/commands/flags/listprint_test.go rename to pkg/commands/flags/listprint_test.go diff --git a/pkg/kn/commands/flags/sink.go b/pkg/commands/flags/sink.go similarity index 99% rename from pkg/kn/commands/flags/sink.go rename to pkg/commands/flags/sink.go index 5bcd4254a..cb03edc46 100644 --- a/pkg/kn/commands/flags/sink.go +++ b/pkg/commands/flags/sink.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/config" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/config" ) type SinkFlags struct { diff --git a/pkg/kn/commands/flags/sink_test.go b/pkg/commands/flags/sink_test.go similarity index 100% rename from pkg/kn/commands/flags/sink_test.go rename to pkg/commands/flags/sink_test.go diff --git a/pkg/kn/commands/flags/traffic.go b/pkg/commands/flags/traffic.go similarity index 100% rename from pkg/kn/commands/flags/traffic.go rename to pkg/commands/flags/traffic.go diff --git a/pkg/kn/commands/flags/traffic_test.go b/pkg/commands/flags/traffic_test.go similarity index 100% rename from pkg/kn/commands/flags/traffic_test.go rename to pkg/commands/flags/traffic_test.go diff --git a/pkg/kn/commands/human_readable_flags.go b/pkg/commands/human_readable_flags.go similarity index 100% rename from pkg/kn/commands/human_readable_flags.go rename to pkg/commands/human_readable_flags.go diff --git a/pkg/kn/commands/human_readable_flags_test.go b/pkg/commands/human_readable_flags_test.go similarity index 100% rename from pkg/kn/commands/human_readable_flags_test.go rename to pkg/commands/human_readable_flags_test.go diff --git a/pkg/kn/commands/namespaced.go b/pkg/commands/namespaced.go similarity index 100% rename from pkg/kn/commands/namespaced.go rename to pkg/commands/namespaced.go diff --git a/pkg/kn/commands/namespaced_test.go b/pkg/commands/namespaced_test.go similarity index 100% rename from pkg/kn/commands/namespaced_test.go rename to pkg/commands/namespaced_test.go diff --git a/pkg/kn/commands/options/options.go b/pkg/commands/options/options.go similarity index 100% rename from pkg/kn/commands/options/options.go rename to pkg/commands/options/options.go diff --git a/pkg/kn/commands/plugin/list.go b/pkg/commands/plugin/list.go similarity index 97% rename from pkg/kn/commands/plugin/list.go rename to pkg/commands/plugin/list.go index a97ca5d88..d6d31ed3e 100644 --- a/pkg/kn/commands/plugin/list.go +++ b/pkg/commands/plugin/list.go @@ -20,10 +20,10 @@ import ( "strings" "github.com/spf13/cobra" + "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/plugin" ) // ValidPluginFilenamePrefixes controls the prefix for all kn plugins diff --git a/pkg/kn/commands/plugin/list_test.go b/pkg/commands/plugin/list_test.go similarity index 95% rename from pkg/kn/commands/plugin/list_test.go rename to pkg/commands/plugin/list_test.go index 9d6fdba5b..b003a466f 100644 --- a/pkg/kn/commands/plugin/list_test.go +++ b/pkg/commands/plugin/list_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/commands" + config2 "knative.dev/client/pkg/config" "knative.dev/client/pkg/util" "github.com/spf13/cobra" @@ -135,8 +135,8 @@ func prepareTestSetup(t *testing.T, args ...interface{}) (string, func()) { tmpPathDir := t.TempDir() // Prepare configuration to for our test - oldConfig := config.GlobalConfig - config.GlobalConfig = &config.TestConfig{ + oldConfig := config2.GlobalConfig + config2.GlobalConfig = &config2.TestConfig{ TestPluginsDir: tmpPathDir, TestLookupPluginsInPath: false, } @@ -148,7 +148,7 @@ func prepareTestSetup(t *testing.T, args ...interface{}) (string, func()) { } return tmpPathDir, func() { - config.GlobalConfig = oldConfig + config2.GlobalConfig = oldConfig } } diff --git a/pkg/kn/commands/plugin/plugin.go b/pkg/commands/plugin/plugin.go similarity index 96% rename from pkg/kn/commands/plugin/plugin.go rename to pkg/commands/plugin/plugin.go index 155023fe9..d79c4d535 100644 --- a/pkg/kn/commands/plugin/plugin.go +++ b/pkg/commands/plugin/plugin.go @@ -17,7 +17,7 @@ package plugin import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewPluginCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/plugin/plugin_test.go b/pkg/commands/plugin/plugin_test.go similarity index 96% rename from pkg/kn/commands/plugin/plugin_test.go rename to pkg/commands/plugin/plugin_test.go index 2a23d7a24..417a34e99 100644 --- a/pkg/kn/commands/plugin/plugin_test.go +++ b/pkg/commands/plugin/plugin_test.go @@ -19,7 +19,7 @@ import ( "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/delete.go b/pkg/commands/revision/delete.go similarity index 99% rename from pkg/kn/commands/revision/delete.go rename to pkg/commands/revision/delete.go index db9b6c998..59ec54884 100644 --- a/pkg/kn/commands/revision/delete.go +++ b/pkg/commands/revision/delete.go @@ -22,7 +22,7 @@ import ( "time" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/serving/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" ) diff --git a/pkg/kn/commands/revision/delete_mock_test.go b/pkg/commands/revision/delete_mock_test.go similarity index 100% rename from pkg/kn/commands/revision/delete_mock_test.go rename to pkg/commands/revision/delete_mock_test.go diff --git a/pkg/kn/commands/revision/delete_test.go b/pkg/commands/revision/delete_test.go similarity index 98% rename from pkg/kn/commands/revision/delete_test.go rename to pkg/commands/revision/delete_test.go index d6ab73c5e..8ef85825b 100644 --- a/pkg/kn/commands/revision/delete_test.go +++ b/pkg/commands/revision/delete_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/revision/describe.go b/pkg/commands/revision/describe.go similarity index 99% rename from pkg/kn/commands/revision/describe.go rename to pkg/commands/revision/describe.go index 8c8acab0d..679485f08 100644 --- a/pkg/kn/commands/revision/describe.go +++ b/pkg/commands/revision/describe.go @@ -28,7 +28,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" clientserving "knative.dev/client/pkg/serving" ) diff --git a/pkg/kn/commands/revision/describe_test.go b/pkg/commands/revision/describe_test.go similarity index 99% rename from pkg/kn/commands/revision/describe_test.go rename to pkg/commands/revision/describe_test.go index bb09ff964..371f373b9 100644 --- a/pkg/kn/commands/revision/describe_test.go +++ b/pkg/commands/revision/describe_test.go @@ -34,7 +34,7 @@ import ( servingv1 "knative.dev/serving/pkg/apis/serving/v1" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/human_readable_flags.go b/pkg/commands/revision/human_readable_flags.go similarity index 99% rename from pkg/kn/commands/revision/human_readable_flags.go rename to pkg/commands/revision/human_readable_flags.go index 081279b9c..981e0b9fb 100644 --- a/pkg/kn/commands/revision/human_readable_flags.go +++ b/pkg/commands/revision/human_readable_flags.go @@ -20,7 +20,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/revision/list.go b/pkg/commands/revision/list.go similarity index 98% rename from pkg/kn/commands/revision/list.go rename to pkg/commands/revision/list.go index 2f818b73f..eace7c810 100644 --- a/pkg/kn/commands/revision/list.go +++ b/pkg/commands/revision/list.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/revision/list_test.go b/pkg/commands/revision/list_test.go similarity index 99% rename from pkg/kn/commands/revision/list_test.go rename to pkg/commands/revision/list_test.go index 647baec9f..d0fd57db0 100644 --- a/pkg/kn/commands/revision/list_test.go +++ b/pkg/commands/revision/list_test.go @@ -25,7 +25,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/revision.go b/pkg/commands/revision/revision.go similarity index 97% rename from pkg/kn/commands/revision/revision.go rename to pkg/commands/revision/revision.go index 6b8bac064..a344666b8 100644 --- a/pkg/kn/commands/revision/revision.go +++ b/pkg/commands/revision/revision.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewRevisionCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/revision/revision_test.go b/pkg/commands/revision/revision_test.go similarity index 97% rename from pkg/kn/commands/revision/revision_test.go rename to pkg/commands/revision/revision_test.go index 3bf77b6bc..7c4efad60 100644 --- a/pkg/kn/commands/revision/revision_test.go +++ b/pkg/commands/revision/revision_test.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" "gotest.tools/v3/assert" "k8s.io/client-go/tools/clientcmd" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/route/describe.go b/pkg/commands/route/describe.go similarity index 98% rename from pkg/kn/commands/route/describe.go rename to pkg/commands/route/describe.go index 3064350cd..3cd3f3773 100644 --- a/pkg/kn/commands/route/describe.go +++ b/pkg/commands/route/describe.go @@ -23,7 +23,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/route/describe_test.go b/pkg/commands/route/describe_test.go similarity index 99% rename from pkg/kn/commands/route/describe_test.go rename to pkg/commands/route/describe_test.go index c26e9fbaa..a496b2bc5 100644 --- a/pkg/kn/commands/route/describe_test.go +++ b/pkg/commands/route/describe_test.go @@ -27,7 +27,7 @@ import ( servingv1 "knative.dev/serving/pkg/apis/serving/v1" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/pkg/ptr" ) diff --git a/pkg/kn/commands/route/human_readable_flags.go b/pkg/commands/route/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/route/human_readable_flags.go rename to pkg/commands/route/human_readable_flags.go index f366f9580..b114dea86 100644 --- a/pkg/kn/commands/route/human_readable_flags.go +++ b/pkg/commands/route/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/route/list.go b/pkg/commands/route/list.go similarity index 96% rename from pkg/kn/commands/route/list.go rename to pkg/commands/route/list.go index 2e4089634..c4d88667f 100644 --- a/pkg/kn/commands/route/list.go +++ b/pkg/commands/route/list.go @@ -18,13 +18,13 @@ import ( "errors" "fmt" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) // NewrouteListCommand represents 'kn route list' command diff --git a/pkg/kn/commands/route/list_test.go b/pkg/commands/route/list_test.go similarity index 99% rename from pkg/kn/commands/route/list_test.go rename to pkg/commands/route/list_test.go index de87b6956..0c319fae1 100644 --- a/pkg/kn/commands/route/list_test.go +++ b/pkg/commands/route/list_test.go @@ -25,7 +25,7 @@ import ( "knative.dev/pkg/ptr" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/route/route.go b/pkg/commands/route/route.go similarity index 96% rename from pkg/kn/commands/route/route.go rename to pkg/commands/route/route.go index e2d855696..ad84683cd 100644 --- a/pkg/kn/commands/route/route.go +++ b/pkg/commands/route/route.go @@ -17,7 +17,7 @@ package route import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewRouteCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/create.go b/pkg/commands/secret/create.go similarity index 98% rename from pkg/kn/commands/secret/create.go rename to pkg/commands/secret/create.go index 7bd2abb85..a3d498380 100644 --- a/pkg/kn/commands/secret/create.go +++ b/pkg/commands/secret/create.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/client/pkg/util" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretCreateCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/create_test.go b/pkg/commands/secret/create_test.go similarity index 100% rename from pkg/kn/commands/secret/create_test.go rename to pkg/commands/secret/create_test.go diff --git a/pkg/kn/commands/secret/delete.go b/pkg/commands/secret/delete.go similarity index 97% rename from pkg/kn/commands/secret/delete.go rename to pkg/commands/secret/delete.go index 4d9de0183..43d44497d 100644 --- a/pkg/kn/commands/secret/delete.go +++ b/pkg/commands/secret/delete.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretDeleteCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/delete_test.go b/pkg/commands/secret/delete_test.go similarity index 100% rename from pkg/kn/commands/secret/delete_test.go rename to pkg/commands/secret/delete_test.go diff --git a/pkg/kn/commands/secret/list.go b/pkg/commands/secret/list.go similarity index 97% rename from pkg/kn/commands/secret/list.go rename to pkg/commands/secret/list.go index 66e8fde37..aac2d1bc6 100644 --- a/pkg/kn/commands/secret/list.go +++ b/pkg/commands/secret/list.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretListCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/list_test.go b/pkg/commands/secret/list_test.go similarity index 100% rename from pkg/kn/commands/secret/list_test.go rename to pkg/commands/secret/list_test.go diff --git a/pkg/kn/commands/secret/secret.go b/pkg/commands/secret/secret.go similarity index 96% rename from pkg/kn/commands/secret/secret.go rename to pkg/commands/secret/secret.go index d1c6a9de4..120b73560 100644 --- a/pkg/kn/commands/secret/secret.go +++ b/pkg/commands/secret/secret.go @@ -16,7 +16,7 @@ package secret import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/secret_test.go b/pkg/commands/secret/secret_test.go similarity index 96% rename from pkg/kn/commands/secret/secret_test.go rename to pkg/commands/secret/secret_test.go index aa7ecce7e..61b51790c 100644 --- a/pkg/kn/commands/secret/secret_test.go +++ b/pkg/commands/secret/secret_test.go @@ -22,8 +22,8 @@ import ( "gotest.tools/v3/assert" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" ) // Helper methods diff --git a/pkg/kn/commands/service/apply.go b/pkg/commands/service/apply.go similarity index 99% rename from pkg/kn/commands/service/apply.go rename to pkg/commands/service/apply.go index f0771bf1d..07dd5401d 100644 --- a/pkg/kn/commands/service/apply.go +++ b/pkg/commands/service/apply.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/apply_mock_test.go b/pkg/commands/service/apply_mock_test.go similarity index 100% rename from pkg/kn/commands/service/apply_mock_test.go rename to pkg/commands/service/apply_mock_test.go diff --git a/pkg/kn/commands/service/configuration_edit_flags.go b/pkg/commands/service/configuration_edit_flags.go similarity index 99% rename from pkg/kn/commands/service/configuration_edit_flags.go rename to pkg/commands/service/configuration_edit_flags.go index d4d7a45d6..ea23e771f 100644 --- a/pkg/kn/commands/service/configuration_edit_flags.go +++ b/pkg/commands/service/configuration_edit_flags.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + knconfig "knative.dev/client/pkg/config" "knative.dev/serving/pkg/apis/config" - knconfig "knative.dev/client/pkg/kn/config" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" servinglib "knative.dev/client/pkg/serving" "knative.dev/client/pkg/util" network "knative.dev/networking/pkg/apis/networking" diff --git a/pkg/kn/commands/service/configuration_edit_flags_test.go b/pkg/commands/service/configuration_edit_flags_test.go similarity index 98% rename from pkg/kn/commands/service/configuration_edit_flags_test.go rename to pkg/commands/service/configuration_edit_flags_test.go index 4955fcc94..b23728226 100644 --- a/pkg/kn/commands/service/configuration_edit_flags_test.go +++ b/pkg/commands/service/configuration_edit_flags_test.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/viper" "gotest.tools/v3/assert" + "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/serving/pkg/apis/autoscaling" ) diff --git a/pkg/kn/commands/service/create.go b/pkg/commands/service/create.go similarity index 99% rename from pkg/kn/commands/service/create.go rename to pkg/commands/service/create.go index 0657c2c54..2c217726a 100644 --- a/pkg/kn/commands/service/create.go +++ b/pkg/commands/service/create.go @@ -22,11 +22,11 @@ import ( "os" "time" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/traffic" servinglib "knative.dev/client/pkg/serving" + "knative.dev/client/pkg/traffic" "knative.dev/serving/pkg/apis/serving" diff --git a/pkg/kn/commands/service/create_mock_test.go b/pkg/commands/service/create_mock_test.go similarity index 100% rename from pkg/kn/commands/service/create_mock_test.go rename to pkg/commands/service/create_mock_test.go diff --git a/pkg/kn/commands/service/create_test.go b/pkg/commands/service/create_test.go similarity index 99% rename from pkg/kn/commands/service/create_test.go rename to pkg/commands/service/create_test.go index 97bd28123..48166bdc9 100644 --- a/pkg/kn/commands/service/create_test.go +++ b/pkg/commands/service/create_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" network "knative.dev/networking/pkg/apis/networking" diff --git a/pkg/kn/commands/service/delete.go b/pkg/commands/service/delete.go similarity index 98% rename from pkg/kn/commands/service/delete.go rename to pkg/commands/service/delete.go index d7524f167..f079f0699 100644 --- a/pkg/kn/commands/service/delete.go +++ b/pkg/commands/service/delete.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/delete_mock_test.go b/pkg/commands/service/delete_mock_test.go similarity index 100% rename from pkg/kn/commands/service/delete_mock_test.go rename to pkg/commands/service/delete_mock_test.go diff --git a/pkg/kn/commands/service/delete_test.go b/pkg/commands/service/delete_test.go similarity index 98% rename from pkg/kn/commands/service/delete_test.go rename to pkg/commands/service/delete_test.go index 7bf6d77ca..5d261196c 100644 --- a/pkg/kn/commands/service/delete_test.go +++ b/pkg/commands/service/delete_test.go @@ -25,7 +25,7 @@ import ( client_testing "k8s.io/client-go/testing" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" ) diff --git a/pkg/kn/commands/service/describe.go b/pkg/commands/service/describe.go similarity index 99% rename from pkg/kn/commands/service/describe.go rename to pkg/commands/service/describe.go index dc438ef41..948ba7aa3 100644 --- a/pkg/kn/commands/service/describe.go +++ b/pkg/commands/service/describe.go @@ -27,8 +27,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/serving/pkg/apis/serving" - "knative.dev/client/pkg/kn/commands/revision" - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/commands/revision" + "knative.dev/client/pkg/plugin" "knative.dev/client/pkg/printers" clientservingv1 "knative.dev/client/pkg/serving/v1" @@ -37,7 +37,7 @@ import ( "knative.dev/pkg/apis" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // Command for printing out a description of a service, meant to be consumed by humans diff --git a/pkg/kn/commands/service/describe_test.go b/pkg/commands/service/describe_test.go similarity index 100% rename from pkg/kn/commands/service/describe_test.go rename to pkg/commands/service/describe_test.go diff --git a/pkg/kn/commands/service/export.go b/pkg/commands/service/export.go similarity index 99% rename from pkg/kn/commands/service/export.go rename to pkg/commands/service/export.go index 570da9961..fb653cc15 100644 --- a/pkg/kn/commands/service/export.go +++ b/pkg/commands/service/export.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/printers" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/service/export_test.go b/pkg/commands/service/export_test.go similarity index 100% rename from pkg/kn/commands/service/export_test.go rename to pkg/commands/service/export_test.go diff --git a/pkg/kn/commands/service/human_readable_flags.go b/pkg/commands/service/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/service/human_readable_flags.go rename to pkg/commands/service/human_readable_flags.go index a4e2a8fb7..3727fad41 100644 --- a/pkg/kn/commands/service/human_readable_flags.go +++ b/pkg/commands/service/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/service/import.go b/pkg/commands/service/import.go similarity index 99% rename from pkg/kn/commands/service/import.go rename to pkg/commands/service/import.go index 64fac8790..283765f12 100644 --- a/pkg/kn/commands/service/import.go +++ b/pkg/commands/service/import.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/util/retry" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/pkg/kmeta" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/service/import_test.go b/pkg/commands/service/import_test.go similarity index 100% rename from pkg/kn/commands/service/import_test.go rename to pkg/commands/service/import_test.go diff --git a/pkg/kn/commands/service/list.go b/pkg/commands/service/list.go similarity index 97% rename from pkg/kn/commands/service/list.go rename to pkg/commands/service/list.go index 1212a0db5..1a6d38253 100644 --- a/pkg/kn/commands/service/list.go +++ b/pkg/commands/service/list.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/list_mock_test.go b/pkg/commands/service/list_mock_test.go similarity index 100% rename from pkg/kn/commands/service/list_mock_test.go rename to pkg/commands/service/list_mock_test.go diff --git a/pkg/kn/commands/service/list_test.go b/pkg/commands/service/list_test.go similarity index 99% rename from pkg/kn/commands/service/list_test.go rename to pkg/commands/service/list_test.go index c74539ec0..a75bc70f9 100644 --- a/pkg/kn/commands/service/list_test.go +++ b/pkg/commands/service/list_test.go @@ -26,7 +26,7 @@ import ( "knative.dev/pkg/apis" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/service/service.go b/pkg/commands/service/service.go similarity index 98% rename from pkg/kn/commands/service/service.go rename to pkg/commands/service/service.go index 6b1afcdf3..1c98f86c7 100644 --- a/pkg/kn/commands/service/service.go +++ b/pkg/commands/service/service.go @@ -20,7 +20,7 @@ import ( "io" "time" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/client/pkg/wait" diff --git a/pkg/kn/commands/service/service_test.go b/pkg/commands/service/service_test.go similarity index 95% rename from pkg/kn/commands/service/service_test.go rename to pkg/commands/service/service_test.go index 6b57d4a74..57889fcef 100644 --- a/pkg/kn/commands/service/service_test.go +++ b/pkg/commands/service/service_test.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/service_update_mock_test.go b/pkg/commands/service/service_update_mock_test.go similarity index 100% rename from pkg/kn/commands/service/service_update_mock_test.go rename to pkg/commands/service/service_update_mock_test.go diff --git a/pkg/kn/commands/service/update.go b/pkg/commands/service/update.go similarity index 98% rename from pkg/kn/commands/service/update.go rename to pkg/commands/service/update.go index 5beefaf8d..292c785e2 100644 --- a/pkg/kn/commands/service/update.go +++ b/pkg/commands/service/update.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/traffic" + "knative.dev/client/pkg/commands/flags" + "knative.dev/client/pkg/traffic" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/update_test.go b/pkg/commands/service/update_test.go similarity index 99% rename from pkg/kn/commands/service/update_test.go rename to pkg/commands/service/update_test.go index 4a695fd69..9cc3df372 100644 --- a/pkg/kn/commands/service/update_test.go +++ b/pkg/commands/service/update_test.go @@ -28,7 +28,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" servinglib "knative.dev/client/pkg/serving" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" @@ -40,7 +40,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" ) diff --git a/pkg/kn/commands/service/wait.go b/pkg/commands/service/wait.go similarity index 98% rename from pkg/kn/commands/service/wait.go rename to pkg/commands/service/wait.go index 66b39b893..b41ceb1df 100644 --- a/pkg/kn/commands/service/wait.go +++ b/pkg/commands/service/wait.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/wait_test.go b/pkg/commands/service/wait_test.go similarity index 98% rename from pkg/kn/commands/service/wait_test.go rename to pkg/commands/service/wait_test.go index af340e4e0..227e0c188 100644 --- a/pkg/kn/commands/service/wait_test.go +++ b/pkg/commands/service/wait_test.go @@ -20,7 +20,7 @@ import ( "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/source/apiserver/apiserver.go b/pkg/commands/source/apiserver/apiserver.go similarity index 98% rename from pkg/kn/commands/source/apiserver/apiserver.go rename to pkg/commands/source/apiserver/apiserver.go index dba6af956..4d62e2745 100644 --- a/pkg/kn/commands/source/apiserver/apiserver.go +++ b/pkg/commands/source/apiserver/apiserver.go @@ -19,7 +19,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/apiserver/apiserver_test.go b/pkg/commands/source/apiserver/apiserver_test.go similarity index 98% rename from pkg/kn/commands/source/apiserver/apiserver_test.go rename to pkg/commands/source/apiserver/apiserver_test.go index b3586997a..b339fe741 100644 --- a/pkg/kn/commands/source/apiserver/apiserver_test.go +++ b/pkg/commands/source/apiserver/apiserver_test.go @@ -24,7 +24,7 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" clientv1 "knative.dev/client/pkg/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var blankConfig clientcmd.ClientConfig diff --git a/pkg/kn/commands/source/apiserver/create.go b/pkg/commands/source/apiserver/create.go similarity index 97% rename from pkg/kn/commands/source/apiserver/create.go rename to pkg/commands/source/apiserver/create.go index 3412866f3..568b3e241 100644 --- a/pkg/kn/commands/source/apiserver/create.go +++ b/pkg/commands/source/apiserver/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/apiserver/create_test.go b/pkg/commands/source/apiserver/create_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/create_test.go rename to pkg/commands/source/apiserver/create_test.go diff --git a/pkg/kn/commands/source/apiserver/delete.go b/pkg/commands/source/apiserver/delete.go similarity index 97% rename from pkg/kn/commands/source/apiserver/delete.go rename to pkg/commands/source/apiserver/delete.go index be7f2fb7f..b314f9703 100644 --- a/pkg/kn/commands/source/apiserver/delete.go +++ b/pkg/commands/source/apiserver/delete.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewAPIServerDeleteCommand for deleting source diff --git a/pkg/kn/commands/source/apiserver/delete_test.go b/pkg/commands/source/apiserver/delete_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/delete_test.go rename to pkg/commands/source/apiserver/delete_test.go diff --git a/pkg/kn/commands/source/apiserver/describe.go b/pkg/commands/source/apiserver/describe.go similarity index 99% rename from pkg/kn/commands/source/apiserver/describe.go rename to pkg/commands/source/apiserver/describe.go index ad692bc14..006dbbda4 100644 --- a/pkg/kn/commands/source/apiserver/describe.go +++ b/pkg/commands/source/apiserver/describe.go @@ -23,7 +23,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" v1 "knative.dev/eventing/pkg/apis/sources/v1" ) diff --git a/pkg/kn/commands/source/apiserver/describe_test.go b/pkg/commands/source/apiserver/describe_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/describe_test.go rename to pkg/commands/source/apiserver/describe_test.go diff --git a/pkg/kn/commands/source/apiserver/flags.go b/pkg/commands/source/apiserver/flags.go similarity index 99% rename from pkg/kn/commands/source/apiserver/flags.go rename to pkg/commands/source/apiserver/flags.go index f891d36ba..53aef7568 100644 --- a/pkg/kn/commands/source/apiserver/flags.go +++ b/pkg/commands/source/apiserver/flags.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/pkg/kn/commands/source/apiserver/flags_test.go b/pkg/commands/source/apiserver/flags_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/flags_test.go rename to pkg/commands/source/apiserver/flags_test.go diff --git a/pkg/kn/commands/source/apiserver/list.go b/pkg/commands/source/apiserver/list.go similarity index 95% rename from pkg/kn/commands/source/apiserver/list.go rename to pkg/commands/source/apiserver/list.go index edf701e7d..481939caa 100644 --- a/pkg/kn/commands/source/apiserver/list.go +++ b/pkg/commands/source/apiserver/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewAPIServerListCommand is for listing ApiServer source COs diff --git a/pkg/kn/commands/source/apiserver/list_test.go b/pkg/commands/source/apiserver/list_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/list_test.go rename to pkg/commands/source/apiserver/list_test.go diff --git a/pkg/kn/commands/source/apiserver/update.go b/pkg/commands/source/apiserver/update.go similarity index 97% rename from pkg/kn/commands/source/apiserver/update.go rename to pkg/commands/source/apiserver/update.go index f369a8aaf..873e1acd7 100644 --- a/pkg/kn/commands/source/apiserver/update.go +++ b/pkg/commands/source/apiserver/update.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/apiserver/update_test.go b/pkg/commands/source/apiserver/update_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/update_test.go rename to pkg/commands/source/apiserver/update_test.go diff --git a/pkg/kn/commands/source/binding/binding.go b/pkg/commands/source/binding/binding.go similarity index 98% rename from pkg/kn/commands/source/binding/binding.go rename to pkg/commands/source/binding/binding.go index 403ce143a..2361ac1e0 100644 --- a/pkg/kn/commands/source/binding/binding.go +++ b/pkg/commands/source/binding/binding.go @@ -22,7 +22,7 @@ import ( v1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" "knative.dev/pkg/tracker" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientsourcesv1alpha1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/binding/binding_test.go b/pkg/commands/source/binding/binding_test.go similarity index 98% rename from pkg/kn/commands/source/binding/binding_test.go rename to pkg/commands/source/binding/binding_test.go index d68105ba7..42d4f28cb 100644 --- a/pkg/kn/commands/source/binding/binding_test.go +++ b/pkg/commands/source/binding/binding_test.go @@ -22,8 +22,8 @@ import ( sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/binding/create.go b/pkg/commands/source/binding/create.go similarity index 97% rename from pkg/kn/commands/source/binding/create.go rename to pkg/commands/source/binding/create.go index 13f868a03..f0ca5a378 100644 --- a/pkg/kn/commands/source/binding/create.go +++ b/pkg/commands/source/binding/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1alpha12 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/binding/create_test.go b/pkg/commands/source/binding/create_test.go similarity index 100% rename from pkg/kn/commands/source/binding/create_test.go rename to pkg/commands/source/binding/create_test.go diff --git a/pkg/kn/commands/source/binding/delete.go b/pkg/commands/source/binding/delete.go similarity index 97% rename from pkg/kn/commands/source/binding/delete.go rename to pkg/commands/source/binding/delete.go index ff1cf0dc2..5f76c96f9 100644 --- a/pkg/kn/commands/source/binding/delete.go +++ b/pkg/commands/source/binding/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewBindingDeleteCommand is for deleting a sink binding diff --git a/pkg/kn/commands/source/binding/delete_test.go b/pkg/commands/source/binding/delete_test.go similarity index 100% rename from pkg/kn/commands/source/binding/delete_test.go rename to pkg/commands/source/binding/delete_test.go diff --git a/pkg/kn/commands/source/binding/describe.go b/pkg/commands/source/binding/describe.go similarity index 99% rename from pkg/kn/commands/source/binding/describe.go rename to pkg/commands/source/binding/describe.go index 152e2c568..9437e0cd5 100644 --- a/pkg/kn/commands/source/binding/describe.go +++ b/pkg/commands/source/binding/describe.go @@ -25,7 +25,7 @@ import ( "knative.dev/pkg/tracker" "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/source/binding/describe_test.go b/pkg/commands/source/binding/describe_test.go similarity index 100% rename from pkg/kn/commands/source/binding/describe_test.go rename to pkg/commands/source/binding/describe_test.go diff --git a/pkg/kn/commands/source/binding/flags.go b/pkg/commands/source/binding/flags.go similarity index 97% rename from pkg/kn/commands/source/binding/flags.go rename to pkg/commands/source/binding/flags.go index f8a2ab42c..60fb8e62d 100644 --- a/pkg/kn/commands/source/binding/flags.go +++ b/pkg/commands/source/binding/flags.go @@ -19,8 +19,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" v1 "knative.dev/eventing/pkg/apis/sources/v1" diff --git a/pkg/kn/commands/source/binding/list.go b/pkg/commands/source/binding/list.go similarity index 95% rename from pkg/kn/commands/source/binding/list.go rename to pkg/commands/source/binding/list.go index cf8bb0234..6a53f3be3 100644 --- a/pkg/kn/commands/source/binding/list.go +++ b/pkg/commands/source/binding/list.go @@ -18,8 +18,8 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewBindingListCommand is for listing sink bindings diff --git a/pkg/kn/commands/source/binding/list_test.go b/pkg/commands/source/binding/list_test.go similarity index 100% rename from pkg/kn/commands/source/binding/list_test.go rename to pkg/commands/source/binding/list_test.go diff --git a/pkg/kn/commands/source/binding/update.go b/pkg/commands/source/binding/update.go similarity index 97% rename from pkg/kn/commands/source/binding/update.go rename to pkg/commands/source/binding/update.go index 3886e3f3d..99d716101 100644 --- a/pkg/kn/commands/source/binding/update.go +++ b/pkg/commands/source/binding/update.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1alpha12 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/binding/update_test.go b/pkg/commands/source/binding/update_test.go similarity index 100% rename from pkg/kn/commands/source/binding/update_test.go rename to pkg/commands/source/binding/update_test.go diff --git a/pkg/kn/commands/source/container/container.go b/pkg/commands/source/container/container.go similarity index 98% rename from pkg/kn/commands/source/container/container.go rename to pkg/commands/source/container/container.go index 3cfa0942a..b82f13c91 100644 --- a/pkg/kn/commands/source/container/container.go +++ b/pkg/commands/source/container/container.go @@ -19,7 +19,7 @@ package container import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" clientv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" ) diff --git a/pkg/kn/commands/source/container/container_test.go b/pkg/commands/source/container/container_test.go similarity index 98% rename from pkg/kn/commands/source/container/container_test.go rename to pkg/commands/source/container/container_test.go index 10dadf325..b14cdb566 100644 --- a/pkg/kn/commands/source/container/container_test.go +++ b/pkg/commands/source/container/container_test.go @@ -28,7 +28,7 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" clientv1 "knative.dev/client/pkg/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var blankConfig clientcmd.ClientConfig diff --git a/pkg/kn/commands/source/container/create.go b/pkg/commands/source/container/create.go similarity index 95% rename from pkg/kn/commands/source/container/create.go rename to pkg/commands/source/container/create.go index d7f817519..2426d1530 100644 --- a/pkg/kn/commands/source/container/create.go +++ b/pkg/commands/source/container/create.go @@ -22,11 +22,11 @@ import ( "os" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands/flags" + knflags "knative.dev/client/pkg/flags" corev1 "k8s.io/api/core/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/container/create_test.go b/pkg/commands/source/container/create_test.go similarity index 100% rename from pkg/kn/commands/source/container/create_test.go rename to pkg/commands/source/container/create_test.go diff --git a/pkg/kn/commands/source/container/delete.go b/pkg/commands/source/container/delete.go similarity index 97% rename from pkg/kn/commands/source/container/delete.go rename to pkg/commands/source/container/delete.go index 035423392..49a7464a1 100644 --- a/pkg/kn/commands/source/container/delete.go +++ b/pkg/commands/source/container/delete.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewContainerDeleteCommand for deleting source diff --git a/pkg/kn/commands/source/container/delete_test.go b/pkg/commands/source/container/delete_test.go similarity index 100% rename from pkg/kn/commands/source/container/delete_test.go rename to pkg/commands/source/container/delete_test.go diff --git a/pkg/kn/commands/source/container/describe.go b/pkg/commands/source/container/describe.go similarity index 99% rename from pkg/kn/commands/source/container/describe.go rename to pkg/commands/source/container/describe.go index 7e5b1efe8..b2babb77e 100644 --- a/pkg/kn/commands/source/container/describe.go +++ b/pkg/commands/source/container/describe.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" v1 "knative.dev/eventing/pkg/apis/sources/v1" ) diff --git a/pkg/kn/commands/source/container/describe_test.go b/pkg/commands/source/container/describe_test.go similarity index 100% rename from pkg/kn/commands/source/container/describe_test.go rename to pkg/commands/source/container/describe_test.go diff --git a/pkg/kn/commands/source/container/human_readable_flags.go b/pkg/commands/source/container/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/source/container/human_readable_flags.go rename to pkg/commands/source/container/human_readable_flags.go index 1454f9657..ad1c4a118 100644 --- a/pkg/kn/commands/source/container/human_readable_flags.go +++ b/pkg/commands/source/container/human_readable_flags.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" v1 "knative.dev/eventing/pkg/apis/sources/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/pkg/kn/commands/source/container/list.go b/pkg/commands/source/container/list.go similarity index 95% rename from pkg/kn/commands/source/container/list.go rename to pkg/commands/source/container/list.go index a28a1d52d..72951d450 100644 --- a/pkg/kn/commands/source/container/list.go +++ b/pkg/commands/source/container/list.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewContainerListCommand is for listing Container sources diff --git a/pkg/kn/commands/source/container/list_test.go b/pkg/commands/source/container/list_test.go similarity index 100% rename from pkg/kn/commands/source/container/list_test.go rename to pkg/commands/source/container/list_test.go diff --git a/pkg/kn/commands/source/container/update.go b/pkg/commands/source/container/update.go similarity index 95% rename from pkg/kn/commands/source/container/update.go rename to pkg/commands/source/container/update.go index e0e1816cd..ac6908374 100644 --- a/pkg/kn/commands/source/container/update.go +++ b/pkg/commands/source/container/update.go @@ -22,11 +22,11 @@ import ( "os" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" ) diff --git a/pkg/kn/commands/source/container/update_test.go b/pkg/commands/source/container/update_test.go similarity index 100% rename from pkg/kn/commands/source/container/update_test.go rename to pkg/commands/source/container/update_test.go diff --git a/pkg/kn/commands/source/duck/multisourcelist.go b/pkg/commands/source/duck/multisourcelist.go similarity index 98% rename from pkg/kn/commands/source/duck/multisourcelist.go rename to pkg/commands/source/duck/multisourcelist.go index 28d334623..05c5f9a42 100644 --- a/pkg/kn/commands/source/duck/multisourcelist.go +++ b/pkg/commands/source/duck/multisourcelist.go @@ -29,8 +29,8 @@ import ( duck "knative.dev/pkg/apis/duck" duckv1 "knative.dev/pkg/apis/duck/v1" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/commands/flags" ) // Source struct holds common properties between different eventing sources diff --git a/pkg/kn/commands/source/duck/multisourcelist_test.go b/pkg/commands/source/duck/multisourcelist_test.go similarity index 100% rename from pkg/kn/commands/source/duck/multisourcelist_test.go rename to pkg/commands/source/duck/multisourcelist_test.go diff --git a/pkg/kn/commands/source/human_readable_flags.go b/pkg/commands/source/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/source/human_readable_flags.go rename to pkg/commands/source/human_readable_flags.go index c86045cff..ad5aed25e 100644 --- a/pkg/kn/commands/source/human_readable_flags.go +++ b/pkg/commands/source/human_readable_flags.go @@ -22,7 +22,7 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - clientduck "knative.dev/client/pkg/kn/commands/source/duck" + clientduck "knative.dev/client/pkg/commands/source/duck" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/source/list.go b/pkg/commands/source/list.go similarity index 96% rename from pkg/kn/commands/source/list.go rename to pkg/commands/source/list.go index 82f251907..73f8dab19 100644 --- a/pkg/kn/commands/source/list.go +++ b/pkg/commands/source/list.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" + "knative.dev/client/pkg/commands/source/duck" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/commands/source/duck" ) const ( diff --git a/pkg/kn/commands/source/list_test.go b/pkg/commands/source/list_test.go similarity index 99% rename from pkg/kn/commands/source/list_test.go rename to pkg/commands/source/list_test.go index 9a568f6af..f1b962d92 100644 --- a/pkg/kn/commands/source/list_test.go +++ b/pkg/commands/source/list_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/list_types.go b/pkg/commands/source/list_types.go similarity index 97% rename from pkg/kn/commands/source/list_types.go rename to pkg/commands/source/list_types.go index f0fbb1108..c4d540d67 100644 --- a/pkg/kn/commands/source/list_types.go +++ b/pkg/commands/source/list_types.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" ) // NewListTypesCommand defines and processes `kn source list-types` diff --git a/pkg/kn/commands/source/ping/create.go b/pkg/commands/source/ping/create.go similarity index 97% rename from pkg/kn/commands/source/ping/create.go rename to pkg/commands/source/ping/create.go index e566936a3..ab77eaacd 100644 --- a/pkg/kn/commands/source/ping/create.go +++ b/pkg/commands/source/ping/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientsourcesv1beta2 "knative.dev/client/pkg/sources/v1beta2" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/ping/create_test.go b/pkg/commands/source/ping/create_test.go similarity index 100% rename from pkg/kn/commands/source/ping/create_test.go rename to pkg/commands/source/ping/create_test.go diff --git a/pkg/kn/commands/source/ping/delete.go b/pkg/commands/source/ping/delete.go similarity index 97% rename from pkg/kn/commands/source/ping/delete.go rename to pkg/commands/source/ping/delete.go index b7e8699b0..e789cd9a1 100644 --- a/pkg/kn/commands/source/ping/delete.go +++ b/pkg/commands/source/ping/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewPingDeleteCommand is for deleting a Ping source diff --git a/pkg/kn/commands/source/ping/delete_test.go b/pkg/commands/source/ping/delete_test.go similarity index 100% rename from pkg/kn/commands/source/ping/delete_test.go rename to pkg/commands/source/ping/delete_test.go diff --git a/pkg/kn/commands/source/ping/describe.go b/pkg/commands/source/ping/describe.go similarity index 99% rename from pkg/kn/commands/source/ping/describe.go rename to pkg/commands/source/ping/describe.go index b6fc2c119..6c2312081 100644 --- a/pkg/kn/commands/source/ping/describe.go +++ b/pkg/commands/source/ping/describe.go @@ -22,7 +22,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" clientsourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" ) diff --git a/pkg/kn/commands/source/ping/describe_test.go b/pkg/commands/source/ping/describe_test.go similarity index 100% rename from pkg/kn/commands/source/ping/describe_test.go rename to pkg/commands/source/ping/describe_test.go diff --git a/pkg/kn/commands/source/ping/flags.go b/pkg/commands/source/ping/flags.go similarity index 99% rename from pkg/kn/commands/source/ping/flags.go rename to pkg/commands/source/ping/flags.go index 65cd916d0..ac91ce31e 100644 --- a/pkg/kn/commands/source/ping/flags.go +++ b/pkg/commands/source/ping/flags.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" diff --git a/pkg/kn/commands/source/ping/list.go b/pkg/commands/source/ping/list.go similarity index 95% rename from pkg/kn/commands/source/ping/list.go rename to pkg/commands/source/ping/list.go index 9e2118af1..8ed48176c 100644 --- a/pkg/kn/commands/source/ping/list.go +++ b/pkg/commands/source/ping/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewPingListCommand is for listing Ping source COs diff --git a/pkg/kn/commands/source/ping/list_test.go b/pkg/commands/source/ping/list_test.go similarity index 100% rename from pkg/kn/commands/source/ping/list_test.go rename to pkg/commands/source/ping/list_test.go diff --git a/pkg/kn/commands/source/ping/ping.go b/pkg/commands/source/ping/ping.go similarity index 98% rename from pkg/kn/commands/source/ping/ping.go rename to pkg/commands/source/ping/ping.go index ad09247ef..b8d68b63d 100644 --- a/pkg/kn/commands/source/ping/ping.go +++ b/pkg/commands/source/ping/ping.go @@ -19,7 +19,7 @@ import ( "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientv1beta2 "knative.dev/client/pkg/sources/v1beta2" sourcesv1beta2 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2" ) diff --git a/pkg/kn/commands/source/ping/ping_test.go b/pkg/commands/source/ping/ping_test.go similarity index 98% rename from pkg/kn/commands/source/ping/ping_test.go rename to pkg/commands/source/ping/ping_test.go index ee3af4666..71f83510c 100644 --- a/pkg/kn/commands/source/ping/ping_test.go +++ b/pkg/commands/source/ping/ping_test.go @@ -24,8 +24,8 @@ import ( sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1beta2 "knative.dev/client/pkg/sources/v1beta2" ) diff --git a/pkg/kn/commands/source/ping/update.go b/pkg/commands/source/ping/update.go similarity index 97% rename from pkg/kn/commands/source/ping/update.go rename to pkg/commands/source/ping/update.go index 1eda2f25c..9eb2987f1 100644 --- a/pkg/kn/commands/source/ping/update.go +++ b/pkg/commands/source/ping/update.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" sourcesv1beta2 "knative.dev/client/pkg/sources/v1beta2" eventingsourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" diff --git a/pkg/kn/commands/source/ping/update_test.go b/pkg/commands/source/ping/update_test.go similarity index 100% rename from pkg/kn/commands/source/ping/update_test.go rename to pkg/commands/source/ping/update_test.go diff --git a/pkg/kn/commands/source/source.go b/pkg/commands/source/source.go similarity index 82% rename from pkg/kn/commands/source/source.go rename to pkg/commands/source/source.go index 42bb4548d..0bf28c41c 100644 --- a/pkg/kn/commands/source/source.go +++ b/pkg/commands/source/source.go @@ -17,11 +17,11 @@ package source import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/source/apiserver" - "knative.dev/client/pkg/kn/commands/source/binding" - "knative.dev/client/pkg/kn/commands/source/container" - "knative.dev/client/pkg/kn/commands/source/ping" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/source/apiserver" + "knative.dev/client/pkg/commands/source/binding" + "knative.dev/client/pkg/commands/source/container" + "knative.dev/client/pkg/commands/source/ping" ) func NewSourceCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/subscription/create.go b/pkg/commands/subscription/create.go similarity index 96% rename from pkg/kn/commands/subscription/create.go rename to pkg/commands/subscription/create.go index f2f9019ab..721abf4f4 100644 --- a/pkg/kn/commands/subscription/create.go +++ b/pkg/commands/subscription/create.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/create_test.go b/pkg/commands/subscription/create_test.go similarity index 100% rename from pkg/kn/commands/subscription/create_test.go rename to pkg/commands/subscription/create_test.go diff --git a/pkg/kn/commands/subscription/delete.go b/pkg/commands/subscription/delete.go similarity index 97% rename from pkg/kn/commands/subscription/delete.go rename to pkg/commands/subscription/delete.go index 26a7e2350..de01661df 100644 --- a/pkg/kn/commands/subscription/delete.go +++ b/pkg/commands/subscription/delete.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewSubscriptionDeleteCommand is for deleting a Subscription diff --git a/pkg/kn/commands/subscription/delete_test.go b/pkg/commands/subscription/delete_test.go similarity index 100% rename from pkg/kn/commands/subscription/delete_test.go rename to pkg/commands/subscription/delete_test.go diff --git a/pkg/kn/commands/subscription/describe.go b/pkg/commands/subscription/describe.go similarity index 98% rename from pkg/kn/commands/subscription/describe.go rename to pkg/commands/subscription/describe.go index aced44a85..f29c6d771 100644 --- a/pkg/kn/commands/subscription/describe.go +++ b/pkg/commands/subscription/describe.go @@ -26,8 +26,8 @@ import ( messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "knative.dev/client/lib/printing" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/subscription/describe_test.go b/pkg/commands/subscription/describe_test.go similarity index 100% rename from pkg/kn/commands/subscription/describe_test.go rename to pkg/commands/subscription/describe_test.go diff --git a/pkg/kn/commands/subscription/flags.go b/pkg/commands/subscription/flags.go similarity index 98% rename from pkg/kn/commands/subscription/flags.go rename to pkg/commands/subscription/flags.go index a139bac2a..4fcfaff80 100644 --- a/pkg/kn/commands/subscription/flags.go +++ b/pkg/commands/subscription/flags.go @@ -22,8 +22,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" diff --git a/pkg/kn/commands/subscription/list.go b/pkg/commands/subscription/list.go similarity index 96% rename from pkg/kn/commands/subscription/list.go rename to pkg/commands/subscription/list.go index d77da3741..fb988e12f 100644 --- a/pkg/kn/commands/subscription/list.go +++ b/pkg/commands/subscription/list.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewSubscriptionListCommand is for listing subscription objects diff --git a/pkg/kn/commands/subscription/list_test.go b/pkg/commands/subscription/list_test.go similarity index 100% rename from pkg/kn/commands/subscription/list_test.go rename to pkg/commands/subscription/list_test.go diff --git a/pkg/kn/commands/subscription/subscription.go b/pkg/commands/subscription/subscription.go similarity index 98% rename from pkg/kn/commands/subscription/subscription.go rename to pkg/commands/subscription/subscription.go index cc1b00eaa..d3eef5f6a 100644 --- a/pkg/kn/commands/subscription/subscription.go +++ b/pkg/commands/subscription/subscription.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientv1beta1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" messagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/subscription_test.go b/pkg/commands/subscription/subscription_test.go similarity index 99% rename from pkg/kn/commands/subscription/subscription_test.go rename to pkg/commands/subscription/subscription_test.go index 8a19d066b..9a6267333 100644 --- a/pkg/kn/commands/subscription/subscription_test.go +++ b/pkg/commands/subscription/subscription_test.go @@ -26,8 +26,8 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/update.go b/pkg/commands/subscription/update.go similarity index 97% rename from pkg/kn/commands/subscription/update.go rename to pkg/commands/subscription/update.go index 851755cc0..334558c90 100644 --- a/pkg/kn/commands/subscription/update.go +++ b/pkg/commands/subscription/update.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/update_test.go b/pkg/commands/subscription/update_test.go similarity index 100% rename from pkg/kn/commands/subscription/update_test.go rename to pkg/commands/subscription/update_test.go diff --git a/pkg/kn/commands/testing_helper.go b/pkg/commands/testing_helper.go similarity index 99% rename from pkg/kn/commands/testing_helper.go rename to pkg/commands/testing_helper.go index 391d8ab9c..9f9899bf1 100644 --- a/pkg/kn/commands/testing_helper.go +++ b/pkg/commands/testing_helper.go @@ -24,7 +24,7 @@ import ( clienttesting "k8s.io/client-go/testing" servingv1fake "knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1/fake" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" v1 "knative.dev/client/pkg/sources/v1" diff --git a/pkg/kn/commands/testing_helper_test.go b/pkg/commands/testing_helper_test.go similarity index 100% rename from pkg/kn/commands/testing_helper_test.go rename to pkg/commands/testing_helper_test.go diff --git a/pkg/kn/commands/trigger/create.go b/pkg/commands/trigger/create.go similarity index 97% rename from pkg/kn/commands/trigger/create.go rename to pkg/commands/trigger/create.go index 181c75055..d7c52cedf 100644 --- a/pkg/kn/commands/trigger/create.go +++ b/pkg/commands/trigger/create.go @@ -22,9 +22,9 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" ) // NewTriggerCreateCommand to create trigger create command diff --git a/pkg/kn/commands/trigger/create_test.go b/pkg/commands/trigger/create_test.go similarity index 100% rename from pkg/kn/commands/trigger/create_test.go rename to pkg/commands/trigger/create_test.go diff --git a/pkg/kn/commands/trigger/delete.go b/pkg/commands/trigger/delete.go similarity index 97% rename from pkg/kn/commands/trigger/delete.go rename to pkg/commands/trigger/delete.go index 0335d2d24..f7ed7dcdb 100644 --- a/pkg/kn/commands/trigger/delete.go +++ b/pkg/commands/trigger/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewTriggerDeleteCommand represent 'revision delete' command diff --git a/pkg/kn/commands/trigger/delete_test.go b/pkg/commands/trigger/delete_test.go similarity index 100% rename from pkg/kn/commands/trigger/delete_test.go rename to pkg/commands/trigger/delete_test.go diff --git a/pkg/kn/commands/trigger/describe.go b/pkg/commands/trigger/describe.go similarity index 99% rename from pkg/kn/commands/trigger/describe.go rename to pkg/commands/trigger/describe.go index 278c67499..2c83699fb 100644 --- a/pkg/kn/commands/trigger/describe.go +++ b/pkg/commands/trigger/describe.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/trigger/describe_test.go b/pkg/commands/trigger/describe_test.go similarity index 100% rename from pkg/kn/commands/trigger/describe_test.go rename to pkg/commands/trigger/describe_test.go diff --git a/pkg/kn/commands/trigger/list.go b/pkg/commands/trigger/list.go similarity index 96% rename from pkg/kn/commands/trigger/list.go rename to pkg/commands/trigger/list.go index 7c952a2ba..d6cf385b3 100644 --- a/pkg/kn/commands/trigger/list.go +++ b/pkg/commands/trigger/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewTriggerListCommand represents 'kn trigger list' command diff --git a/pkg/kn/commands/trigger/list_flags.go b/pkg/commands/trigger/list_flags.go similarity index 98% rename from pkg/kn/commands/trigger/list_flags.go rename to pkg/commands/trigger/list_flags.go index a9dde8c37..569bfd438 100644 --- a/pkg/kn/commands/trigger/list_flags.go +++ b/pkg/commands/trigger/list_flags.go @@ -19,8 +19,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/trigger/list_test.go b/pkg/commands/trigger/list_test.go similarity index 100% rename from pkg/kn/commands/trigger/list_test.go rename to pkg/commands/trigger/list_test.go diff --git a/pkg/kn/commands/trigger/trigger.go b/pkg/commands/trigger/trigger.go similarity index 96% rename from pkg/kn/commands/trigger/trigger.go rename to pkg/commands/trigger/trigger.go index 5c448dbc3..c306bad05 100644 --- a/pkg/kn/commands/trigger/trigger.go +++ b/pkg/commands/trigger/trigger.go @@ -17,7 +17,7 @@ package trigger import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewTriggerCommand to create trigger command group diff --git a/pkg/kn/commands/trigger/trigger_test.go b/pkg/commands/trigger/trigger_test.go similarity index 98% rename from pkg/kn/commands/trigger/trigger_test.go rename to pkg/commands/trigger/trigger_test.go index 8665f2dc5..dfc3ab0c8 100644 --- a/pkg/kn/commands/trigger/trigger_test.go +++ b/pkg/commands/trigger/trigger_test.go @@ -22,9 +22,9 @@ import ( "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" eventclientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" ) // Helper methods diff --git a/pkg/kn/commands/trigger/update.go b/pkg/commands/trigger/update.go similarity index 97% rename from pkg/kn/commands/trigger/update.go rename to pkg/commands/trigger/update.go index d0ab10610..b141ef42b 100644 --- a/pkg/kn/commands/trigger/update.go +++ b/pkg/commands/trigger/update.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/trigger/update_flags.go b/pkg/commands/trigger/update_flags.go similarity index 100% rename from pkg/kn/commands/trigger/update_flags.go rename to pkg/commands/trigger/update_flags.go diff --git a/pkg/kn/commands/trigger/update_flags_test.go b/pkg/commands/trigger/update_flags_test.go similarity index 100% rename from pkg/kn/commands/trigger/update_flags_test.go rename to pkg/commands/trigger/update_flags_test.go diff --git a/pkg/kn/commands/trigger/update_test.go b/pkg/commands/trigger/update_test.go similarity index 100% rename from pkg/kn/commands/trigger/update_test.go rename to pkg/commands/trigger/update_test.go diff --git a/pkg/kn/commands/types.go b/pkg/commands/types.go similarity index 100% rename from pkg/kn/commands/types.go rename to pkg/commands/types.go diff --git a/pkg/kn/commands/types_test.go b/pkg/commands/types_test.go similarity index 100% rename from pkg/kn/commands/types_test.go rename to pkg/commands/types_test.go diff --git a/pkg/kn/commands/version/version.go b/pkg/commands/version/version.go similarity index 99% rename from pkg/kn/commands/version/version.go rename to pkg/commands/version/version.go index f72a9d935..05b91dfda 100644 --- a/pkg/kn/commands/version/version.go +++ b/pkg/commands/version/version.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/mod/semver" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "sigs.k8s.io/yaml" ) diff --git a/pkg/kn/commands/version/version_test.go b/pkg/commands/version/version_test.go similarity index 99% rename from pkg/kn/commands/version/version_test.go rename to pkg/commands/version/version_test.go index 8902fd991..ed32a2cd4 100644 --- a/pkg/kn/commands/version/version_test.go +++ b/pkg/commands/version/version_test.go @@ -25,7 +25,7 @@ import ( "gotest.tools/v3/assert" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/wait_flags.go b/pkg/commands/wait_flags.go similarity index 98% rename from pkg/kn/commands/wait_flags.go rename to pkg/commands/wait_flags.go index 22dae6746..0158c2687 100644 --- a/pkg/kn/commands/wait_flags.go +++ b/pkg/commands/wait_flags.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" ) // Default time out to use when waiting for reconciliation. It is deliberately very long as it is expected that diff --git a/pkg/kn/commands/wait_flags_test.go b/pkg/commands/wait_flags_test.go similarity index 99% rename from pkg/kn/commands/wait_flags_test.go rename to pkg/commands/wait_flags_test.go index 51b57bf0e..d174f0809 100644 --- a/pkg/kn/commands/wait_flags_test.go +++ b/pkg/commands/wait_flags_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" "github.com/spf13/cobra" "gotest.tools/v3/assert" diff --git a/pkg/kn/config/config.go b/pkg/config/config.go similarity index 99% rename from pkg/kn/config/config.go rename to pkg/config/config.go index 75e5dc49c..0abe9cc5c 100644 --- a/pkg/kn/config/config.go +++ b/pkg/config/config.go @@ -21,7 +21,7 @@ import ( "path/filepath" "runtime" - homedir "github.com/mitchellh/go-homedir" + "github.com/mitchellh/go-homedir" flag "github.com/spf13/pflag" "github.com/spf13/viper" ) diff --git a/pkg/kn/config/config_test.go b/pkg/config/config_test.go similarity index 99% rename from pkg/kn/config/config_test.go rename to pkg/config/config_test.go index 5f7005504..6abd72991 100644 --- a/pkg/kn/config/config_test.go +++ b/pkg/config/config_test.go @@ -19,7 +19,7 @@ import ( "path/filepath" "testing" - homedir "github.com/mitchellh/go-homedir" + "github.com/mitchellh/go-homedir" "github.com/spf13/viper" "gotest.tools/v3/assert" ) diff --git a/pkg/kn/config/testing.go b/pkg/config/testing.go similarity index 100% rename from pkg/kn/config/testing.go rename to pkg/config/testing.go diff --git a/pkg/kn/config/testing_test.go b/pkg/config/testing_test.go similarity index 100% rename from pkg/kn/config/testing_test.go rename to pkg/config/testing_test.go diff --git a/pkg/kn/config/types.go b/pkg/config/types.go similarity index 100% rename from pkg/kn/config/types.go rename to pkg/config/types.go diff --git a/pkg/kn/flags/bool.go b/pkg/flags/bool.go similarity index 100% rename from pkg/kn/flags/bool.go rename to pkg/flags/bool.go diff --git a/pkg/kn/flags/bool_test.go b/pkg/flags/bool_test.go similarity index 100% rename from pkg/kn/flags/bool_test.go rename to pkg/flags/bool_test.go diff --git a/pkg/kn/flags/channel_types.go b/pkg/flags/channel_types.go similarity index 99% rename from pkg/kn/flags/channel_types.go rename to pkg/flags/channel_types.go index 58d0e96a3..255905a21 100644 --- a/pkg/kn/flags/channel_types.go +++ b/pkg/flags/channel_types.go @@ -18,14 +18,13 @@ import ( "fmt" "strings" + "knative.dev/client/pkg/config" duckv1 "knative.dev/pkg/apis/duck/v1" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime/schema" - - "knative.dev/client/pkg/kn/config" ) type ChannelTypeFlags struct { diff --git a/pkg/kn/flags/channel_types_test.go b/pkg/flags/channel_types_test.go similarity index 100% rename from pkg/kn/flags/channel_types_test.go rename to pkg/flags/channel_types_test.go diff --git a/pkg/kn/flags/podspec.go b/pkg/flags/podspec.go similarity index 100% rename from pkg/kn/flags/podspec.go rename to pkg/flags/podspec.go diff --git a/pkg/kn/flags/podspec_helper.go b/pkg/flags/podspec_helper.go similarity index 100% rename from pkg/kn/flags/podspec_helper.go rename to pkg/flags/podspec_helper.go diff --git a/pkg/kn/flags/podspec_helper_test.go b/pkg/flags/podspec_helper_test.go similarity index 100% rename from pkg/kn/flags/podspec_helper_test.go rename to pkg/flags/podspec_helper_test.go diff --git a/pkg/kn/flags/podspec_test.go b/pkg/flags/podspec_test.go similarity index 100% rename from pkg/kn/flags/podspec_test.go rename to pkg/flags/podspec_test.go diff --git a/pkg/kn/flags/resources.go b/pkg/flags/resources.go similarity index 100% rename from pkg/kn/flags/resources.go rename to pkg/flags/resources.go diff --git a/pkg/kn/flags/resources_test.go b/pkg/flags/resources_test.go similarity index 100% rename from pkg/kn/flags/resources_test.go rename to pkg/flags/resources_test.go diff --git a/pkg/kn/plugin/context_sharing.go b/pkg/plugin/context_sharing.go similarity index 99% rename from pkg/kn/plugin/context_sharing.go rename to pkg/plugin/context_sharing.go index 35ea0a166..b9751417c 100644 --- a/pkg/kn/plugin/context_sharing.go +++ b/pkg/plugin/context_sharing.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/config" ) //--TYPES-- diff --git a/pkg/kn/plugin/context_sharing_test.go b/pkg/plugin/context_sharing_test.go similarity index 100% rename from pkg/kn/plugin/context_sharing_test.go rename to pkg/plugin/context_sharing_test.go diff --git a/pkg/kn/plugin/context_types.go b/pkg/plugin/context_types.go similarity index 100% rename from pkg/kn/plugin/context_types.go rename to pkg/plugin/context_types.go diff --git a/pkg/kn/plugin/manager.go b/pkg/plugin/manager.go similarity index 100% rename from pkg/kn/plugin/manager.go rename to pkg/plugin/manager.go diff --git a/pkg/kn/plugin/manager_test.go b/pkg/plugin/manager_test.go similarity index 100% rename from pkg/kn/plugin/manager_test.go rename to pkg/plugin/manager_test.go diff --git a/pkg/kn/plugin/stat.go b/pkg/plugin/stat.go similarity index 100% rename from pkg/kn/plugin/stat.go rename to pkg/plugin/stat.go diff --git a/pkg/kn/plugin/stat_windows.go b/pkg/plugin/stat_windows.go similarity index 100% rename from pkg/kn/plugin/stat_windows.go rename to pkg/plugin/stat_windows.go diff --git a/pkg/kn/plugin/verify.go b/pkg/plugin/verify.go similarity index 100% rename from pkg/kn/plugin/verify.go rename to pkg/plugin/verify.go diff --git a/pkg/kn/plugin/verify_test.go b/pkg/plugin/verify_test.go similarity index 100% rename from pkg/kn/plugin/verify_test.go rename to pkg/plugin/verify_test.go diff --git a/pkg/kn/root/root.go b/pkg/root/root.go similarity index 87% rename from pkg/kn/root/root.go rename to pkg/root/root.go index 1b3abe152..83f7179e2 100644 --- a/pkg/kn/root/root.go +++ b/pkg/root/root.go @@ -22,31 +22,31 @@ import ( "strings" "text/template" - "knative.dev/client/pkg/kn/commands/secret" + "knative.dev/client/pkg/commands/secret" + "knative.dev/client/pkg/config" "github.com/spf13/cobra" // Import & enable all auth providers at once _ "k8s.io/client-go/plugin/pkg/client/auth" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/broker" - "knative.dev/client/pkg/kn/commands/channel" - "knative.dev/client/pkg/kn/commands/completion" - "knative.dev/client/pkg/kn/commands/container" - "knative.dev/client/pkg/kn/commands/domain" - "knative.dev/client/pkg/kn/commands/eventtype" - "knative.dev/client/pkg/kn/commands/options" - "knative.dev/client/pkg/kn/commands/plugin" - "knative.dev/client/pkg/kn/commands/revision" - "knative.dev/client/pkg/kn/commands/route" - "knative.dev/client/pkg/kn/commands/service" - "knative.dev/client/pkg/kn/commands/source" - "knative.dev/client/pkg/kn/commands/subscription" - "knative.dev/client/pkg/kn/commands/trigger" - "knative.dev/client/pkg/kn/commands/version" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/broker" + "knative.dev/client/pkg/commands/channel" + "knative.dev/client/pkg/commands/completion" + "knative.dev/client/pkg/commands/container" + "knative.dev/client/pkg/commands/domain" + "knative.dev/client/pkg/commands/eventtype" + "knative.dev/client/pkg/commands/options" + "knative.dev/client/pkg/commands/plugin" + "knative.dev/client/pkg/commands/revision" + "knative.dev/client/pkg/commands/route" + "knative.dev/client/pkg/commands/service" + "knative.dev/client/pkg/commands/source" + "knative.dev/client/pkg/commands/subscription" + "knative.dev/client/pkg/commands/trigger" + "knative.dev/client/pkg/commands/version" + "knative.dev/client/pkg/flags" "knative.dev/client/pkg/templates" ) diff --git a/pkg/kn/root/root_test.go b/pkg/root/root_test.go similarity index 100% rename from pkg/kn/root/root_test.go rename to pkg/root/root_test.go diff --git a/pkg/serving/config_changes.go b/pkg/serving/config_changes.go index 41287f072..397ea38c8 100644 --- a/pkg/serving/config_changes.go +++ b/pkg/serving/config_changes.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" "knative.dev/pkg/ptr" "knative.dev/serving/pkg/apis/autoscaling" servingconfig "knative.dev/serving/pkg/apis/config" diff --git a/pkg/kn/traffic/compute.go b/pkg/traffic/compute.go similarity index 99% rename from pkg/kn/traffic/compute.go rename to pkg/traffic/compute.go index 2a0caa443..65724ccbe 100644 --- a/pkg/kn/traffic/compute.go +++ b/pkg/traffic/compute.go @@ -20,11 +20,11 @@ import ( "strings" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/revision" + "knative.dev/client/pkg/commands/revision" "knative.dev/pkg/ptr" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) var latestRevisionRef = "@latest" diff --git a/pkg/kn/traffic/compute_test.go b/pkg/traffic/compute_test.go similarity index 99% rename from pkg/kn/traffic/compute_test.go rename to pkg/traffic/compute_test.go index bd0067894..1ce3f4262 100644 --- a/pkg/kn/traffic/compute_test.go +++ b/pkg/traffic/compute_test.go @@ -18,14 +18,14 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/client/pkg/kn/commands/revision" + "knative.dev/client/pkg/commands/revision" servingv1 "knative.dev/serving/pkg/apis/serving/v1" "testing" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) type trafficTestCase struct { diff --git a/tools/knb/pkg/plugin/templates.go b/tools/knb/pkg/plugin/templates.go index c5a42af94..f8ef8068a 100644 --- a/tools/knb/pkg/plugin/templates.go +++ b/tools/knb/pkg/plugin/templates.go @@ -53,7 +53,7 @@ import ( {{if .PluginImportPath}}"{{.PluginImportPath }}"{{else}}//TODO: add plugin import{{end}} - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/plugin" ) func init() {