Skip to content

Commit d0d2d54

Browse files
ecrupperecrupper
committed
use constant for transferred action
1 parent 3b6bfcc commit d0d2d54

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎api/webhook/post.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ func handleRepositoryEvent(c *gin.Context, m *types.Metadata, h *library.Hook, r
714714

715715
switch h.GetEventAction() {
716716
// if action is rename, go through rename routine
717-
case constants.ActionRenamed, "transferred":
717+
case constants.ActionRenamed, constants.ActionTransferred:
718718
r, err := renameRepository(h, r, c, m)
719719
if err != nil {
720720
h.SetStatus(constants.StatusFailure)

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/DATA-DOG/go-sqlmock v1.5.0
88
github.com/Masterminds/semver/v3 v3.2.1
99
github.com/Masterminds/sprig/v3 v3.2.3
10-
github.com/adhocore/gronx v1.6.2
10+
github.com/adhocore/gronx v1.6.3
1111
github.com/alicebob/miniredis/v2 v2.30.2
1212
github.com/aws/aws-sdk-go v1.44.248
1313
github.com/buildkite/yaml v0.0.0-20181016232759-0caa5f0796e3
1414
github.com/drone/envsubst v1.0.3
1515
github.com/gin-gonic/gin v1.9.0
1616
github.com/go-playground/assert/v2 v2.2.0
17-
github.com/go-vela/types v0.19.3-0.20230523200921-35a0d5fc088c
17+
github.com/go-vela/types v0.19.3-0.20230613152541-33175204a6a9
1818
github.com/golang-jwt/jwt/v5 v5.0.0
1919
github.com/google/go-cmp v0.5.9
2020
github.com/google/go-github/v52 v52.0.0
@@ -87,12 +87,12 @@ require (
8787
github.com/json-iterator/go v1.1.12 // indirect
8888
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
8989
github.com/leodido/go-urn v1.2.1 // indirect
90-
github.com/lib/pq v1.10.8 // indirect
90+
github.com/lib/pq v1.10.9 // indirect
9191
github.com/mattn/go-colorable v0.1.8 // indirect
9292
github.com/mattn/go-isatty v0.0.17 // indirect
9393
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
9494
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
95-
github.com/microcosm-cc/bluemonday v1.0.23 // indirect
95+
github.com/microcosm-cc/bluemonday v1.0.24 // indirect
9696
github.com/mitchellh/copystructure v1.0.0 // indirect
9797
github.com/mitchellh/go-homedir v1.1.0 // indirect
9898
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -114,8 +114,8 @@ require (
114114
github.com/yuin/gopher-lua v1.1.0 // indirect
115115
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
116116
golang.org/x/crypto v0.7.0 // indirect
117-
golang.org/x/net v0.9.0 // indirect
118-
golang.org/x/sys v0.7.0 // indirect
117+
golang.org/x/net v0.10.0 // indirect
118+
golang.org/x/sys v0.8.0 // indirect
119119
golang.org/x/text v0.9.0 // indirect
120120
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
121121
google.golang.org/appengine v1.6.7 // indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
5757
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
5858
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
5959
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
60-
github.com/adhocore/gronx v1.6.2 h1:/Pg6cuHFJmUGRIYWhRFjb6iL9fdzNmoMPj+/r6L01KU=
61-
github.com/adhocore/gronx v1.6.2/go.mod h1:7oUY1WAU8rEJWmAxXR2DN0JaO4gi9khSgKjiRypqteg=
60+
github.com/adhocore/gronx v1.6.3 h1:bnm5vieTrY3QQPpsfB0hrAaeaHDpuZTUC2LLCVMLe9c=
61+
github.com/adhocore/gronx v1.6.3/go.mod h1:7oUY1WAU8rEJWmAxXR2DN0JaO4gi9khSgKjiRypqteg=
6262
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
6363
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
6464
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
@@ -138,8 +138,8 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
138138
github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
139139
github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
140140
github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
141-
github.com/go-vela/types v0.19.3-0.20230523200921-35a0d5fc088c h1:eAApIK5e5MxFF8RzZAFsvTSdwq/AzdUrdhJHOGQ0ILc=
142-
github.com/go-vela/types v0.19.3-0.20230523200921-35a0d5fc088c/go.mod h1:0lsuPfGyVyTWJSi2h3NS6uaEW6DgnFvIzaZu1sXYKrs=
141+
github.com/go-vela/types v0.19.3-0.20230613152541-33175204a6a9 h1:OrIfCWfw1KZRrsAPpbF8zS0MuI2+msZBR1KatlyeWeg=
142+
github.com/go-vela/types v0.19.3-0.20230613152541-33175204a6a9/go.mod h1:1ZSmKWX9MamKogwaIb53mzzRpZMV34mJFKiGfVFadFk=
143143
github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
144144
github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
145145
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -293,8 +293,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
293293
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
294294
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
295295
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
296-
github.com/lib/pq v1.10.8 h1:3fdt97i/cwSU83+E0hZTC/Xpc9mTZxc6UWSCRcSbxiE=
297-
github.com/lib/pq v1.10.8/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
296+
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
297+
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
298298
github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
299299
github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
300300
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -309,8 +309,8 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJK
309309
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
310310
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
311311
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
312-
github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=
313-
github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
312+
github.com/microcosm-cc/bluemonday v1.0.24 h1:NGQoPtwGVcbGkKfvyYk1yRqknzBuoMiUrO6R7uFTPlw=
313+
github.com/microcosm-cc/bluemonday v1.0.24/go.mod h1:ArQySAMps0790cHSkdPEJ7bGkF2VePWH773hsJNSHf8=
314314
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
315315
github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
316316
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -486,8 +486,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
486486
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
487487
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
488488
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
489-
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
490-
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
489+
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
490+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
491491
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
492492
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
493493
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -558,8 +558,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
558558
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
559559
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
560560
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
561-
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
562-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
561+
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
562+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
563563
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
564564
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
565565
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎scm/github/webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,13 @@ func (c *client) processRepositoryEvent(h *library.Hook, payload *github.Reposit
465465
r.SetTopics(repo.Topics)
466466

467467
// if action is renamed, then get the previous name from payload
468-
if payload.GetAction() == "renamed" {
468+
if payload.GetAction() == constants.ActionRenamed {
469469
r.SetPreviousName(repo.GetOwner().GetLogin() + "/" + payload.GetChanges().GetRepo().GetName().GetFrom())
470470
}
471471

472472
// if action is transferred, then get the previous owner from payload
473473
// could be a user or an org, but both are User structs
474-
if payload.GetAction() == "transferred" {
474+
if payload.GetAction() == constants.ActionTransferred {
475475
org := payload.GetChanges().GetOwner().GetOwnerInfo().GetOrg()
476476
if org == nil {
477477
org = payload.GetChanges().GetOwner().GetOwnerInfo().GetUser()

‎scm/github/webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ func TestGitHub_ProcessWebhook_RepositoryTransfer(t *testing.T) {
10331033
wantHook.SetCreated(time.Now().UTC().Unix())
10341034
wantHook.SetHost("github.com")
10351035
wantHook.SetEvent(constants.EventRepository)
1036-
wantHook.SetEventAction("transferred")
1036+
wantHook.SetEventAction(constants.ActionTransferred)
10371037
wantHook.SetBranch("master")
10381038
wantHook.SetStatus(constants.StatusSuccess)
10391039
wantHook.SetLink("https://github.com/Codertocat/Hello-World/settings/hooks")

0 commit comments

Comments
 (0)