From 6b32616c7fd43932106983e826f29aced89d3d05 Mon Sep 17 00:00:00 2001 From: Michael Burt Date: Tue, 4 Nov 2025 18:54:40 -0700 Subject: [PATCH 1/3] replace github.com/ghodss/yaml --- cmd/gen-qbec-swagger/main.go | 2 +- go.mod | 4 +--- go.sum | 4 ---- internal/commands/common.go | 2 +- internal/commands/common_test.go | 2 +- internal/commands/component.go | 2 +- internal/commands/diff.go | 2 +- internal/commands/env.go | 2 +- internal/commands/init.go | 2 +- internal/commands/param.go | 2 +- internal/commands/show.go | 2 +- internal/commands/utils_test.go | 2 +- internal/diff/diff.go | 2 +- internal/model/app.go | 2 +- internal/model/app_test.go | 2 +- internal/model/k8s_test.go | 2 +- internal/model/validator.go | 2 +- internal/remote/client.go | 2 +- internal/remote/pristine_test.go | 2 +- internal/types/secrets_test.go | 2 +- vm/internal/natives/helm.go | 2 +- 21 files changed, 20 insertions(+), 26 deletions(-) diff --git a/cmd/gen-qbec-swagger/main.go b/cmd/gen-qbec-swagger/main.go index 7c1f1fe2..0ba2a0e3 100644 --- a/cmd/gen-qbec-swagger/main.go +++ b/cmd/gen-qbec-swagger/main.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" ) func main() { diff --git a/go.mod b/go.mod index b31a29a2..234859d3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.24.6 require ( github.com/bmatcuk/doublestar/v4 v4.9.1 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e - github.com/ghodss/yaml v1.0.0 github.com/go-openapi/spec v0.22.0 github.com/go-openapi/strfmt v0.24.0 github.com/go-openapi/validate v0.25.0 @@ -29,6 +28,7 @@ require ( k8s.io/gengo v0.0.0-20250922181213-ec3ebc5fd46b k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 k8s.io/kubectl v0.34.1 + sigs.k8s.io/yaml v1.6.0 ) require ( @@ -97,7 +97,6 @@ require ( golang.org/x/time v0.9.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/component-base v0.34.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect @@ -106,5 +105,4 @@ require ( sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect - sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/go.sum b/go.sum index 4a169caa..09125a99 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,6 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= @@ -250,8 +248,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWM gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/commands/common.go b/internal/commands/common.go index 835854a9..cad764a4 100644 --- a/internal/commands/common.go +++ b/internal/commands/common.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" diff --git a/internal/commands/common_test.go b/internal/commands/common_test.go index 16873dee..9d4979d5 100644 --- a/internal/commands/common_test.go +++ b/internal/commands/common_test.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" diff --git a/internal/commands/component.go b/internal/commands/component.go index 3f9d8bbe..2f75e5db 100644 --- a/internal/commands/component.go +++ b/internal/commands/component.go @@ -22,7 +22,7 @@ import ( "io" "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" diff --git a/internal/commands/diff.go b/internal/commands/diff.go index e101ec1e..7ee4fb24 100644 --- a/internal/commands/diff.go +++ b/internal/commands/diff.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" diff --git a/internal/commands/env.go b/internal/commands/env.go index e0ca22e4..1d660003 100644 --- a/internal/commands/env.go +++ b/internal/commands/env.go @@ -20,7 +20,7 @@ import ( "sort" "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" ) diff --git a/internal/commands/init.go b/internal/commands/init.go index 7439d234..547b4214 100644 --- a/internal/commands/init.go +++ b/internal/commands/init.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/model" diff --git a/internal/commands/param.go b/internal/commands/param.go index 711a9b12..adc7ebfb 100644 --- a/internal/commands/param.go +++ b/internal/commands/param.go @@ -21,7 +21,7 @@ import ( "io" "sort" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" diff --git a/internal/commands/show.go b/internal/commands/show.go index d58fdda8..b4a1490d 100644 --- a/internal/commands/show.go +++ b/internal/commands/show.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/model" diff --git a/internal/commands/utils_test.go b/internal/commands/utils_test.go index d5316bd0..9e32b1a8 100644 --- a/internal/commands/utils_test.go +++ b/internal/commands/utils_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - yamllib "github.com/ghodss/yaml" + yamllib "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" diff --git a/internal/diff/diff.go b/internal/diff/diff.go index 6627a827..00b501bc 100644 --- a/internal/diff/diff.go +++ b/internal/diff/diff.go @@ -18,7 +18,7 @@ package diff import ( "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/pkg/errors" godiff "github.com/pmezard/go-difflib/difflib" ) diff --git a/internal/model/app.go b/internal/model/app.go index b79194c0..6595648e 100644 --- a/internal/model/app.go +++ b/internal/model/app.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/splunk/qbec/internal/filematcher" "github.com/splunk/qbec/internal/sio" diff --git a/internal/model/app_test.go b/internal/model/app_test.go index 8bd4d88a..d56752d5 100644 --- a/internal/model/app_test.go +++ b/internal/model/app_test.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/sio" "github.com/splunk/qbec/internal/testutil" "github.com/stretchr/testify/assert" diff --git a/internal/model/k8s_test.go b/internal/model/k8s_test.go index f605933b..eab78bc1 100644 --- a/internal/model/k8s_test.go +++ b/internal/model/k8s_test.go @@ -19,7 +19,7 @@ import ( "fmt" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/model/validator.go b/internal/model/validator.go index 581b6cc9..800d4371 100644 --- a/internal/model/validator.go +++ b/internal/model/validator.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" "github.com/go-openapi/validate" diff --git a/internal/remote/client.go b/internal/remote/client.go index 7ae53460..584ed4fb 100644 --- a/internal/remote/client.go +++ b/internal/remote/client.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/jonboulle/clockwork" "github.com/pkg/errors" "github.com/splunk/qbec/internal/model" diff --git a/internal/remote/pristine_test.go b/internal/remote/pristine_test.go index 93b9de43..5484d395 100644 --- a/internal/remote/pristine_test.go +++ b/internal/remote/pristine_test.go @@ -20,7 +20,7 @@ import ( "path/filepath" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/types/secrets_test.go b/internal/types/secrets_test.go index 2208d25b..1aa249c0 100644 --- a/internal/types/secrets_test.go +++ b/internal/types/secrets_test.go @@ -19,7 +19,7 @@ import ( "fmt" "testing" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" ) diff --git a/vm/internal/natives/helm.go b/vm/internal/natives/helm.go index da19d029..b7bc6604 100644 --- a/vm/internal/natives/helm.go +++ b/vm/internal/natives/helm.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/ghodss/yaml" + "sigs.k8s.io/yaml" "github.com/pkg/errors" ) From 5781f967c0433b5168effcffb2925c03c0981e3d Mon Sep 17 00:00:00 2001 From: Michael Burt Date: Tue, 4 Nov 2025 19:11:03 -0700 Subject: [PATCH 2/3] replace gopkg.in/yaml.v3 --- go.mod | 4 ++-- internal/commands/fmtutil.go | 2 +- vm/internal/natives/yaml.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 234859d3..94f31f0f 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.11.1 github.com/tidwall/pretty v1.2.1 + go.yaml.in/yaml/v3 v3.0.4 google.golang.org/protobuf v1.36.10 - gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.34.1 k8s.io/apimachinery v0.34.1 k8s.io/cli-runtime v0.34.1 @@ -86,7 +86,6 @@ require ( github.com/xlab/treeprint v1.2.0 // indirect go.mongodb.org/mongo-driver v1.17.4 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.42.0 // indirect golang.org/x/net v0.44.0 // indirect golang.org/x/oauth2 v0.27.0 // indirect @@ -97,6 +96,7 @@ require ( golang.org/x/time v0.9.0 // 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/component-base v0.34.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect diff --git a/internal/commands/fmtutil.go b/internal/commands/fmtutil.go index a2048330..abc2c92c 100644 --- a/internal/commands/fmtutil.go +++ b/internal/commands/fmtutil.go @@ -28,7 +28,7 @@ import ( "github.com/google/go-jsonnet/formatter" "github.com/tidwall/pretty" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) func format(in []byte, filename string) ([]byte, error) { diff --git a/vm/internal/natives/yaml.go b/vm/internal/natives/yaml.go index b6ecca23..311855f3 100644 --- a/vm/internal/natives/yaml.go +++ b/vm/internal/natives/yaml.go @@ -17,7 +17,7 @@ package natives import ( "io" - v3yaml "gopkg.in/yaml.v3" + v3yaml "go.yaml.in/yaml/v3" "k8s.io/apimachinery/pkg/util/yaml" ) From b68e9a74224d3f2c3b50e46bc3689ee4997d9e4b Mon Sep 17 00:00:00 2001 From: Michael Burt Date: Tue, 4 Nov 2025 19:11:51 -0700 Subject: [PATCH 3/3] gofmt --- internal/commands/common.go | 2 +- internal/commands/common_test.go | 2 +- internal/commands/component.go | 2 +- internal/commands/diff.go | 2 +- internal/commands/env.go | 2 +- internal/commands/init.go | 2 +- internal/commands/param.go | 2 +- internal/commands/show.go | 2 +- internal/commands/utils_test.go | 2 +- internal/diff/diff.go | 2 +- internal/model/app.go | 2 +- internal/model/app_test.go | 2 +- internal/model/k8s_test.go | 2 +- internal/model/validator.go | 2 +- internal/remote/client.go | 2 +- internal/remote/pristine_test.go | 2 +- internal/types/secrets_test.go | 2 +- vm/internal/natives/helm.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/commands/common.go b/internal/commands/common.go index cad764a4..808f4414 100644 --- a/internal/commands/common.go +++ b/internal/commands/common.go @@ -23,7 +23,6 @@ import ( "strings" "sync" - "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" @@ -32,6 +31,7 @@ import ( "github.com/splunk/qbec/internal/remote" "github.com/splunk/qbec/internal/sio" "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/yaml" ) // ctxProvider provides standard configuration available to all commands diff --git a/internal/commands/common_test.go b/internal/commands/common_test.go index 9d4979d5..24aac20b 100644 --- a/internal/commands/common_test.go +++ b/internal/commands/common_test.go @@ -21,11 +21,11 @@ import ( "sync" "testing" - "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "sigs.k8s.io/yaml" ) func TestRunInParallelNoObjects(t *testing.T) { diff --git a/internal/commands/component.go b/internal/commands/component.go index 2f75e5db..52b34e55 100644 --- a/internal/commands/component.go +++ b/internal/commands/component.go @@ -22,11 +22,11 @@ import ( "io" "strings" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" "github.com/splunk/qbec/internal/model" + "sigs.k8s.io/yaml" ) func newComponentCommand(cp ctxProvider) *cobra.Command { diff --git a/internal/commands/diff.go b/internal/commands/diff.go index 7ee4fb24..4fc27de4 100644 --- a/internal/commands/diff.go +++ b/internal/commands/diff.go @@ -21,7 +21,6 @@ import ( "sort" "sync" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" @@ -31,6 +30,7 @@ import ( "github.com/splunk/qbec/internal/sio" "github.com/splunk/qbec/internal/types" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "sigs.k8s.io/yaml" ) type diffIgnores struct { diff --git a/internal/commands/env.go b/internal/commands/env.go index 1d660003..bae529da 100644 --- a/internal/commands/env.go +++ b/internal/commands/env.go @@ -20,9 +20,9 @@ import ( "sort" "strings" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" + "sigs.k8s.io/yaml" ) func newEnvCommand(cp ctxProvider) *cobra.Command { diff --git a/internal/commands/init.go b/internal/commands/init.go index 547b4214..824f9d19 100644 --- a/internal/commands/init.go +++ b/internal/commands/init.go @@ -22,12 +22,12 @@ import ( "os" "path/filepath" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/model" "github.com/splunk/qbec/internal/remote" "github.com/splunk/qbec/internal/sio" + "sigs.k8s.io/yaml" ) type initCommandConfig struct { diff --git a/internal/commands/param.go b/internal/commands/param.go index adc7ebfb..af2f8c81 100644 --- a/internal/commands/param.go +++ b/internal/commands/param.go @@ -21,13 +21,13 @@ import ( "io" "sort" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/diff" "github.com/splunk/qbec/internal/eval" "github.com/splunk/qbec/internal/model" "github.com/splunk/qbec/internal/sio" + "sigs.k8s.io/yaml" ) var maxDisplayValueLength = 1024 diff --git a/internal/commands/show.go b/internal/commands/show.go index b4a1490d..f42a04f0 100644 --- a/internal/commands/show.go +++ b/internal/commands/show.go @@ -21,7 +21,6 @@ import ( "io" "strings" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" "github.com/splunk/qbec/internal/model" @@ -29,6 +28,7 @@ import ( "github.com/splunk/qbec/internal/sio" "github.com/splunk/qbec/internal/types" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "sigs.k8s.io/yaml" ) type metaOnly struct { diff --git a/internal/commands/utils_test.go b/internal/commands/utils_test.go index 9e32b1a8..b7e670e6 100644 --- a/internal/commands/utils_test.go +++ b/internal/commands/utils_test.go @@ -28,7 +28,6 @@ import ( "strings" "testing" - yamllib "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/splunk/qbec/internal/cmd" @@ -41,6 +40,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/dynamic" + yamllib "sigs.k8s.io/yaml" ) type objectKey struct { diff --git a/internal/diff/diff.go b/internal/diff/diff.go index 00b501bc..4e60ee9e 100644 --- a/internal/diff/diff.go +++ b/internal/diff/diff.go @@ -18,9 +18,9 @@ package diff import ( "strings" - "sigs.k8s.io/yaml" "github.com/pkg/errors" godiff "github.com/pmezard/go-difflib/difflib" + "sigs.k8s.io/yaml" ) const ( diff --git a/internal/model/app.go b/internal/model/app.go index 6595648e..7b04aac0 100644 --- a/internal/model/app.go +++ b/internal/model/app.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "sigs.k8s.io/yaml" "github.com/pkg/errors" "github.com/splunk/qbec/internal/filematcher" "github.com/splunk/qbec/internal/sio" + "sigs.k8s.io/yaml" ) // Baseline is a special environment name that represents the baseline environment with no customizations. diff --git a/internal/model/app_test.go b/internal/model/app_test.go index d56752d5..463bbbed 100644 --- a/internal/model/app_test.go +++ b/internal/model/app_test.go @@ -29,11 +29,11 @@ import ( "text/template" "time" - "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/sio" "github.com/splunk/qbec/internal/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "sigs.k8s.io/yaml" ) func setPwd(t *testing.T, dir string) func() { diff --git a/internal/model/k8s_test.go b/internal/model/k8s_test.go index eab78bc1..9dd8677a 100644 --- a/internal/model/k8s_test.go +++ b/internal/model/k8s_test.go @@ -19,9 +19,9 @@ import ( "fmt" "testing" - "sigs.k8s.io/yaml" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "sigs.k8s.io/yaml" ) var cm = ` diff --git a/internal/model/validator.go b/internal/model/validator.go index 800d4371..0be06892 100644 --- a/internal/model/validator.go +++ b/internal/model/validator.go @@ -19,11 +19,11 @@ import ( "fmt" "strings" - "sigs.k8s.io/yaml" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" "github.com/go-openapi/validate" "github.com/pkg/errors" + "sigs.k8s.io/yaml" ) // LatestAPIVersion is the latest version of the API we support. diff --git a/internal/remote/client.go b/internal/remote/client.go index 584ed4fb..5cb3965d 100644 --- a/internal/remote/client.go +++ b/internal/remote/client.go @@ -21,7 +21,6 @@ import ( "strings" "time" - "sigs.k8s.io/yaml" "github.com/jonboulle/clockwork" "github.com/pkg/errors" "github.com/splunk/qbec/internal/model" @@ -35,6 +34,7 @@ import ( apiTypes "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" + "sigs.k8s.io/yaml" ) const ( diff --git a/internal/remote/pristine_test.go b/internal/remote/pristine_test.go index 5484d395..351e13c6 100644 --- a/internal/remote/pristine_test.go +++ b/internal/remote/pristine_test.go @@ -20,11 +20,11 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "sigs.k8s.io/yaml" ) func TestZipRoundTrip(t *testing.T) { diff --git a/internal/types/secrets_test.go b/internal/types/secrets_test.go index 1aa249c0..da24e61f 100644 --- a/internal/types/secrets_test.go +++ b/internal/types/secrets_test.go @@ -19,9 +19,9 @@ import ( "fmt" "testing" - "sigs.k8s.io/yaml" "github.com/splunk/qbec/internal/model" "github.com/stretchr/testify/assert" + "sigs.k8s.io/yaml" ) var cm = ` diff --git a/vm/internal/natives/helm.go b/vm/internal/natives/helm.go index b7bc6604..117217f1 100644 --- a/vm/internal/natives/helm.go +++ b/vm/internal/natives/helm.go @@ -22,8 +22,8 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/yaml" "github.com/pkg/errors" + "sigs.k8s.io/yaml" ) // helmOptions are options that can be passed to the helm template command as well