Skip to content

Commit 6569c96

Browse files
committed
refactor: replace sigs.k8s.io/yaml go mod with gopkg.in/yaml.v3
1 parent c2501a2 commit 6569c96

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

bazel/include/go.MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ go_deps.gazelle_override(
8989
build_file_generation = "clean",
9090
path = "github.com/bazelbuild/bazelisk",
9191
)
92-
use_repo(go_deps, "com_github_alphadose_haxmap", "com_github_bazelbuild_bazel_gazelle", "com_github_bazelbuild_bazelisk", "com_github_bazelbuild_buildtools", "com_github_bluekeyes_go_gitdiff", "com_github_charmbracelet_huh", "com_github_creack_pty", "com_github_fatih_color", "com_github_golang_mock", "com_github_golang_protobuf", "com_github_google_uuid", "com_github_hashicorp_go_hclog", "com_github_hashicorp_go_plugin", "com_github_hay_kot_scaffold", "com_github_klauspost_compress", "com_github_manifoldco_promptui", "com_github_mattn_go_isatty", "com_github_mitchellh_go_homedir", "com_github_onsi_gomega", "com_github_pkg_browser", "com_github_reviewdog_errorformat", "com_github_reviewdog_reviewdog", "com_github_rs_zerolog", "com_github_russross_blackfriday_v2", "com_github_sourcegraph_go_diff", "com_github_spf13_cobra", "com_github_spf13_pflag", "com_github_spf13_viper", "com_github_tejzpr_ordered_concurrently_v3", "com_github_twmb_murmur3", "io_k8s_sigs_yaml", "io_opentelemetry_go_otel", "io_opentelemetry_go_otel_exporters_stdout_stdouttrace", "io_opentelemetry_go_otel_sdk", "io_opentelemetry_go_otel_trace", "org_golang_google_genproto", "org_golang_google_genproto_googleapis_api", "org_golang_google_grpc", "org_golang_google_protobuf", "org_golang_x_mod", "org_golang_x_sync", "org_golang_x_term", "org_golang_x_tools", "tools_gotest_v3")
92+
use_repo(go_deps, "com_github_alphadose_haxmap", "com_github_bazelbuild_bazel_gazelle", "com_github_bazelbuild_bazelisk", "com_github_bazelbuild_buildtools", "com_github_bluekeyes_go_gitdiff", "com_github_charmbracelet_huh", "com_github_creack_pty", "com_github_fatih_color", "com_github_golang_mock", "com_github_golang_protobuf", "com_github_google_uuid", "com_github_hashicorp_go_hclog", "com_github_hashicorp_go_plugin", "com_github_hay_kot_scaffold", "com_github_klauspost_compress", "com_github_manifoldco_promptui", "com_github_mattn_go_isatty", "com_github_mitchellh_go_homedir", "com_github_onsi_gomega", "com_github_pkg_browser", "com_github_reviewdog_errorformat", "com_github_reviewdog_reviewdog", "com_github_rs_zerolog", "com_github_russross_blackfriday_v2", "com_github_sourcegraph_go_diff", "com_github_spf13_cobra", "com_github_spf13_pflag", "com_github_spf13_viper", "com_github_tejzpr_ordered_concurrently_v3", "com_github_twmb_murmur3", "in_gopkg_yaml_v3", "io_opentelemetry_go_otel", "io_opentelemetry_go_otel_exporters_stdout_stdouttrace", "io_opentelemetry_go_otel_sdk", "io_opentelemetry_go_otel_trace", "org_golang_google_genproto", "org_golang_google_genproto_googleapis_api", "org_golang_google_grpc", "org_golang_google_protobuf", "org_golang_x_mod", "org_golang_x_sync", "org_golang_x_term", "org_golang_x_tools", "tools_gotest_v3")

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ require (
4646
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda
4747
google.golang.org/grpc v1.76.0
4848
google.golang.org/protobuf v1.36.10
49+
gopkg.in/yaml.v3 v3.0.1
4950
gotest.tools/v3 v3.5.2
50-
sigs.k8s.io/yaml v1.4.0
5151
)
5252

5353
require (
@@ -173,5 +173,4 @@ require (
173173
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
174174
gopkg.in/warnings.v0 v0.1.2 // indirect
175175
gopkg.in/yaml.v2 v2.4.0 // indirect
176-
gopkg.in/yaml.v3 v3.0.1 // indirect
177176
)

go.sum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
195195
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
196196
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
197197
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
198-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
199198
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
200199
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
201200
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
@@ -498,5 +497,3 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
498497
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
499498
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
500499
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
501-
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
502-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

pkg/plugin/system/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ go_library(
1818
"//pkg/plugin/system/besproxy",
1919
"@com_github_google_uuid//:uuid",
2020
"@com_github_spf13_cobra//:cobra",
21-
"@io_k8s_sigs_yaml//:yaml",
21+
"@in_gopkg_yaml_v3//:yaml_v3",
2222
"@org_golang_google_grpc//:grpc",
2323
"@org_golang_google_grpc//keepalive",
2424
"@org_golang_x_sync//errgroup",
@@ -42,6 +42,6 @@ go_test(
4242
"@com_github_golang_mock//gomock",
4343
"@com_github_onsi_gomega//:gomega",
4444
"@com_github_spf13_cobra//:cobra",
45-
"@io_k8s_sigs_yaml//:yaml",
45+
"@in_gopkg_yaml_v3//:yaml_v3",
4646
],
4747
)

pkg/plugin/system/system.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"golang.org/x/sync/errgroup"
3434
"google.golang.org/grpc"
3535
"google.golang.org/grpc/keepalive"
36-
"sigs.k8s.io/yaml"
36+
"gopkg.in/yaml.v3"
3737

3838
"github.com/aspect-build/aspect-cli-legacy/pkg/aspect/root/config"
3939
rootFlags "github.com/aspect-build/aspect-cli-legacy/pkg/aspect/root/flags"

pkg/plugin/system/system_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Aspect Build Systems, Inc.
2+
* Copyright 2023 Aspect Build Systems, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import (
2626
"github.com/golang/mock/gomock"
2727
. "github.com/onsi/gomega"
2828
"github.com/spf13/cobra"
29-
"sigs.k8s.io/yaml"
29+
"gopkg.in/yaml.v3"
3030

3131
rootFlags "github.com/aspect-build/aspect-cli-legacy/pkg/aspect/root/flags"
3232
"github.com/aspect-build/aspect-cli-legacy/pkg/aspecterrors"

0 commit comments

Comments
 (0)