fix repo generation in org with license/ignore

vilmibm · vilmibm · commit 2723a01760e0 · 2021-06-30T17:21:58.000-05:00
diff --git a/pkg/cmd/repo/create/http.go b/pkg/cmd/repo/create/http.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/cli/cli/api"
 )
@@ -38,6 +39,9 @@ type repoTemplateInput struct {
 func repoCreate(client *http.Client, hostname string, input repoCreateInput, templateRepositoryID string) (*api.Repository, error) {
 	apiClient := api.NewClientFromHTTP(client)
 
+	ownerName := input.OwnerID
+	isOrg := false
+
 	if input.TeamID != "" {
 		orgID, teamID, err := resolveOrganizationTeam(apiClient, hostname, input.OwnerID, input.TeamID)
 		if err != nil {
@@ -46,7 +50,9 @@ func repoCreate(client *http.Client, hostname string, input repoCreateInput, tem
 		input.TeamID = teamID
 		input.OwnerID = orgID
 	} else if input.OwnerID != "" {
-		orgID, err := resolveOrganization(apiClient, hostname, input.OwnerID)
+		var orgID string
+		var err error
+		orgID, isOrg, err = resolveOrganization(apiClient, hostname, input.OwnerID)
 		if err != nil {
 			return nil, err
 		}
@@ -109,12 +115,19 @@ func repoCreate(client *http.Client, hostname string, input repoCreateInput, tem
 	}
 
 	if input.GitIgnoreTemplate != "" || input.LicenseTemplate != "" {
+		input.Visibility = strings.ToLower(input.Visibility)
 		body := &bytes.Buffer{}
 		enc := json.NewEncoder(body)
 		if err := enc.Encode(input); err != nil {
 			return nil, err
 		}
-		repo, err := api.CreateRepoTransformToV4(apiClient, hostname, "POST", "user/repos", body)
+
+		path := "user/repos"
+		if isOrg {
+			path = fmt.Sprintf("orgs/%s/repos", ownerName)
+		}
+
+		repo, err := api.CreateRepoTransformToV4(apiClient, hostname, "POST", path, body)
 		if err != nil {
 			return nil, err
 		}
@@ -141,12 +154,13 @@ func repoCreate(client *http.Client, hostname string, input repoCreateInput, tem
 }
 
 // using API v3 here because the equivalent in GraphQL needs `read:org` scope
-func resolveOrganization(client *api.Client, hostname, orgName string) (string, error) {
+func resolveOrganization(client *api.Client, hostname, orgName string) (string, bool, error) {
 	var response struct {
 		NodeID string `json:"node_id"`
+		Type   string
 	}
 	err := client.REST(hostname, "GET", fmt.Sprintf("users/%s", orgName), nil, &response)
-	return response.NodeID, err
+	return response.NodeID, response.Type == "Organization", err
 }
 
 // using API v3 here because the equivalent in GraphQL needs `read:org` scope
