* Remove `Internal` from `gh repo create` prompt when owner is not an org Closes #9464 Internal repos only exist for organizations, so when a user selects their personal namespace to create a repo using `gh repo create`, `Internal` should not be an option in the `Visibility` prompt. This should avoid the additional quirk where if the user selects `Internal` while creating a personal repo and then proceeds to add any of the README, .gitignore, or LICENSE files prompted for later, the repo will not error and instead get created as a `Public` repo. This has the potential for a user to unknowingly leak sensitive info intended to go into a non-public repo. * Refactor prompter with test coverage By extracting the repo visibility options to its own function, getRepoVisibilityOptions, we're able to directly test the behavior introduced with this change. This breaks the testing pattern established here thus far, but may be a good example of the direction we should explore for a future refactor. * Add failing tests to check for error with internal vis in non-org repos There is a bug in the code, currently, where a user repo can attempt to be created as with `--internal` visibility flag when that is not an option for non-org repos. It fails at the API level if the --gitignore, --license, or --add-readme flags are not included, but silently falls back to Public visibility if one of them is included. Because this bug already existed, this commit adds the tests to ensure that both scenarios described above are captured accurately by the test suite. A fix for the latter scenario will be coming in a future commit * Add Exclude to httpmock registry and implement in Test_repoCreate Upon attempting to make the previous commit pass, I realized that it was actually impossible to test what I wanted to. The tests in the previous commit were behaving as expected given the bug that commit described, but upon attempting to implement a solution I realized that the tests were only testing the mocks and not the code functionality itself. Essentially, when the code to fix the bug was implemented, the tests were failing because the mocks required to test the buggy behavior were no longer being called. To make the tests pass, I'd have to rewrite them, but were I to remove the bug fix, the tests would no longer fail. This pointed me to a gap in our httpmocks - the ability to intentionally exclude api calls. The behavior I'm trying to test, here, is that we stop executing when a certain condition is met, and therefore won't make any subsequent api calls down the chain. This implements the Exclude method on the registry such that it will fail if an excluded api pattern is called. I have refactored the tests in Test_repoCreate to use the Exclude mock for testing. * Add error if user attempts to create repo with --internal flag This was previously failing at either the API if no other flags were included or falling back to creating a public repo if one of gitignore, license, or add-readme were included. * Add testing for error messages in gh repo create In the previous commits, we've introduced a new error when a user tries to create an Internal repo not owned by an organization. This adds tests to verify that the error we are getting is, in fact, the one associated with this use case and not some random error.
252 lines
5.9 KiB
Go
252 lines
5.9 KiB
Go
package httpmock
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
type Matcher func(req *http.Request) bool
|
|
type Responder func(req *http.Request) (*http.Response, error)
|
|
|
|
type Stub struct {
|
|
matched bool
|
|
Matcher Matcher
|
|
Responder Responder
|
|
exclude bool
|
|
}
|
|
|
|
func MatchAny(*http.Request) bool {
|
|
return true
|
|
}
|
|
|
|
// REST returns a matcher to a request for the HTTP method and URL escaped path p.
|
|
// For example, to match a GET request to `/api/v3/repos/octocat/hello-world/`
|
|
// use REST("GET", "api/v3/repos/octocat/hello-world")
|
|
// To match a GET request to `/user` use REST("GET", "user")
|
|
func REST(method, p string) Matcher {
|
|
return func(req *http.Request) bool {
|
|
if !strings.EqualFold(req.Method, method) {
|
|
return false
|
|
}
|
|
return req.URL.EscapedPath() == "/"+p
|
|
}
|
|
}
|
|
|
|
func GraphQL(q string) Matcher {
|
|
re := regexp.MustCompile(q)
|
|
|
|
return func(req *http.Request) bool {
|
|
if !strings.EqualFold(req.Method, "POST") {
|
|
return false
|
|
}
|
|
if req.URL.Path != "/graphql" && req.URL.Path != "/api/graphql" {
|
|
return false
|
|
}
|
|
|
|
var bodyData struct {
|
|
Query string
|
|
}
|
|
_ = decodeJSONBody(req, &bodyData)
|
|
|
|
return re.MatchString(bodyData.Query)
|
|
}
|
|
}
|
|
|
|
func GraphQLMutationMatcher(q string, cb func(map[string]interface{}) bool) Matcher {
|
|
re := regexp.MustCompile(q)
|
|
|
|
return func(req *http.Request) bool {
|
|
if !strings.EqualFold(req.Method, "POST") {
|
|
return false
|
|
}
|
|
if req.URL.Path != "/graphql" && req.URL.Path != "/api/graphql" {
|
|
return false
|
|
}
|
|
|
|
var bodyData struct {
|
|
Query string
|
|
Variables struct {
|
|
Input map[string]interface{}
|
|
}
|
|
}
|
|
_ = decodeJSONBody(req, &bodyData)
|
|
|
|
if re.MatchString(bodyData.Query) {
|
|
return cb(bodyData.Variables.Input)
|
|
}
|
|
|
|
return false
|
|
}
|
|
}
|
|
|
|
func QueryMatcher(method string, path string, query url.Values) Matcher {
|
|
return func(req *http.Request) bool {
|
|
if !REST(method, path)(req) {
|
|
return false
|
|
}
|
|
|
|
actualQuery := req.URL.Query()
|
|
|
|
for param := range query {
|
|
if !(actualQuery.Get(param) == query.Get(param)) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
}
|
|
|
|
func readBody(req *http.Request) ([]byte, error) {
|
|
bodyCopy := &bytes.Buffer{}
|
|
r := io.TeeReader(req.Body, bodyCopy)
|
|
req.Body = io.NopCloser(bodyCopy)
|
|
return io.ReadAll(r)
|
|
}
|
|
|
|
func decodeJSONBody(req *http.Request, dest interface{}) error {
|
|
b, err := readBody(req)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return json.Unmarshal(b, dest)
|
|
}
|
|
|
|
func StringResponse(body string) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
return httpResponse(200, req, bytes.NewBufferString(body)), nil
|
|
}
|
|
}
|
|
|
|
func WithHost(matcher Matcher, host string) Matcher {
|
|
return func(req *http.Request) bool {
|
|
if !strings.EqualFold(req.Host, host) {
|
|
return false
|
|
}
|
|
return matcher(req)
|
|
}
|
|
}
|
|
|
|
func WithHeader(responder Responder, header string, value string) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
resp, _ := responder(req)
|
|
if resp.Header == nil {
|
|
resp.Header = make(http.Header)
|
|
}
|
|
resp.Header.Set(header, value)
|
|
return resp, nil
|
|
}
|
|
}
|
|
|
|
func StatusStringResponse(status int, body string) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
return httpResponse(status, req, bytes.NewBufferString(body)), nil
|
|
}
|
|
}
|
|
|
|
func JSONResponse(body interface{}) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
b, _ := json.Marshal(body)
|
|
header := http.Header{
|
|
"Content-Type": []string{"application/json"},
|
|
}
|
|
return httpResponseWithHeader(200, req, bytes.NewBuffer(b), header), nil
|
|
}
|
|
}
|
|
|
|
func StatusJSONResponse(status int, body interface{}) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
b, _ := json.Marshal(body)
|
|
header := http.Header{
|
|
"Content-Type": []string{"application/json"},
|
|
}
|
|
return httpResponseWithHeader(status, req, bytes.NewBuffer(b), header), nil
|
|
}
|
|
}
|
|
|
|
func FileResponse(filename string) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
f, err := os.Open(filename)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return httpResponse(200, req, f), nil
|
|
}
|
|
}
|
|
|
|
func RESTPayload(responseStatus int, responseBody string, cb func(payload map[string]interface{})) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
bodyData := make(map[string]interface{})
|
|
err := decodeJSONBody(req, &bodyData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cb(bodyData)
|
|
return httpResponse(responseStatus, req, bytes.NewBufferString(responseBody)), nil
|
|
}
|
|
}
|
|
|
|
func GraphQLMutation(body string, cb func(map[string]interface{})) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
var bodyData struct {
|
|
Variables struct {
|
|
Input map[string]interface{}
|
|
}
|
|
}
|
|
err := decodeJSONBody(req, &bodyData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cb(bodyData.Variables.Input)
|
|
|
|
return httpResponse(200, req, bytes.NewBufferString(body)), nil
|
|
}
|
|
}
|
|
|
|
func GraphQLQuery(body string, cb func(string, map[string]interface{})) Responder {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
var bodyData struct {
|
|
Query string
|
|
Variables map[string]interface{}
|
|
}
|
|
err := decodeJSONBody(req, &bodyData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cb(bodyData.Query, bodyData.Variables)
|
|
|
|
return httpResponse(200, req, bytes.NewBufferString(body)), nil
|
|
}
|
|
}
|
|
|
|
func ScopesResponder(scopes string) func(*http.Request) (*http.Response, error) {
|
|
return func(req *http.Request) (*http.Response, error) {
|
|
return &http.Response{
|
|
StatusCode: 200,
|
|
Request: req,
|
|
Header: map[string][]string{
|
|
"X-Oauth-Scopes": {scopes},
|
|
},
|
|
Body: io.NopCloser(bytes.NewBufferString("")),
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
func httpResponse(status int, req *http.Request, body io.Reader) *http.Response {
|
|
return httpResponseWithHeader(status, req, body, http.Header{})
|
|
}
|
|
|
|
func httpResponseWithHeader(status int, req *http.Request, body io.Reader, header http.Header) *http.Response {
|
|
return &http.Response{
|
|
StatusCode: status,
|
|
Request: req,
|
|
Body: io.NopCloser(body),
|
|
Header: header,
|
|
}
|
|
}
|