Skip to content

Commit 85c4144

Browse files
committed
fix: upgrade yaml library to go-yaml v3 over buildkite
1 parent 283289c commit 85c4144

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

compiler/native/compile_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ func TestNative_Compile_StagesPipeline(t *testing.T) {
208208
Secrets: pipeline.StepSecretSlice{
209209
&pipeline.StepSecret{
210210
Source: "docker_username",
211-
Target: "registry_username",
211+
Target: "REGISTRY_USERNAME",
212212
},
213213
&pipeline.StepSecret{
214214
Source: "docker_password",
215-
Target: "registry_password",
215+
Target: "REGISTRY_PASSWORD",
216216
},
217217
},
218218
},
@@ -548,11 +548,11 @@ func TestNative_Compile_StepsPipeline(t *testing.T) {
548548
Secrets: pipeline.StepSecretSlice{
549549
&pipeline.StepSecret{
550550
Source: "docker_username",
551-
Target: "registry_username",
551+
Target: "REGISTRY_USERNAME",
552552
},
553553
&pipeline.StepSecret{
554554
Source: "docker_password",
555-
Target: "registry_password",
555+
Target: "REGISTRY_PASSWORD",
556556
},
557557
},
558558
},
@@ -786,11 +786,11 @@ func TestNative_Compile_StagesPipelineTemplate(t *testing.T) {
786786
Secrets: pipeline.StepSecretSlice{
787787
&pipeline.StepSecret{
788788
Source: "docker_username",
789-
Target: "registry_username",
789+
Target: "REGISTRY_USERNAME",
790790
},
791791
&pipeline.StepSecret{
792792
Source: "docker_password",
793-
Target: "registry_password",
793+
Target: "REGISTRY_PASSWORD",
794794
},
795795
},
796796
},
@@ -1033,11 +1033,11 @@ func TestNative_Compile_StepsPipelineTemplate(t *testing.T) {
10331033
Secrets: pipeline.StepSecretSlice{
10341034
&pipeline.StepSecret{
10351035
Source: "docker_username",
1036-
Target: "registry_username",
1036+
Target: "REGISTRY_USERNAME",
10371037
},
10381038
&pipeline.StepSecret{
10391039
Source: "docker_password",
1040-
Target: "registry_password",
1040+
Target: "REGISTRY_PASSWORD",
10411041
},
10421042
},
10431043
},
@@ -3583,11 +3583,11 @@ func Test_CompileLite(t *testing.T) {
35833583
Secrets: yaml.StepSecretSlice{
35843584
{
35853585
Source: "docker_username",
3586-
Target: "registry_username",
3586+
Target: "REGISTRY_USERNAME",
35873587
},
35883588
{
35893589
Source: "docker_password",
3590-
Target: "registry_password",
3590+
Target: "REGISTRY_PASSWORD",
35913591
},
35923592
},
35933593
Image: "plugins/docker:18.09",
@@ -3699,11 +3699,11 @@ func Test_CompileLite(t *testing.T) {
36993699
Secrets: yaml.StepSecretSlice{
37003700
{
37013701
Source: "docker_username",
3702-
Target: "registry_username",
3702+
Target: "REGISTRY_USERNAME",
37033703
},
37043704
{
37053705
Source: "docker_password",
3706-
Target: "registry_password",
3706+
Target: "REGISTRY_PASSWORD",
37073707
},
37083708
},
37093709
Image: "plugins/docker:18.09",

compiler/native/expand_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ func TestNative_ExpandStepsMulti(t *testing.T) {
581581
Secrets: yaml.StepSecretSlice{
582582
{
583583
Source: "vault_token",
584-
Target: "vault_token",
584+
Target: "VAULT_TOKEN",
585585
},
586586
},
587587
Parameters: map[string]interface{}{
@@ -602,7 +602,7 @@ func TestNative_ExpandStepsMulti(t *testing.T) {
602602
Secrets: yaml.StepSecretSlice{
603603
{
604604
Source: "vault_token",
605-
Target: "vault_token",
605+
Target: "VAULT_TOKEN",
606606
},
607607
},
608608
Parameters: map[string]interface{}{

compiler/native/parse_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ func TestNative_Parse_Parameters(t *testing.T) {
192192
Secrets: yaml.StepSecretSlice{
193193
&yaml.StepSecret{
194194
Source: "docker_username",
195-
Target: "docker_username",
195+
Target: "DOCKER_USERNAME",
196196
},
197197
&yaml.StepSecret{
198198
Source: "docker_password",
199-
Target: "docker_password",
199+
Target: "DOCKER_PASSWORD",
200200
},
201201
},
202202
},
@@ -302,11 +302,11 @@ func TestNative_Parse_StagesPipeline(t *testing.T) {
302302
Secrets: yaml.StepSecretSlice{
303303
&yaml.StepSecret{
304304
Source: "docker_username",
305-
Target: "registry_username",
305+
Target: "REGISTRY_USERNAME",
306306
},
307307
&yaml.StepSecret{
308308
Source: "docker_password",
309-
Target: "registry_password",
309+
Target: "REGISTRY_PASSWORD",
310310
},
311311
},
312312
},
@@ -407,11 +407,11 @@ func TestNative_Parse_StepsPipeline(t *testing.T) {
407407
Secrets: yaml.StepSecretSlice{
408408
&yaml.StepSecret{
409409
Source: "docker_username",
410-
Target: "registry_username",
410+
Target: "REGISTRY_USERNAME",
411411
},
412412
&yaml.StepSecret{
413413
Source: "docker_password",
414-
Target: "registry_password",
414+
Target: "REGISTRY_PASSWORD",
415415
},
416416
},
417417
},

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ go 1.22.0
44

55
toolchain go1.22.5
66

7-
replace github.com/go-vela/types => ../types
8-
97
require (
108
github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb
119
github.com/DATA-DOG/go-sqlmock v1.5.2
@@ -19,7 +17,7 @@ require (
1917
github.com/ghodss/yaml v1.0.0
2018
github.com/gin-gonic/gin v1.10.0
2119
github.com/go-playground/assert/v2 v2.2.0
22-
github.com/go-vela/types v0.24.0
20+
github.com/go-vela/types v0.24.1-0.20240826141537-76a66e72d5dc
2321
github.com/golang-jwt/jwt/v5 v5.2.1
2422
github.com/google/go-cmp v0.6.0
2523
github.com/google/go-github/v63 v63.0.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx
8989
github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
9090
github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
9191
github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
92+
github.com/go-vela/types v0.24.1-0.20240826141537-76a66e72d5dc h1:VyT2tBwPVO9fMmn+22TC4rY4dp+d71To/Qo5Vk4cOSo=
93+
github.com/go-vela/types v0.24.1-0.20240826141537-76a66e72d5dc/go.mod h1:WcSiFm8cWuErRw4aI08NrfM+SZzidnbUs2fmO5klFKo=
9294
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
9395
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
9496
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

0 commit comments

Comments
 (0)