Skip to content

Commit 1728dce

Browse files
jbrockoppjbrockopp
committed
Merge branch 'master' of github.com:go-vela/server
2 parents 175e5c5 + cd5cfd8 commit 1728dce

File tree

7 files changed

+162
-41
lines changed

7 files changed

+162
-41
lines changed

‎api/repo.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ func GetRepos(c *gin.Context) {
393393
c.JSON(http.StatusOK, r)
394394
}
395395

396-
// swagger:operation GET /api/v1/{org} repos GetOrgRepos
396+
// swagger:operation GET /api/v1/repos/{org} repos GetOrgRepos
397397
//
398398
// Get all repos for the provided org in the configured backend
399399
//

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ require (
88
github.com/Masterminds/semver/v3 v3.1.1
99
github.com/Masterminds/sprig/v3 v3.2.2
1010
github.com/alicebob/miniredis/v2 v2.21.0
11-
github.com/aws/aws-sdk-go v1.44.17
11+
github.com/aws/aws-sdk-go v1.44.30
1212
github.com/buildkite/yaml v0.0.0-20181016232759-0caa5f0796e3
1313
github.com/drone/envsubst v1.0.3
14-
github.com/gin-gonic/gin v1.8.0
14+
github.com/gin-gonic/gin v1.8.1
1515
github.com/go-playground/assert/v2 v2.0.1
1616
github.com/go-redis/redis/v8 v8.11.5
17-
github.com/go-vela/types v0.14.0-rc1.0.20220518151947-0cf0e4753e74
17+
github.com/go-vela/types v0.14.0-rc2
1818
github.com/golang-jwt/jwt/v4 v4.4.1
1919
github.com/google/go-cmp v0.5.8
2020
github.com/google/go-github/v44 v44.1.0
@@ -31,13 +31,13 @@ require (
3131
github.com/spf13/afero v1.8.2
3232
github.com/urfave/cli/v2 v2.8.1
3333
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd
34-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
34+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
3535
gopkg.in/square/go-jose.v2 v2.6.0
3636
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
37-
gorm.io/driver/postgres v1.3.5
38-
gorm.io/driver/sqlite v1.3.2
37+
gorm.io/driver/postgres v1.3.7
38+
gorm.io/driver/sqlite v1.3.4
3939
gorm.io/gorm v1.23.5
40-
k8s.io/apimachinery v0.24.0
40+
k8s.io/apimachinery v0.24.1
4141
)
4242

4343
require (
@@ -86,19 +86,19 @@ require (
8686
github.com/huandu/xstrings v1.3.2 // indirect
8787
github.com/imdario/mergo v0.3.11 // indirect
8888
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
89-
github.com/jackc/pgconn v1.12.0 // indirect
89+
github.com/jackc/pgconn v1.12.1 // indirect
9090
github.com/jackc/pgio v1.0.0 // indirect
9191
github.com/jackc/pgpassfile v1.0.0 // indirect
9292
github.com/jackc/pgproto3/v2 v2.3.0 // indirect
9393
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
9494
github.com/jackc/pgtype v1.11.0 // indirect
95-
github.com/jackc/pgx/v4 v4.16.0 // indirect
95+
github.com/jackc/pgx/v4 v4.16.1 // indirect
9696
github.com/jinzhu/inflection v1.0.0 // indirect
9797
github.com/jinzhu/now v1.1.5 // indirect
9898
github.com/jmespath/go-jmespath v0.4.0 // indirect
9999
github.com/json-iterator/go v1.1.12 // indirect
100100
github.com/leodido/go-urn v1.2.1 // indirect
101-
github.com/lib/pq v1.10.5 // indirect
101+
github.com/lib/pq v1.10.6 // indirect
102102
github.com/mattn/go-colorable v0.1.8 // indirect
103103
github.com/mattn/go-isatty v0.0.14 // indirect
104104
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
7676
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
7777
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
7878
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
79-
github.com/aws/aws-sdk-go v1.44.17 h1:of8MirZuVDat3BJgRbSwDO/GM/cgXh5Znf2tyEAv/vE=
80-
github.com/aws/aws-sdk-go v1.44.17/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
79+
github.com/aws/aws-sdk-go v1.44.30 h1:w7sTp6jFWRaZCDg08fUx8X4IOU4sgbCR+e+1qSmf+bc=
80+
github.com/aws/aws-sdk-go v1.44.30/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
8181
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
8282
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
8383
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -146,8 +146,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
146146
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
147147
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
148148
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
149-
github.com/gin-gonic/gin v1.8.0 h1:4WFH5yycBMA3za5Hnl425yd9ymdw1XPm4666oab+hv4=
150-
github.com/gin-gonic/gin v1.8.0/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
149+
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
150+
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
151151
github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
152152
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
153153
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -181,8 +181,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
181181
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
182182
github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
183183
github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
184-
github.com/go-vela/types v0.14.0-rc1.0.20220518151947-0cf0e4753e74 h1:AQoqAPwpVzP23G2sk7OUM7cRFEi1Rl5FIEcshJ6tzTI=
185-
github.com/go-vela/types v0.14.0-rc1.0.20220518151947-0cf0e4753e74/go.mod h1:g2C+XdTuq2hzrsEUt+jVLLqmhgogoXryQEok3EK3HkE=
184+
github.com/go-vela/types v0.14.0-rc2 h1:LrThnunJJHAyPyL8gc8CNxquIKQ8AjtVntSD0JHdRzY=
185+
github.com/go-vela/types v0.14.0-rc2/go.mod h1:Z/94BulwLbd+bSiPVJEUNdQxB1EP2JCYWaBsv/d65vs=
186186
github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
187187
github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
188188
github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
@@ -352,8 +352,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU
352352
github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
353353
github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
354354
github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
355-
github.com/jackc/pgconn v1.12.0 h1:/RvQ24k3TnNdfBSW0ou9EOi5jx2cX7zfE8n2nLKuiP0=
356-
github.com/jackc/pgconn v1.12.0/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono=
355+
github.com/jackc/pgconn v1.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8=
356+
github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono=
357357
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
358358
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
359359
github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
@@ -384,8 +384,8 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08
384384
github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
385385
github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
386386
github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
387-
github.com/jackc/pgx/v4 v4.16.0 h1:4k1tROTJctHotannFYzu77dY3bgtMRymQP7tXQjqpPk=
388-
github.com/jackc/pgx/v4 v4.16.0/go.mod h1:N0A9sFdWzkw/Jy1lwoiB64F2+ugFZi987zRxcPez/wI=
387+
github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
388+
github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
389389
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
390390
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
391391
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
@@ -438,8 +438,8 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
438438
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
439439
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
440440
github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
441-
github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ=
442-
github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
441+
github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
442+
github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
443443
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
444444
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
445445
github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
@@ -741,8 +741,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
741741
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
742742
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
743743
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
744-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
745-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
744+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 h1:zwrSfklXn0gxyLRX/aR+q6cgHbV/ItVyzbPlbA+dkAw=
745+
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
746746
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
747747
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
748748
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1034,10 +1034,10 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
10341034
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
10351035
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
10361036
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1037-
gorm.io/driver/postgres v1.3.5 h1:oVLmefGqBTlgeEVG6LKnH6krOlo4TZ3Q/jIK21KUMlw=
1038-
gorm.io/driver/postgres v1.3.5/go.mod h1:EGCWefLFQSVFrHGy4J8EtiHCWX5Q8t0yz2Jt9aKkGzU=
1039-
gorm.io/driver/sqlite v1.3.2 h1:nWTy4cE52K6nnMhv23wLmur9Y3qWbZvOBz+V4PrGAxg=
1040-
gorm.io/driver/sqlite v1.3.2/go.mod h1:B+8GyC9K7VgzJAcrcXMRPdnMcck+8FgJynEehEPM16U=
1037+
gorm.io/driver/postgres v1.3.7 h1:FKF6sIMDHDEvvMF/XJvbnCl0nu6KSKUaPXevJ4r+VYQ=
1038+
gorm.io/driver/postgres v1.3.7/go.mod h1:f02ympjIcgtHEGFMZvdgTxODZ9snAHDb4hXfigBVuNI=
1039+
gorm.io/driver/sqlite v1.3.4 h1:NnFOPVfzi4CPsJPH4wXr6rMkPb4ElHEqKMvrsx9c9Fk=
1040+
gorm.io/driver/sqlite v1.3.4/go.mod h1:B+8GyC9K7VgzJAcrcXMRPdnMcck+8FgJynEehEPM16U=
10411041
gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
10421042
gorm.io/gorm v1.23.5 h1:TnlF26wScKSvknUC/Rn8t0NLLM22fypYBlvj1+aH6dM=
10431043
gorm.io/gorm v1.23.5/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
@@ -1048,8 +1048,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
10481048
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
10491049
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10501050
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1051-
k8s.io/apimachinery v0.24.0 h1:ydFCyC/DjCvFCHK5OPMKBlxayQytB8pxy8YQInd5UyQ=
1052-
k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
1051+
k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I=
1052+
k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
10531053
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
10541054
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
10551055
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

‎router/middleware/pipeline/pipeline.go‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ import (
99
"net/http"
1010

1111
"github.com/gin-gonic/gin"
12+
"github.com/go-vela/server/compiler"
1213
"github.com/go-vela/server/database"
1314
"github.com/go-vela/server/router/middleware/org"
1415
"github.com/go-vela/server/router/middleware/repo"
1516
"github.com/go-vela/server/router/middleware/user"
17+
"github.com/go-vela/server/scm"
1618
"github.com/go-vela/server/util"
19+
"github.com/go-vela/types"
1720
"github.com/go-vela/types/library"
1821
"github.com/sirupsen/logrus"
1922
)
@@ -47,6 +50,8 @@ func Establish() gin.HandlerFunc {
4750
return
4851
}
4952

53+
entry := fmt.Sprintf("%s/%s", r.GetFullName(), p)
54+
5055
// update engine logger with API metadata
5156
//
5257
// https://pkg.go.dev/github.com/sirupsen/logrus?tab=doc#Entry.WithFields
@@ -55,15 +60,34 @@ func Establish() gin.HandlerFunc {
5560
"pipeline": p,
5661
"repo": r.GetName(),
5762
"user": u.GetName(),
58-
}).Debugf("reading pipeline %s/%s", r.GetFullName(), p)
63+
}).Debugf("reading pipeline %s", entry)
5964

6065
pipeline, err := database.FromContext(c).GetPipelineForRepo(p, r)
61-
if err != nil {
62-
retErr := fmt.Errorf("unable to read pipeline %s/%s: %w", r.GetFullName(), p, err)
63-
64-
util.HandleError(c, http.StatusNotFound, retErr)
65-
66-
return
66+
if err != nil { // assume the pipeline doesn't exist in the database yet (before pipeline support was added)
67+
// send API call to capture the pipeline configuration file
68+
config, err := scm.FromContext(c).ConfigBackoff(u, r, p)
69+
if err != nil {
70+
retErr := fmt.Errorf("unable to get pipeline configuration for %s: %w", entry, err)
71+
72+
util.HandleError(c, http.StatusNotFound, retErr)
73+
74+
return
75+
}
76+
77+
// parse and compile the pipeline configuration file
78+
_, pipeline, err = compiler.FromContext(c).
79+
Duplicate().
80+
WithMetadata(c.MustGet("metadata").(*types.Metadata)).
81+
WithRepo(r).
82+
WithUser(u).
83+
Compile(config)
84+
if err != nil {
85+
retErr := fmt.Errorf("unable to compile pipeline configuration for %s: %w", entry, err)
86+
87+
util.HandleError(c, http.StatusInternalServerError, retErr)
88+
89+
return
90+
}
6791
}
6892

6993
ToContext(c, pipeline)

‎router/middleware/pipeline/pipeline_test.go‎

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,28 @@
55
package pipeline
66

77
import (
8+
"flag"
9+
"fmt"
810
"net/http"
911
"net/http/httptest"
1012
"reflect"
1113
"testing"
14+
"time"
1215

1316
"github.com/gin-gonic/gin"
17+
"github.com/go-vela/server/compiler"
18+
"github.com/go-vela/server/compiler/native"
1419
"github.com/go-vela/server/database"
1520
"github.com/go-vela/server/database/sqlite"
1621
"github.com/go-vela/server/router/middleware/org"
1722
"github.com/go-vela/server/router/middleware/repo"
23+
"github.com/go-vela/server/router/middleware/token"
24+
"github.com/go-vela/server/router/middleware/user"
25+
"github.com/go-vela/server/scm"
26+
"github.com/go-vela/server/scm/github"
27+
"github.com/go-vela/types"
1828
"github.com/go-vela/types/library"
29+
"github.com/urfave/cli/v2"
1930
)
2031

2132
func TestPipeline_Retrieve(t *testing.T) {
@@ -197,6 +208,8 @@ func TestPipeline_Establish_NoPipelineParameter(t *testing.T) {
197208

198209
func TestPipeline_Establish_NoPipeline(t *testing.T) {
199210
// setup types
211+
secret := "superSecret"
212+
200213
r := new(library.Repo)
201214
r.SetID(1)
202215
r.SetUserID(1)
@@ -206,28 +219,86 @@ func TestPipeline_Establish_NoPipeline(t *testing.T) {
206219
r.SetFullName("foo/bar")
207220
r.SetVisibility("public")
208221

222+
u := new(library.User)
223+
u.SetID(1)
224+
u.SetName("foo")
225+
u.SetToken("bar")
226+
u.SetHash("baz")
227+
u.SetAdmin(true)
228+
229+
m := &types.Metadata{
230+
Database: &types.Database{
231+
Driver: "foo",
232+
Host: "foo",
233+
},
234+
Queue: &types.Queue{
235+
Channel: "foo",
236+
Driver: "foo",
237+
Host: "foo",
238+
},
239+
Source: &types.Source{
240+
Driver: "foo",
241+
Host: "foo",
242+
},
243+
Vela: &types.Vela{
244+
Address: "foo",
245+
WebAddress: "foo",
246+
},
247+
}
248+
249+
tok, err := token.CreateAccessToken(u, time.Minute*15)
250+
if err != nil {
251+
t.Errorf("unable to create access token: %v", err)
252+
}
253+
254+
comp, err := native.New(cli.NewContext(nil, flag.NewFlagSet("test", 0), nil))
255+
if err != nil {
256+
t.Errorf("unable to create compiler: %v", err)
257+
}
258+
209259
// setup database
210260
db, _ := sqlite.NewTest()
211261

212262
defer func() {
213263
db.Sqlite.Exec("delete from repos;")
264+
db.Sqlite.Exec("delete from users;")
214265
_sql, _ := db.Sqlite.DB()
215266
_sql.Close()
216267
}()
217268

218269
_ = db.CreateRepo(r)
270+
_ = db.CreateUser(u)
219271

220272
// setup context
221273
gin.SetMode(gin.TestMode)
222274

223275
resp := httptest.NewRecorder()
224276
context, engine := gin.CreateTestContext(resp)
225277
context.Request, _ = http.NewRequest(http.MethodGet, "/pipelines/foo/bar/148afb5bdc41ad69bf22588491333f7cf71135163", nil)
278+
context.Request.Header.Add("Authorization", fmt.Sprintf("Bearer %s", tok))
226279

227-
// setup mock server
280+
// setup github mock server
281+
engine.GET("/api/v3/repos/:org/:repo/contents/:path", func(c *gin.Context) {
282+
c.Header("Content-Type", "application/json")
283+
c.Status(http.StatusOK)
284+
c.File("testdata/yml.json")
285+
})
286+
287+
s := httptest.NewServer(engine)
288+
defer s.Close()
289+
290+
// setup client
291+
client, _ := github.NewTest(s.URL)
292+
293+
// setup vela mock server
294+
engine.Use(func(c *gin.Context) { c.Set("metadata", m) })
295+
engine.Use(func(c *gin.Context) { c.Set("secret", secret) })
296+
engine.Use(func(c *gin.Context) { compiler.WithGinContext(c, comp) })
228297
engine.Use(func(c *gin.Context) { database.ToContext(c, db) })
298+
engine.Use(func(c *gin.Context) { scm.ToContext(c, client) })
229299
engine.Use(org.Establish())
230300
engine.Use(repo.Establish())
301+
engine.Use(user.Establish())
231302
engine.Use(Establish())
232303
engine.GET("/pipelines/:org/:repo/:pipeline", func(c *gin.Context) {
233304
c.Status(http.StatusOK)
@@ -236,7 +307,7 @@ func TestPipeline_Establish_NoPipeline(t *testing.T) {
236307
// run test
237308
engine.ServeHTTP(context.Writer, context.Request)
238309

239-
if resp.Code != http.StatusNotFound {
240-
t.Errorf("Establish returned %v, want %v", resp.Code, http.StatusNotFound)
310+
if resp.Code != http.StatusOK {
311+
t.Errorf("Establish returned %v, want %v", resp.Code, http.StatusOK)
241312
}
242313
}

‎router/middleware/pipeline/testdata/yml.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"type": "file",
3+
"encoding": "base64",
4+
"size": 5362,
5+
"name": ".vela.yml",
6+
"path": ".vela.yml",
7+
"content": "LS0tCnZlcnNpb246ICIxIgoKbWV0YWRhdGE6CiAgb3M6IGxpbnV4CgpzdGVwczoKICAtIG5hbWU6IGJ1aWxkCiAgICBpbWFnZTogb3BlbmpkazpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBHUkFETEVfVVNFUl9IT01FOiAuZ3JhZGxlCiAgICAgIEdSQURMRV9PUFRTOiAtRG9yZy5ncmFkbGUuZGFlbW9uPWZhbHNlIC1Eb3JnLmdyYWRsZS53b3JrZXJzLm1heD0xIC1Eb3JnLmdyYWRsZS5wYXJhbGxlbD1mYWxzZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9ncmFkbGV3IGJ1aWxkIGRpc3RUYXIK",
8+
"sha": "3d21ec53a331a6f037a91c368710b99387d012c1",
9+
"url": "https://api.github.com/repos/octokit/octokit.rb/contents/.vela.yml",
10+
"git_url": "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
11+
"html_url": "https://github.com/octokit/octokit.rb/blob/master/.vela.yml",
12+
"download_url": "https://raw.githubusercontent.com/octokit/octokit.rb/master/.vela.yml",
13+
"_links": {
14+
"git": "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
15+
"self": "https://api.github.com/repos/octokit/octokit.rb/contents/.vela.yml",
16+
"html": "https://github.com/octokit/octokit.rb/blob/master/.vela.yml"
17+
}
18+
}

0 commit comments

Comments
 (0)