Skip to content

Commit 6d0d8df

Browse files
mislavmislav
authored
Merge pull request #13 from cli/restore-non-dotcom-hosts
Restore forward compatibility with non-github.com hosts
2 parents 4f1b4d6 + 4b303c3 commit 6d0d8df

File tree

5 files changed

+226
-113
lines changed

5 files changed

+226
-113
lines changed

‎go.mod‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,27 @@ require (
88
)
99

1010
require (
11+
github.com/cli/safeexec v1.0.0 // indirect
12+
github.com/cli/shurcooL-graphql v0.0.3 // indirect
13+
github.com/henvic/httpretty v0.0.6 // indirect
1114
github.com/inconshreveable/mousetrap v1.0.0 // indirect
15+
github.com/kr/text v0.2.0 // indirect
16+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
17+
github.com/mattn/go-isatty v0.0.16 // indirect
18+
github.com/mattn/go-runewidth v0.0.13 // indirect
19+
github.com/muesli/termenv v0.12.0 // indirect
20+
github.com/rivo/uniseg v0.2.0 // indirect
1221
github.com/spf13/pflag v1.0.5 // indirect
22+
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e // indirect
23+
golang.org/x/net v0.7.0 // indirect
24+
golang.org/x/sys v0.5.0 // indirect
25+
golang.org/x/term v0.5.0 // indirect
26+
gopkg.in/yaml.v3 v3.0.1 // indirect
1327
)
1428

15-
require github.com/gorilla/websocket v1.5.0
29+
require (
30+
github.com/cli/go-gh/v2 v2.0.0
31+
github.com/gorilla/websocket v1.5.0
32+
)
1633

1734
replace golang.org/x/crypto => github.com/cli/crypto v0.0.0-20210929142629-6be313f59b03

‎go.sum‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,63 @@
11
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
22
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
3+
github.com/cli/go-gh/v2 v2.0.0 h1:JAgQY7VNHletsO0Eqr+/PzF7fF5QEjhY2t2+Tev3vmk=
4+
github.com/cli/go-gh/v2 v2.0.0/go.mod h1:2/ox3Dnc8wDBT5bnTAH1aKGy6Qt1ztlFBe10EufnvoA=
5+
github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
6+
github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
7+
github.com/cli/shurcooL-graphql v0.0.3 h1:CtpPxyGDs136/+ZeyAfUKYmcQBjDlq5aqnrDCW5Ghh8=
8+
github.com/cli/shurcooL-graphql v0.0.3/go.mod h1:tlrLmw/n5Q/+4qSvosT+9/W5zc8ZMjnJeYBxSdb4nWA=
39
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
10+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
11+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
412
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
513
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
14+
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
15+
github.com/henvic/httpretty v0.0.6 h1:JdzGzKZBajBfnvlMALXXMVQWxWMF/ofTy8C3/OSUTxs=
16+
github.com/henvic/httpretty v0.0.6/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo=
617
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
718
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
19+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
20+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
21+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
22+
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
23+
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
24+
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
25+
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
26+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
27+
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
28+
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
29+
github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc=
30+
github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
31+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
32+
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
33+
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
834
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
935
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
1036
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
1137
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
1238
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
39+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
40+
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e h1:BuzhfgfWQbX0dWzYzT1zsORLnHRv3bcRcsaUk0VmXA8=
41+
github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e/go.mod h1:/Tnicc6m/lsJE0irFMA0LfIwTBo4QP7A8IfyIv4zZKI=
42+
golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
43+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
44+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
45+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
46+
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
47+
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
48+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
49+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
50+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
51+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
52+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
53+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
54+
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
55+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
56+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
57+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
1358
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
59+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
60+
gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
1461
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
62+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
63+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
func main() {
10-
if err := webhook.NewCmdForward(nil).Execute(); err != nil {
10+
if err := webhook.NewCmdForward().Execute(); err != nil {
1111
os.Exit(1)
1212
}
1313
}

‎webhook/create_webhook.go‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
package webhook
2+
3+
import (
4+
"bytes"
5+
"encoding/json"
6+
"errors"
7+
"fmt"
8+
"net/http"
9+
"strings"
10+
11+
"github.com/cli/go-gh/v2/pkg/api"
12+
"github.com/cli/go-gh/v2/pkg/auth"
13+
)
14+
15+
type createHookRequest struct {
16+
Name string `json:"name"`
17+
Events []string `json:"events"`
18+
Active bool `json:"active"`
19+
Config hookConfig `json:"config"`
20+
}
21+
22+
type hookConfig struct {
23+
ContentType string `json:"content_type"`
24+
InsecureSSL string `json:"insecure_ssl"`
25+
URL string `json:"url"`
26+
Secret string `json:"secret,omitempty"`
27+
}
28+
29+
type createHookResponse struct {
30+
Active bool `json:"active"`
31+
Config hookConfig `json:"config"`
32+
Events []string `json:"events"`
33+
ID int `json:"id"`
34+
Name string `json:"name"`
35+
URL string `json:"url"`
36+
WsURL string `json:"ws_url"`
37+
}
38+
39+
type hookOptions struct {
40+
gitHubHost string
41+
authToken string
42+
eventTypes []string
43+
repo string
44+
org string
45+
secret string
46+
}
47+
48+
// createHook issues a request against the GitHub API to create a dev webhook
49+
func createHook(o *hookOptions) (string, func() error, error) {
50+
apiClient, err := api.NewRESTClient(api.ClientOptions{
51+
Host: o.gitHubHost,
52+
AuthToken: o.authToken,
53+
})
54+
if err != nil {
55+
return "", nil, fmt.Errorf("error creating REST client: %w", err)
56+
}
57+
path := fmt.Sprintf("repos/%s/hooks", o.repo)
58+
if o.org != "" {
59+
path = fmt.Sprintf("orgs/%s/hooks", o.org)
60+
}
61+
62+
req := createHookRequest{
63+
Name: "cli",
64+
Events: o.eventTypes,
65+
Active: false,
66+
Config: hookConfig{
67+
ContentType: "json",
68+
InsecureSSL: "0",
69+
Secret: o.secret,
70+
},
71+
}
72+
73+
reqBytes, err := json.Marshal(req)
74+
if err != nil {
75+
return "", nil, err
76+
}
77+
var res createHookResponse
78+
err = apiClient.Post(path, bytes.NewReader(reqBytes), &res)
79+
if err != nil {
80+
var apierr *api.HTTPError
81+
if errors.As(err, &apierr) && apierr.StatusCode == http.StatusForbidden {
82+
return "", nil, fmt.Errorf("you do not have access to this feature")
83+
}
84+
return "", nil, fmt.Errorf("error creating webhook: %w", err)
85+
}
86+
87+
return res.WsURL, func() error {
88+
err := apiClient.Patch(res.URL, strings.NewReader(`{"active": true}`), nil)
89+
if err != nil {
90+
return fmt.Errorf("error activating webhook: %w", err)
91+
}
92+
return nil
93+
}, nil
94+
}
95+
96+
func authTokenForHost(host string) (string, error) {
97+
token, _ := auth.TokenForHost(host)
98+
if token == "" {
99+
return "", fmt.Errorf("gh auth token not found for host %q", host)
100+
}
101+
return token, nil
102+
}

0 commit comments

Comments
 (0)