Move all create subcommands to its own subdirectory

tengqiao · Apr 12, 2018 · d12a8a8 · d12a8a8
1 parent 2f394a4
commit d12a8a8
Show file tree

Hide file tree

Showing 38 changed files with 254 additions and 82 deletions.
diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD
@@ -142,6 +142,13 @@ package_group(
     ],
 )
 
+package_group(
+    name = "pkg_kubectl_cmd_create_CONSUMERS",
+    packages = [
+        "//pkg/kubectl/cmd",
+    ],
+)
+
 package_group(
     name = "pkg_kubectl_cmd_rollout_CONSUMERS",
     packages = [
@@ -169,6 +176,7 @@ package_group(
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
         "//pkg/kubectl/cmd/config",
+        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/resource",
         "//pkg/kubectl/cmd/rollout",
         "//pkg/kubectl/cmd/set",
@@ -190,6 +198,7 @@ package_group(
     packages = [
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
+        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/resource",
         "//pkg/kubectl/cmd/set",
         "//pkg/kubectl/explain",
@@ -222,6 +231,7 @@ package_group(
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
         "//pkg/kubectl/cmd/config",
+        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/resource",
         "//pkg/kubectl/cmd/rollout",
         "//pkg/kubectl/cmd/set",
@@ -235,6 +245,7 @@ package_group(
     name = "pkg_kubectl_cmd_util_editor_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/util",
     ],
 )
@@ -290,6 +301,7 @@ package_group(
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
         "//pkg/kubectl/cmd/config",
+        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/resource",
         "//pkg/kubectl/cmd/rollout",
         "//pkg/kubectl/cmd/set",

diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -139,6 +139,7 @@ pkg/kubectl/categories
 pkg/kubectl/cmd
 pkg/kubectl/cmd/auth
 pkg/kubectl/cmd/config
+pkg/kubectl/cmd/create
 pkg/kubectl/cmd/rollout
 pkg/kubectl/cmd/set
 pkg/kubectl/cmd/templates

diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD
@@ -24,21 +24,6 @@ go_library(
         "completion.go",
         "convert.go",
         "cp.go",
-        "create.go",
-        "create_clusterrole.go",
-        "create_clusterrolebinding.go",
-        "create_configmap.go",
-        "create_deployment.go",
-        "create_job.go",
-        "create_namespace.go",
-        "create_pdb.go",
-        "create_priorityclass.go",
-        "create_quota.go",
-        "create_role.go",
-        "create_rolebinding.go",
-        "create_secret.go",
-        "create_service.go",
-        "create_serviceaccount.go",
         "delete.go",
         "describe.go",
         "diff.go",
@@ -82,6 +67,7 @@ go_library(
         "//pkg/kubectl/apply/strategy:go_default_library",
         "//pkg/kubectl/cmd/auth:go_default_library",
         "//pkg/kubectl/cmd/config:go_default_library",
+        "//pkg/kubectl/cmd/create:go_default_library",
         "//pkg/kubectl/cmd/resource:go_default_library",
         "//pkg/kubectl/cmd/rollout:go_default_library",
         "//pkg/kubectl/cmd/scalejob:go_default_library",
@@ -114,11 +100,8 @@ go_library(
         "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
-        "//vendor/k8s.io/api/batch/v1:go_default_library",
-        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
-        "//vendor/k8s.io/api/rbac/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -144,9 +127,7 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
         "//vendor/k8s.io/client-go/discovery:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/scale:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
@@ -171,21 +152,6 @@ go_test(
         "cmd_test.go",
         "convert_test.go",
         "cp_test.go",
-        "create_clusterrole_test.go",
-        "create_clusterrolebinding_test.go",
-        "create_configmap_test.go",
-        "create_deployment_test.go",
-        "create_job_test.go",
-        "create_namespace_test.go",
-        "create_pdb_test.go",
-        "create_priorityclass_test.go",
-        "create_quota_test.go",
-        "create_role_test.go",
-        "create_rolebinding_test.go",
-        "create_secret_test.go",
-        "create_service_test.go",
-        "create_serviceaccount_test.go",
-        "create_test.go",
         "delete_test.go",
         "describe_test.go",
         "diff_test.go",
@@ -222,6 +188,7 @@ go_test(
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/kubectl:go_default_library",
+        "//pkg/kubectl/cmd/create:go_default_library",
         "//pkg/kubectl/cmd/resource:go_default_library",
         "//pkg/kubectl/cmd/testing:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
@@ -235,16 +202,10 @@ go_test(
         "//pkg/util/strings:go_default_library",
         "//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/gopkg.in/yaml.v2:go_default_library",
         "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/api/batch/v1:go_default_library",
-        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
-        "//vendor/k8s.io/api/rbac/v1:go_default_library",
-        "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@@ -261,7 +222,6 @@ go_test(
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
         "//vendor/k8s.io/client-go/dynamic:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/rest/fake:go_default_library",
         "//vendor/k8s.io/client-go/scale/fake:go_default_library",
@@ -286,6 +246,7 @@ filegroup(
         ":package-srcs",
         "//pkg/kubectl/cmd/auth:all-srcs",
         "//pkg/kubectl/cmd/config:all-srcs",
+        "//pkg/kubectl/cmd/create:all-srcs",
         "//pkg/kubectl/cmd/resource:all-srcs",
         "//pkg/kubectl/cmd/rollout:all-srcs",
         "//pkg/kubectl/cmd/scalejob:all-srcs",

diff --git a/pkg/kubectl/cmd/apply.go b/pkg/kubectl/cmd/apply.go
@@ -302,9 +302,11 @@ func RunApply(f cmdutil.Factory, cmd *cobra.Command, out, errOut io.Writer, opti
 
 			if !dryRun {
 				// Then create the resource and skip the three-way merge
-				if err := createAndRefresh(info); err != nil {
+				obj, err := resource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, info.Object)
+				if err != nil {
 					return cmdutil.AddSourceToErr("creating", info.Source, err)
 				}
+				info.Refresh(obj, true)
 				if uid, err := info.Mapping.UID(info.Object); err != nil {
 					return err
 				} else {

diff --git a/pkg/kubectl/cmd/autoscale.go b/pkg/kubectl/cmd/autoscale.go
@@ -129,7 +129,7 @@ func RunAutoscale(f cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s
 				ScaleRefApiVersion: mapping.GroupVersionKind.GroupVersion().String(),
 			}
 		default:
-			return errUnsupportedGenerator(cmd, generatorName)
+			return cmdutil.UsageErrorf(cmd, "Generator %s not supported. ", generatorName)
 		}
 
 		// Generate new object

diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/auth"
 	cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"
+	"k8s.io/kubernetes/pkg/kubectl/cmd/create"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/resource"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/rollout"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/set"
@@ -249,7 +250,7 @@ func NewKubectlCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
 		{
 			Message: "Basic Commands (Beginner):",
 			Commands: []*cobra.Command{
-				NewCmdCreate(f, out, err),
+				create.NewCmdCreate(f, out, err),
 				NewCmdExposeService(f, out),
 				NewCmdRun(f, in, out, err),
 				set.NewCmdSet(f, in, out, err),

diff --git a/pkg/kubectl/cmd/create/BUILD b/pkg/kubectl/cmd/create/BUILD
@@ -0,0 +1,108 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "create.go",
+        "create_clusterrole.go",
+        "create_clusterrolebinding.go",
+        "create_configmap.go",
+        "create_deployment.go",
+        "create_job.go",
+        "create_namespace.go",
+        "create_pdb.go",
+        "create_priorityclass.go",
+        "create_quota.go",
+        "create_role.go",
+        "create_rolebinding.go",
+        "create_secret.go",
+        "create_service.go",
+        "create_serviceaccount.go",
+    ],
+    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create",
+    visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"],
+    deps = [
+        "//pkg/kubectl:go_default_library",
+        "//pkg/kubectl/cmd/templates:go_default_library",
+        "//pkg/kubectl/cmd/util:go_default_library",
+        "//pkg/kubectl/cmd/util/editor:go_default_library",
+        "//pkg/kubectl/resource:go_default_library",
+        "//pkg/kubectl/util/i18n:go_default_library",
+        "//vendor/github.com/spf13/cobra:go_default_library",
+        "//vendor/k8s.io/api/batch/v1:go_default_library",
+        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/api/rbac/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "create_clusterrole_test.go",
+        "create_clusterrolebinding_test.go",
+        "create_configmap_test.go",
+        "create_deployment_test.go",
+        "create_job_test.go",
+        "create_namespace_test.go",
+        "create_pdb_test.go",
+        "create_priorityclass_test.go",
+        "create_quota_test.go",
+        "create_role_test.go",
+        "create_rolebinding_test.go",
+        "create_secret_test.go",
+        "create_service_test.go",
+        "create_serviceaccount_test.go",
+        "create_test.go",
+    ],
+    data = [
+        "//examples:config",
+    ],
+    embed = [":go_default_library"],
+    deps = [
+        "//pkg/api/legacyscheme:go_default_library",
+        "//pkg/api/testing:go_default_library",
+        "//pkg/apis/core:go_default_library",
+        "//pkg/kubectl:go_default_library",
+        "//pkg/kubectl/cmd/testing:go_default_library",
+        "//pkg/kubectl/cmd/util:go_default_library",
+        "//pkg/kubectl/scheme:go_default_library",
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/k8s.io/api/batch/v1:go_default_library",
+        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/api/rbac/v1:go_default_library",
+        "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
+        "//vendor/k8s.io/client-go/dynamic:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
+        "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/k8s.io/client-go/rest/fake:go_default_library",
+        "//vendor/k8s.io/client-go/testing:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
diff --git a/pkg/kubectl/cmd/create.go → pkg/kubectl/cmd/create/create.go b/pkg/kubectl/cmd/create.go → pkg/kubectl/cmd/create/create.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package create
 
 import (
 	"fmt"

diff --git a/pkg/kubectl/cmd/create_clusterrole.go → pkg/kubectl/cmd/create/create_clusterrole.go b/pkg/kubectl/cmd/create_clusterrole.go → pkg/kubectl/cmd/create/create_clusterrole.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package create
 
 import (
 	"fmt"

diff --git a/pkg/kubectl/cmd/create_clusterrole_test.go → ...ctl/cmd/create/create_clusterrole_test.go b/pkg/kubectl/cmd/create_clusterrole_test.go → ...ctl/cmd/create/create_clusterrole_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package create
 
 import (
 	"bytes"
@@ -24,9 +24,12 @@ import (
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/rest/fake"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
+	"k8s.io/kubernetes/pkg/kubectl/scheme"
 )
 
 func TestCreateClusterRole(t *testing.T) {
@@ -445,3 +448,14 @@ func TestClusterRoleValidate(t *testing.T) {
 		})
 	}
 }
+
+func defaultClientConfig() *restclient.Config {
+	return &restclient.Config{
+		APIPath: "/api",
+		ContentConfig: restclient.ContentConfig{
+			NegotiatedSerializer: scheme.Codecs,
+			ContentType:          runtime.ContentTypeJSON,
+			GroupVersion:         &schema.GroupVersion{Version: "v1"},
+		},
+	}
+}
diff --git a/pkg/kubectl/cmd/create_clusterrolebinding.go → ...l/cmd/create/create_clusterrolebinding.go b/pkg/kubectl/cmd/create_clusterrolebinding.go → ...l/cmd/create/create_clusterrolebinding.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package create
 
 import (
 	"io"