Clean up the kn sub-package

knative · Mar 7, 2024 · e01393a · e01393a
1 parent f170971
commit e01393a
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 75 deletions.
diff --git a/pkg/kn/commands/describe.go → pkg/commands/describe.go b/pkg/kn/commands/describe.go → pkg/commands/describe.go
diff --git a/pkg/kn/commands/describe_test.go → pkg/commands/describe_test.go b/pkg/kn/commands/describe_test.go → pkg/commands/describe_test.go
diff --git a/pkg/kn/commands/flags/listprint.go → pkg/commands/flags/listprint.go b/pkg/kn/commands/flags/listprint.go → pkg/commands/flags/listprint.go
@@ -20,8 +20,8 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"knative.dev/client-pkg/pkg/commands"
 
-	"knative.dev/client-pkg/pkg/kn/commands"
 	hprinters "knative.dev/client-pkg/pkg/printers"
 	"knative.dev/client-pkg/pkg/util"
 )

diff --git a/pkg/kn/commands/flags/listprint_test.go → pkg/commands/flags/listprint_test.go b/pkg/kn/commands/flags/listprint_test.go → pkg/commands/flags/listprint_test.go
diff --git a/pkg/kn/commands/flags/sink.go → pkg/commands/flags/sink.go b/pkg/kn/commands/flags/sink.go → 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/pkg/config"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
 	clientdynamic "knative.dev/client-pkg/pkg/dynamic"
-	"knative.dev/client-pkg/pkg/kn/config"
 )
 
 type SinkFlags struct {

diff --git a/pkg/kn/commands/flags/sink_test.go → pkg/commands/flags/sink_test.go b/pkg/kn/commands/flags/sink_test.go → pkg/commands/flags/sink_test.go
diff --git a/pkg/kn/commands/human_readable_flags.go → pkg/commands/human_readable_flags.go b/pkg/kn/commands/human_readable_flags.go → pkg/commands/human_readable_flags.go
diff --git a/pkg/kn/commands/human_readable_flags_test.go → pkg/commands/human_readable_flags_test.go b/pkg/kn/commands/human_readable_flags_test.go → pkg/commands/human_readable_flags_test.go
diff --git a/pkg/kn/commands/namespaced.go → pkg/commands/namespaced.go b/pkg/kn/commands/namespaced.go → pkg/commands/namespaced.go
diff --git a/pkg/kn/commands/namespaced_test.go → pkg/commands/namespaced_test.go b/pkg/kn/commands/namespaced_test.go → pkg/commands/namespaced_test.go
diff --git a/pkg/kn/commands/testing_helper.go → pkg/commands/testing_helper.go b/pkg/kn/commands/testing_helper.go → pkg/commands/testing_helper.go
@@ -18,13 +18,13 @@ import (
 	"bytes"
 
 	"knative.dev/client-pkg/pkg/dynamic/fake"
+	"knative.dev/client-pkg/pkg/flags"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime"
 	clienttesting "k8s.io/client-go/testing"
 	servingv1fake "knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1/fake"
 
-	"knative.dev/client-pkg/pkg/kn/flags"
 	clientservingv1 "knative.dev/client-pkg/pkg/serving/v1"
 	v1 "knative.dev/client-pkg/pkg/sources/v1"
 

diff --git a/pkg/kn/commands/types.go → pkg/commands/types.go b/pkg/kn/commands/types.go → pkg/commands/types.go
diff --git a/pkg/kn/commands/types_test.go → pkg/commands/types_test.go b/pkg/kn/commands/types_test.go → pkg/commands/types_test.go
diff --git a/pkg/kn/config/config.go → pkg/config/config.go b/pkg/kn/config/config.go → pkg/config/config.go
@@ -1,16 +1,18 @@
-// Copyright © 2020 The Knative Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ Copyright 2024 The Knative Authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
 
 package config
 
@@ -21,7 +23,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 → pkg/config/config_test.go b/pkg/kn/config/config_test.go → pkg/config/config_test.go
@@ -1,16 +1,18 @@
-// Copyright © 2020 The Knative Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ Copyright 2024 The Knative Authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
 
 package config
 
@@ -19,7 +21,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/types.go → pkg/config/types.go b/pkg/kn/config/types.go → pkg/config/types.go
diff --git a/pkg/kn/flags/bool.go → pkg/flags/bool.go b/pkg/kn/flags/bool.go → pkg/flags/bool.go
diff --git a/pkg/kn/flags/bool_test.go → pkg/flags/bool_test.go b/pkg/kn/flags/bool_test.go → pkg/flags/bool_test.go
diff --git a/pkg/kn/flags/podspec_helper.go → pkg/flags/podspec_helper.go b/pkg/kn/flags/podspec_helper.go → pkg/flags/podspec_helper.go
diff --git a/pkg/kn/flags/podspec_helper_test.go → pkg/flags/podspec_helper_test.go b/pkg/kn/flags/podspec_helper_test.go → pkg/flags/podspec_helper_test.go
diff --git a/pkg/kn-source-pkg/pkg/factories/flags_factory.go b/pkg/kn-source-pkg/pkg/factories/flags_factory.go
@@ -15,10 +15,9 @@
 package factories
 
 import (
-	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
-	"knative.dev/client-pkg/pkg/kn/commands"
-
 	"github.com/spf13/pflag"
+	"knative.dev/client-pkg/pkg/commands"
+	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
 )
 
 type DefautFlagsFactory struct {

diff --git a/pkg/kn-source-pkg/pkg/factories/kn_source_factory.go b/pkg/kn-source-pkg/pkg/factories/kn_source_factory.go
@@ -16,10 +16,9 @@ package factories
 
 import (
 	"k8s.io/client-go/rest"
+	"knative.dev/client-pkg/pkg/commands/flags"
 	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/client"
 	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
-
-	"knative.dev/client-pkg/pkg/kn/commands/flags"
 )
 
 type DefautKnSourceFactory struct {

diff --git a/pkg/kn-source-pkg/pkg/factories/kn_source_factory_test.go b/pkg/kn-source-pkg/pkg/factories/kn_source_factory_test.go
@@ -19,9 +19,8 @@ import (
 
 	"gotest.tools/v3/assert"
 	"k8s.io/client-go/rest"
+	"knative.dev/client-pkg/pkg/commands/flags"
 	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types"
-	"knative.dev/client-pkg/pkg/kn/commands/flags"
-
 	"knative.dev/client-pkg/pkg/kn-source-pkg/pkg/types/typesfakes"
 )
 

diff --git a/pkg/kn-source-pkg/pkg/types/structs.go b/pkg/kn-source-pkg/pkg/types/structs.go
@@ -18,18 +18,18 @@ package types
 
 import (
 	"github.com/spf13/cobra"
-	"knative.dev/client-pkg/pkg/kn/commands"
-	"knative.dev/client-pkg/pkg/kn/commands/flags"
+	commands2 "knative.dev/client-pkg/pkg/commands"
+	"knative.dev/client-pkg/pkg/commands/flags"
 )
 
 type KnSourceParams struct {
-	commands.KnParams
+	commands2.KnParams
 
 	SinkFlag flags.SinkFlags
 }
 
 func (p *KnSourceParams) AddCommonFlags(cmd *cobra.Command) {
-	commands.AddNamespaceFlags(cmd.Flags(), true)
+	commands2.AddNamespaceFlags(cmd.Flags(), true)
 }
 
 func (p *KnSourceParams) AddCreateUpdateFlags(cmd *cobra.Command) {

diff --git a/pkg/kn-source-pkg/pkg/types/structs_test.go b/pkg/kn-source-pkg/pkg/types/structs_test.go
@@ -19,8 +19,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
-
-	"knative.dev/client-pkg/pkg/kn/commands/flags"
+	"knative.dev/client-pkg/pkg/commands/flags"
 )
 
 func TestAddCommonFlags(t *testing.T) {

diff --git a/pkg/kn/plugin/types.go b/pkg/kn/plugin/types.go
diff --git a/pkg/serving/config_changes.go b/pkg/serving/config_changes.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"knative.dev/client-pkg/pkg/kn/flags"
+	"knative.dev/client-pkg/pkg/flags"
 	"knative.dev/pkg/ptr"
 	"knative.dev/serving/pkg/apis/autoscaling"
 	servingconfig "knative.dev/serving/pkg/apis/config"