Merge pull request #81 from pwittrock/master

apiserver-boot parse --domain flag from pkg/apis/doc.go when not spec…
kubernetes-sigs · Jun 24, 2017 · c903a15 · c903a15
2 parents b9f652e + 999a6c0
commit c903a15
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/cmd/apiserver-boot/boot/create_resource.go b/cmd/apiserver-boot/boot/create_resource.go
@@ -52,7 +52,7 @@ func RunCreateResource(cmd *cobra.Command, args []string) {
 	}
 
 	if len(domain) == 0 {
-		log.Fatal("apiserver-boot create-resource requires the --domain flag")
+		domain = getDomain()
 	}
 	if len(groupName) == 0 {
 		log.Fatal("apiserver-boot create-resource requires the --group flag")
@@ -165,14 +165,14 @@ func createResource(boilerplate string) {
 }
 
 type resourceTemplateArgs struct {
-	BoilerPlate    string
-	Domain         string
-	Group          string
-	Version        string
-	Kind           string
-	Resource       string
-	Repo           string
-	PluralizedKind string
+	BoilerPlate       string
+	Domain            string
+	Group             string
+	Version           string
+	Kind              string
+	Resource          string
+	Repo              string
+	PluralizedKind    string
 	NonNamespacedKind bool
 }
 

diff --git a/cmd/apiserver-boot/boot/create_resource_group.go b/cmd/apiserver-boot/boot/create_resource_group.go
@@ -45,7 +45,7 @@ func RunCreateGroup(cmd *cobra.Command, args []string) {
 	}
 
 	if len(domain) == 0 {
-		log.Fatalf("apiserver-boot create-group requires the --domain flag")
+		domain = getDomain()
 	}
 	if len(groupName) == 0 {
 		log.Fatalf("apiserver-boot create-group requires the --groupName flag")

diff --git a/cmd/apiserver-boot/boot/create_resource_version.go b/cmd/apiserver-boot/boot/create_resource_version.go
@@ -47,7 +47,7 @@ func RunCreateVersion(cmd *cobra.Command, args []string) {
 	}
 
 	if len(domain) == 0 {
-		log.Fatalf("apiserver-boot create-version requires the --domain flag")
+		domain = getDomain()
 	}
 	if len(groupName) == 0 {
 		log.Fatalf("apiserver-boot create-version requires the --group flag")

diff --git a/cmd/apiserver-boot/boot/util.go b/cmd/apiserver-boot/boot/util.go
@@ -23,8 +23,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"text/template"
+
 	"github.com/markbates/inflect"
 )
 
@@ -57,8 +59,8 @@ func writeIfNotFound(path, templateName, templateValue string, data interface{})
 
 	t := template.Must(template.New(templateName).Funcs(
 		template.FuncMap{
-			"title": strings.Title,
-			"lower": strings.ToLower,
+			"title":  strings.Title,
+			"lower":  strings.ToLower,
 			"plural": inflect.NewDefaultRuleset().Pluralize,
 		},
 	).Parse(templateValue))
@@ -107,6 +109,19 @@ func getCopyright() string {
 	}
 }
 
+func getDomain() string {
+	b, err := ioutil.ReadFile(filepath.Join("pkg", "apis", "doc.go"))
+	if err != nil {
+		log.Fatalf("Could not find pkg/apis/doc.go.  First run `apiserver-boot init --domain <domain>`.")
+	}
+	r := regexp.MustCompile("\\+domain=(.*)")
+	l := r.FindSubmatch(b)
+	if len(l) < 2 {
+		log.Fatalf("pkg/apis/doc.go does not contain the domain (// +domain=.*)", l)
+	}
+	return string(l[1])
+}
+
 func create(path string) {
 	f, err := os.Create(path)
 	if err != nil {