Tweak gendocs to accept --admin flag to generate admin or non-admin c…

…ommands docs

Makefile

@@ -89,7 +89,7 @@ generate-docs:
 .PHONY: generate-docs
 
 generate-docs-admin:
-	go run ./tools/gendocs-admin
+	go run ./tools/gendocs --admin
 .PHONY: generate-docs-admin
 
 generate-versioninfo:

tools/gendocs/gen_openshift_docs.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -11,6 +12,8 @@ import (
 	"github.com/openshift/oc/tools/gendocs/gendocs"
 )
 
+var admin = flag.Bool("admin", false, "Generate admin commands docs")
+
 func OutDir(path string) (string, error) {
 	outDir, err := filepath.Abs(path)
 	if err != nil {
@@ -31,9 +34,10 @@ func OutDir(path string) (string, error) {
 
 func main() {
 	path := "docs/generated/"
-	if len(os.Args) == 2 {
-		path = os.Args[1]
-	} else if len(os.Args) > 2 {
+	flag.Parse()
+	if flag.NArg() == 1 {
+		path = flag.Arg(0)
+	} else if flag.NArg() > 1 {
 		fmt.Fprintf(os.Stderr, "usage: %s [output directory]\n", os.Args[0])
 		os.Exit(1)
 	}
@@ -44,11 +48,15 @@ func main() {
 		os.Exit(1)
 	}
 
-	outFile := outDir + "oc-by-example-content.adoc"
 	out := os.Stdout
 	cmd := cli.NewOcCommand(&bytes.Buffer{}, out, ioutil.Discard)
 
-	if err := gendocs.GenDocs(cmd, outFile); err != nil {
+	outFile := filepath.Join(outDir, "oc-by-example-content.adoc")
+	if *admin {
+		outFile = filepath.Join(outDir, "oc-adm-by-example-content.adoc")
+	}
+
+	if err := gendocs.GenDocs(cmd, outFile, *admin); err != nil {
 		fmt.Fprintf(os.Stderr, "failed to generate docs: %v\n", err)
 		os.Exit(1)
 	}

tools/gendocs/gendocs/gendocs.go

@@ -25,9 +25,13 @@ func (x Examples) Less(i, j int) bool {
 	return xi < xj
 }
 
-func GenDocs(cmd *cobra.Command, filename string) error {
+func GenDocs(cmd *cobra.Command, filename string, admin bool) error {
 	out := new(bytes.Buffer)
-	templateFile, err := filepath.Abs("hack/clibyexample/template")
+	templatePath := "hack/clibyexample/template"
+	if admin {
+		templatePath = "hack/clibyexample/template-admin"
+	}
+	templateFile, err := filepath.Abs(templatePath)
 	if err != nil {
 		return err
 	}
@@ -39,7 +43,7 @@ func GenDocs(cmd *cobra.Command, filename string) error {
 	output := &unstructured.UnstructuredList{}
 	output.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("List"))
 
-	examples := extractExamples(cmd)
+	examples := extractExamples(cmd, admin)
 	for i := range examples {
 		output.Items = append(output.Items, *examples[i])
 	}
@@ -66,16 +70,18 @@ func GenDocs(cmd *cobra.Command, filename string) error {
 	return nil
 }
 
-func extractExamples(cmd *cobra.Command) Examples {
+func extractExamples(cmd *cobra.Command, admin bool) Examples {
 	objs := Examples{}
 	for _, c := range cmd.Commands() {
 		if len(c.Deprecated) > 0 {
 			continue
 		}
-		if strings.HasPrefix(c.CommandPath(), "oc adm") {
+		if strings.HasPrefix(c.CommandPath(), "oc adm") && !admin {
+			continue
+		} else if !strings.HasPrefix(c.CommandPath(), "oc adm") && admin {
 			continue
 		} else {
-			objs = append(objs, extractExamples(c)...)
+			objs = append(objs, extractExamples(c, admin)...)
 		}
 	}
 	if cmd.HasExample() {