[Refactor] Add variadic argument to repoCreate to support templates

colinshum · colinshum · commit 99372f0dbc47 · 2020-08-28T15:02:08.000-04:00
diff --git a/pkg/cmd/repo/create/create.go b/pkg/cmd/repo/create/create.go
@@ -78,7 +78,7 @@ func NewCmdCreate(f *cmdutil.Factory, runF func(*CreateOptions) error) *cobra.Co
 			}
 
 			if opts.Template != "" && (opts.Homepage != "" || opts.Team != "" || !opts.EnableIssues || !opts.EnableWiki) {
-				return &cmdutil.FlagError{Err: errors.New(`the '--template' option is not supported with '--homepage, --team, --enable-issues or --enable-wiki'`)}
+				return &cmdutil.FlagError{Err: errors.New(`The '--template' option is not supported with '--homepage, --team, --enable-issues or --enable-wiki'`)}
 			}
 
 			return createRun(opts)
@@ -173,8 +173,7 @@ func createRun(opts *CreateOptions) error {
 		}
 	}
 
-	// find template ID
-
+	// Find template repo ID
 	if opts.Template != "" {
 		httpClient, err := opts.HttpClient()
 		if err != nil {
@@ -210,7 +209,6 @@ func createRun(opts *CreateOptions) error {
 		Visibility:       visibility,
 		OwnerID:          repoToCreate.RepoOwner(),
 		TeamID:           opts.Team,
-		RepositoryID:     opts.Template,
 		Description:      opts.Description,
 		HomepageURL:      opts.Homepage,
 		HasIssuesEnabled: opts.EnableIssues,
@@ -231,7 +229,7 @@ func createRun(opts *CreateOptions) error {
 	}
 
 	if opts.ConfirmSubmit {
-		repo, err := repoCreate(httpClient, repoToCreate.RepoHost(), input)
+		repo, err := repoCreate(httpClient, repoToCreate.RepoHost(), input, opts.Template)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cmd/repo/create/create_test.go b/pkg/cmd/repo/create/create_test.go
@@ -379,7 +379,7 @@ func TestRepoCreate_template(t *testing.T) {
 	}
 
 	if len(reg.Requests) != 3 {
-		t.Fatalf("expected 3 HTTP request, got %d", len(reg.Requests))
+		t.Fatalf("expected 3 HTTP requests, got %d", len(reg.Requests))
 	}
 
 	bodyBytes, _ := ioutil.ReadAll(reg.Requests[2].Body)
diff --git a/pkg/cmd/repo/create/http.go b/pkg/cmd/repo/create/http.go
@@ -14,8 +14,6 @@ type repoCreateInput struct {
 	HomepageURL string `json:"homepageUrl,omitempty"`
 	Description string `json:"description,omitempty"`
 
-	RepositoryID string `json:"repositoryId,omitempty"`
-
 	OwnerID string `json:"ownerId,omitempty"`
 	TeamID  string `json:"teamId,omitempty"`
 
@@ -33,7 +31,7 @@ type repoTemplateInput struct {
 }
 
 // repoCreate creates a new GitHub repository
-func repoCreate(client *http.Client, hostname string, input repoCreateInput) (*api.Repository, error) {
+func repoCreate(client *http.Client, hostname string, input repoCreateInput, templateRepositoryID string) (*api.Repository, error) {
 	apiClient := api.NewClientFromHTTP(client)
 
 	if input.TeamID != "" {
@@ -51,7 +49,7 @@ func repoCreate(client *http.Client, hostname string, input repoCreateInput) (*a
 		input.OwnerID = orgID
 	}
 
-	if input.RepositoryID != "" {
+	if templateRepositoryID != "" {
 		var response struct {
 			CloneTemplateRepository struct {
 				Repository api.Repository
@@ -70,7 +68,7 @@ func repoCreate(client *http.Client, hostname string, input repoCreateInput) (*a
 			Name:         input.Name,
 			Visibility:   input.Visibility,
 			OwnerID:      input.OwnerID,
-			RepositoryID: input.RepositoryID,
+			RepositoryID: templateRepositoryID,
 		}
 
 		variables := map[string]interface{}{
diff --git a/pkg/cmd/repo/create/http_test.go b/pkg/cmd/repo/create/http_test.go
@@ -21,7 +21,7 @@ func Test_RepoCreate(t *testing.T) {
 		HomepageURL: "http://example.com",
 	}
 
-	_, err := repoCreate(httpClient, "github.com", input)
+	_, err := repoCreate(httpClient, "github.com", input, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func NewCmdCreate(f cmdutil.Factory, runF func(CreateOptions) error) *cobra.Co`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if opts.Template != "" && (opts.Homepage != "" \|\| opts.Team != "" \|\| !opts.EnableIssues \|\| !opts.EnableWiki) {`
`81`		- return &cmdutil.FlagError{Err: errors.New(`the '--template' option is not supported with '--homepage, --team, --enable-issues or --enable-wiki'`)}
	`81`	+ return &cmdutil.FlagError{Err: errors.New(`The '--template' option is not supported with '--homepage, --team, --enable-issues or --enable-wiki'`)}
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`return createRun(opts)`
`@@ -173,8 +173,7 @@ func createRun(opts *CreateOptions) error {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- // find template ID`
`177`		`-`
	`176`	`+ // Find template repo ID`
`178`	`177`	`if opts.Template != "" {`
`179`	`178`	`httpClient, err := opts.HttpClient()`
`180`	`179`	`if err != nil {`
`@@ -210,7 +209,6 @@ func createRun(opts *CreateOptions) error {`
`210`	`209`	`Visibility: visibility,`
`211`	`210`	`OwnerID: repoToCreate.RepoOwner(),`
`212`	`211`	`TeamID: opts.Team,`
`213`		`- RepositoryID: opts.Template,`
`214`	`212`	`Description: opts.Description,`
`215`	`213`	`HomepageURL: opts.Homepage,`
`216`	`214`	`HasIssuesEnabled: opts.EnableIssues,`
`@@ -231,7 +229,7 @@ func createRun(opts *CreateOptions) error {`
`231`	`229`	`}`
`232`	`230`
`233`	`231`	`if opts.ConfirmSubmit {`
`234`		`- repo, err := repoCreate(httpClient, repoToCreate.RepoHost(), input)`
	`232`	`+ repo, err := repoCreate(httpClient, repoToCreate.RepoHost(), input, opts.Template)`
`235`	`233`	`if err != nil {`
`236`	`234`	`return err`
`237`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ func TestRepoCreate_template(t *testing.T) {`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`if len(reg.Requests) != 3 {`
`382`		`- t.Fatalf("expected 3 HTTP request, got %d", len(reg.Requests))`
	`382`	`+ t.Fatalf("expected 3 HTTP requests, got %d", len(reg.Requests))`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`bodyBytes, _ := ioutil.ReadAll(reg.Requests[2].Body)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func Test_RepoCreate(t *testing.T) {`
`21`	`21`	`HomepageURL: "http://example.com",`
`22`	`22`	`}`
`23`	`23`
`24`		`- _, err := repoCreate(httpClient, "github.com", input)`
	`24`	`+ _, err := repoCreate(httpClient, "github.com", input, "")`
`25`	`25`	`if err != nil {`
`26`	`26`	`t.Fatalf("unexpected error: %v", err)`
`27`	`27`	`}`