From aea2e33175b3b051ca0f788b6a214518f5e4f161 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 8 Jun 2021 11:55:32 +0800 Subject: [PATCH] gendocs: using bytes.NewReader(nil)/ioutil.Discard instead of os input/output to generate command --- cmd/gendocs/gen_kubectl_docs.go | 4 ++-- cmd/genkubedocs/gen_kube_docs.go | 4 +++- cmd/genman/gen_kube_man.go | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/gendocs/gen_kubectl_docs.go b/cmd/gendocs/gen_kubectl_docs.go index fe0bcff123b..6effecf714b 100644 --- a/cmd/gendocs/gen_kubectl_docs.go +++ b/cmd/gendocs/gen_kubectl_docs.go @@ -17,6 +17,7 @@ limitations under the License. package main import ( + "bytes" "fmt" "io/ioutil" "os" @@ -45,7 +46,6 @@ func main() { // Set environment variables used by kubectl so the output is consistent, // regardless of where we run. os.Setenv("HOME", "/home/username") - // TODO os.Stdin should really be something like ioutil.Discard, but a Reader - kubectl := cmd.NewKubectlCommand(os.Stdin, ioutil.Discard, ioutil.Discard) + kubectl := cmd.NewKubectlCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard) doc.GenMarkdownTree(kubectl, outDir) } diff --git a/cmd/genkubedocs/gen_kube_docs.go b/cmd/genkubedocs/gen_kube_docs.go index 29d68f0f43b..30c27aa1ed4 100644 --- a/cmd/genkubedocs/gen_kube_docs.go +++ b/cmd/genkubedocs/gen_kube_docs.go @@ -17,7 +17,9 @@ limitations under the License. package main import ( + "bytes" "fmt" + "io/ioutil" "os" "github.com/spf13/cobra/doc" @@ -77,7 +79,7 @@ func main() { pflag.CommandLine = pflag.NewFlagSet(os.Args[0], pflag.ExitOnError) // generate docs for kubeadm - kubeadm := kubeadmapp.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr) + kubeadm := kubeadmapp.NewKubeadmCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard) doc.GenMarkdownTree(kubeadm, outDir) // cleanup generated code for usage as include in the website diff --git a/cmd/genman/gen_kube_man.go b/cmd/genman/gen_kube_man.go index 9a95e76217a..5034bc978b5 100644 --- a/cmd/genman/gen_kube_man.go +++ b/cmd/genman/gen_kube_man.go @@ -96,15 +96,14 @@ func main() { } case "kubectl": // generate manpage for kubectl - // TODO os.Stdin should really be something like ioutil.Discard, but a Reader - kubectl := kubectlcmd.NewKubectlCommand(os.Stdin, ioutil.Discard, ioutil.Discard) + kubectl := kubectlcmd.NewKubectlCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard) genMarkdown(kubectl, "", outDir) for _, c := range kubectl.Commands() { genMarkdown(c, "kubectl", outDir) } case "kubeadm": - // generate manpage for kubelet - kubeadm := kubeadmapp.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr) + // generate manpage for kubeadm + kubeadm := kubeadmapp.NewKubeadmCommand(bytes.NewReader(nil), ioutil.Discard, ioutil.Discard) genMarkdown(kubeadm, "", outDir) for _, c := range kubeadm.Commands() { genMarkdown(c, "kubeadm", outDir)