Merge branch 'ash2k/yaml-upgrade' into 'main'

Switch to a maintained YAML library go.yaml.in/yaml/v3

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/6065

Merged-by: Arran Walker <ajwalker@gitlab.com>
Approved-by: Timo Furrer <tfurrer@gitlab.com>
Approved-by: Arran Walker <ajwalker@gitlab.com>
Reviewed-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
Co-authored-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>

Author: saracen

go.mod

@@ -53,7 +53,7 @@ require (
 	github.com/klauspost/compress v1.18.2
 	github.com/klauspost/pgzip v1.2.6
 	github.com/magefile/mage v1.15.0
-	github.com/minio/minio-go/v7 v7.0.97
+	github.com/minio/minio-go/v7 v7.0.98
 	github.com/moby/docker-image-spec v1.3.1
 	github.com/openbao/openbao/api/v2 v2.5.0
 	github.com/opencontainers/image-spec v1.1.1
@@ -83,6 +83,7 @@ require (
 	gitlab.com/gitlab-org/step-runner v0.24.0
 	go.mozilla.org/pkcs7 v0.9.0
 	go.uber.org/automaxprocs v1.6.0
+	go.yaml.in/yaml/v3 v3.0.4
 	gocloud.dev v0.44.0
 	golang.org/x/crypto v0.46.0
 	golang.org/x/oauth2 v0.34.0
@@ -92,8 +93,6 @@ require (
 	google.golang.org/api v0.259.0
 	google.golang.org/grpc v1.78.0
 	google.golang.org/protobuf v1.36.11
-	gopkg.in/yaml.v2 v2.4.0
-	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.35.0
 	k8s.io/apimachinery v0.35.0
 	k8s.io/client-go v0.35.0
@@ -281,7 +280,6 @@ require (
 	go.shabbyrobe.org/gocovmerge v0.0.0-20230507111327-fa4f82cfbf4d // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
 	golang.org/x/mod v0.31.0 // indirect
 	golang.org/x/net v0.48.0 // indirect
@@ -295,6 +293,7 @@ require (
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect

go.sum

@@ -453,8 +453,8 @@ github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI
 github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.97 h1:lqhREPyfgHTB/ciX8k2r8k0D93WaFqxbJX36UZq5occ=
-github.com/minio/minio-go/v7 v7.0.97/go.mod h1:re5VXuo0pwEtoNLsNuSr0RrLfT/MBtohwdaSmPPSRSk=
+github.com/minio/minio-go/v7 v7.0.98 h1:MeAVKjLVz+XJ28zFcuYyImNSAh8Mq725uNW4beRisi0=
+github.com/minio/minio-go/v7 v7.0.98/go.mod h1:cY0Y+W7yozf0mdIclrttzo1Iiu7mEf9y7nk2uXqMOvM=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=

helpers/converter.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/BurntSushi/toml"
-	"gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v3"
 )
 
 func ToYAML(src interface{}) string {

helpers/converter_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v3"
 )
 
 type TestObj struct {

magefiles/pulp/releases.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/samber/lo"
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v3"
 )
 
 const (

steps/steps.go

@@ -7,7 +7,7 @@ import (
 
 	"gitlab.com/gitlab-org/step-runner/pkg/api/client"
 	"gitlab.com/gitlab-org/step-runner/schema/v1"
-	"gopkg.in/yaml.v2"
+	"go.yaml.in/yaml/v3"
 
 	"gitlab.com/gitlab-org/gitlab-runner/common"
 	"gitlab.com/gitlab-org/gitlab-runner/common/spec"

steps/steps_test.go

@@ -17,23 +17,23 @@ func Test_addStepsPreamble(t *testing.T) {
 	}{
 		"simple script": {
 			in:   `[{"name":"script", "script": "foo bar baz"}]`,
-			want: "{}\n---\nrun:\n- name: script\n  script: foo bar baz\n",
+			want: "{}\n---\nrun:\n    - name: script\n      script: foo bar baz\n",
 		},
 		"reference local step": {
 			in:   `[{"name":"local", "func":"./some/step", "inputs":{"in":"bar"}}]`,
-			want: "{}\n---\nrun:\n- inputs:\n    in: bar\n  name: local\n  func: ./some/step\n",
+			want: "{}\n---\nrun:\n    - inputs:\n        in: bar\n      name: local\n      func: ./some/step\n",
 		},
 		"reference remote step": {
 			in:   `[{"name":"remote", "func":"https://gitlab.com/components/script@v1", "inputs":{"in":"bar"}}]`,
-			want: "{}\n---\nrun:\n- inputs:\n    in: bar\n  name: remote\n  func: https://gitlab.com/components/script@v1\n",
+			want: "{}\n---\nrun:\n    - inputs:\n        in: bar\n      name: remote\n      func: https://gitlab.com/components/script@v1\n",
 		},
 		"action step": {
 			in:   `[{"name":"action", "action":"some-action@v1", "inputs":{"in":"bar"}}]`,
-			want: "{}\n---\nrun:\n- action: some-action@v1\n  inputs:\n    in: bar\n  name: action\n",
+			want: "{}\n---\nrun:\n    - action: some-action@v1\n      inputs:\n        in: bar\n      name: action\n",
 		},
 		"exec step": {
 			in:   `[{"name":"exec", "exec":{"command":["cmd","arg1", "arg2"],"work_dir":"/foo/bar/baz"}, "inputs":{"in":"bar"}}]`,
-			want: "{}\n---\nrun:\n- exec:\n    command:\n    - cmd\n    - arg1\n    - arg2\n    work_dir: /foo/bar/baz\n  inputs:\n    in: bar\n  name: exec\n",
+			want: "{}\n---\nrun:\n    - exec:\n        command:\n            - cmd\n            - arg1\n            - arg2\n        work_dir: /foo/bar/baz\n      inputs:\n        in: bar\n      name: exec\n",
 		},
 	}