From 0d327c574e12971b68d9cba7cbdaa1d1951b7909 Mon Sep 17 00:00:00 2001 From: Tomasz Janiszewski Date: Thu, 10 Jul 2025 11:33:31 +0200 Subject: [PATCH] fix: replace yaml lib Signed-off-by: Tomasz Janiszewski # Conflicts: # go.mod --- go.mod | 4 ++-- internal/compiler/builtins.go | 2 +- internal/schemas/schema.go | 2 +- pkg/framework/spec_unmarshal.go | 2 +- pkg/framework/util.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index dc712be..ed6537f 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/itchyny/gojq v0.12.17 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.10.0 - gopkg.in/yaml.v3 v3.0.1 + go.yaml.in/yaml/v3 v3.0.3 helm.sh/helm/v3 v3.18.4 k8s.io/apimachinery v0.33.3 k8s.io/client-go v0.33.3 @@ -61,7 +61,6 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect - go.yaml.in/yaml/v3 v3.0.3 // indirect golang.org/x/crypto v0.39.0 // indirect golang.org/x/net v0.40.0 // indirect golang.org/x/oauth2 v0.28.0 // indirect @@ -73,6 +72,7 @@ require ( google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.33.3 // indirect k8s.io/apiextensions-apiserver v0.33.2 // indirect k8s.io/cli-runtime v0.33.2 // indirect diff --git a/internal/compiler/builtins.go b/internal/compiler/builtins.go index bd8f3f1..104aaf0 100644 --- a/internal/compiler/builtins.go +++ b/internal/compiler/builtins.go @@ -6,7 +6,7 @@ import ( "github.com/itchyny/gojq" "github.com/pkg/errors" "github.com/stackrox/helmtest/internal/logic" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) // Additional built-ins for gojq diff --git a/internal/schemas/schema.go b/internal/schemas/schema.go index d6344e4..d174e1d 100644 --- a/internal/schemas/schema.go +++ b/internal/schemas/schema.go @@ -6,7 +6,7 @@ import ( openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/pkg/errors" "github.com/stackrox/helmtest/internal/rox-imported/set" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "helm.sh/helm/v3/pkg/chartutil" k8sSchema "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubectl/pkg/util/openapi" diff --git a/pkg/framework/spec_unmarshal.go b/pkg/framework/spec_unmarshal.go index 2aa1400..ad04736 100644 --- a/pkg/framework/spec_unmarshal.go +++ b/pkg/framework/spec_unmarshal.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/stackrox/helmtest/internal/parser" - yamlv3 "gopkg.in/yaml.v3" + yamlv3 "go.yaml.in/yaml/v3" "sigs.k8s.io/yaml" ) diff --git a/pkg/framework/util.go b/pkg/framework/util.go index 02c1d56..fc6c625 100644 --- a/pkg/framework/util.go +++ b/pkg/framework/util.go @@ -6,7 +6,7 @@ import ( "k8s.io/kubectl/pkg/util/openapi" "github.com/pkg/errors" - yamlv3 "gopkg.in/yaml.v3" + yamlv3 "go.yaml.in/yaml/v3" ) // unmarshalYamlFromFileStrict unmarshals the contents of filename into out, relying on gopkg.in/yaml.v3 semantics.