diff --git a/MODULE.bazel b/MODULE.bazel index 9d52cb5229..8bee2b65aa 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -96,7 +96,7 @@ use_repo( "com_github_stretchr_testify", "com_github_uber_jaeger_client_go", "com_github_vishvananda_netlink", - "in_gopkg_yaml_v3", + "in_yaml_go_yaml_v4", "org_go4_netipx", "org_golang_google_grpc", "org_golang_google_grpc_examples", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index ab1b3cc3fe..9fada8b442 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -445,6 +445,83 @@ } } }, + "@@aspect_rules_js+//npm:extensions.bzl%pnpm": { + "general": { + "bzlTransitiveDigest": "qrdFw1bpyU6c5vMklzMF8PGwSzxEV/tF/MsBtHoRb+4=", + "usagesDigest": "EFKKU7eUgTryCbo1pjmIBAfRNXSqYCgsTqt5M8RIwhE=", + "recordedInputs": [ + "REPO_MAPPING:aspect_bazel_lib+,bazel_lib bazel_lib+", + "REPO_MAPPING:aspect_bazel_lib+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:aspect_bazel_lib+,bazel_tools bazel_tools", + "REPO_MAPPING:aspect_bazel_lib+,tar.bzl tar.bzl+", + "REPO_MAPPING:aspect_rules_js+,aspect_bazel_lib aspect_bazel_lib+", + "REPO_MAPPING:aspect_rules_js+,aspect_rules_js aspect_rules_js+", + "REPO_MAPPING:aspect_rules_js+,aspect_tools_telemetry_report aspect_tools_telemetry++telemetry+aspect_tools_telemetry_report", + "REPO_MAPPING:aspect_rules_js+,bazel_features bazel_features+", + "REPO_MAPPING:aspect_rules_js+,bazel_lib bazel_lib+", + "REPO_MAPPING:aspect_rules_js+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:aspect_rules_js+,bazel_tools bazel_tools", + "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals", + "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version", + "REPO_MAPPING:bazel_lib+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:bazel_lib+,bazel_tools bazel_tools", + "REPO_MAPPING:tar.bzl+,bazel_lib bazel_lib+", + "REPO_MAPPING:tar.bzl+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:tar.bzl+,tar.bzl tar.bzl+" + ], + "generatedRepoSpecs": { + "pnpm": { + "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_rule", + "attributes": { + "package": "pnpm", + "version": "8.15.9", + "root_package": "", + "link_workspace": "", + "link_packages": {}, + "integrity": "sha512-SZQ0ydj90aJ5Tr9FUrOyXApjOrzuW7Fee13pDzL0e1E6ypjNXP0AHDHw20VLw4BO3M1XhQHkyik6aBYWa72fgQ==", + "url": "", + "commit": "", + "patch_args": [ + "-p0" + ], + "patches": [], + "custom_postinstall": "", + "npm_auth": "", + "npm_auth_basic": "", + "npm_auth_username": "", + "npm_auth_password": "", + "lifecycle_hooks": [], + "extra_build_content": "load(\"@aspect_rules_js//js:defs.bzl\", \"js_binary\")\njs_binary(name = \"pnpm\", data = glob([\"package/**\"]), entry_point = \"package/dist/pnpm.cjs\", visibility = [\"//visibility:public\"])", + "extract_full_archive": true, + "exclude_package_contents": [] + } + }, + "pnpm__links": { + "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_links", + "attributes": { + "package": "pnpm", + "version": "8.15.9", + "dev": false, + "root_package": "", + "link_packages": {}, + "deps": {}, + "transitive_closure": {}, + "lifecycle_build_target": false, + "lifecycle_hooks_env": [], + "lifecycle_hooks_execution_requirements": [ + "no-sandbox" + ], + "lifecycle_hooks_use_default_shell_env": false, + "bins": {}, + "package_visibility": [ + "//visibility:public" + ], + "exclude_package_contents": [] + } + } + } + } + }, "@@aspect_tools_telemetry+//:extension.bzl%telemetry": { "general": { "bzlTransitiveDigest": "cl5A2O84vDL6Tt+Qga8FCj1DUDGqn+e7ly5rZ+4xvcc=", diff --git a/control/beacon/BUILD.bazel b/control/beacon/BUILD.bazel index 3d6be3ef73..6c1303834e 100644 --- a/control/beacon/BUILD.bazel +++ b/control/beacon/BUILD.bazel @@ -30,7 +30,7 @@ go_library( "//private/segment/verifier:go_default_library", "//private/trust:go_default_library", "@com_github_patrickmn_go_cache//:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", ], ) diff --git a/control/beacon/policy.go b/control/beacon/policy.go index d92a03f869..7e8c4dcf33 100644 --- a/control/beacon/policy.go +++ b/control/beacon/policy.go @@ -19,7 +19,7 @@ import ( "io" "os" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/ptr" diff --git a/control/cmd/control/BUILD.bazel b/control/cmd/control/BUILD.bazel index f62f24861e..6538fa202d 100644 --- a/control/cmd/control/BUILD.bazel +++ b/control/cmd/control/BUILD.bazel @@ -98,7 +98,7 @@ go_library( "@com_github_scionproto_scion//pkg/proto/control_plane/v1/control_planeconnect:go_default_library", "@com_github_scionproto_scion//pkg/proto/discovery/v1/discoveryconnect:go_default_library", "@com_github_spf13_cobra//:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_x_sync//errgroup:go_default_library", ], diff --git a/control/cmd/control/sample.go b/control/cmd/control/sample.go index 9119284238..69ed9e408a 100644 --- a/control/cmd/control/sample.go +++ b/control/cmd/control/sample.go @@ -19,7 +19,7 @@ import ( "os" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/control/beacon" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/go.mod b/go.mod index 74d6ea276a..4d5c653f53 100644 --- a/go.mod +++ b/go.mod @@ -47,6 +47,7 @@ require ( github.com/vishvananda/netlink v1.3.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 + go.yaml.in/yaml/v4 v4.0.0-rc.6 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba golang.org/x/crypto v0.52.0 golang.org/x/net v0.55.0 @@ -56,7 +57,6 @@ require ( google.golang.org/grpc v1.79.3 google.golang.org/grpc/examples v0.0.0-20240321213419-eb5828bae753 google.golang.org/protobuf v1.36.10 - gopkg.in/yaml.v3 v3.0.1 zgo.at/zcache/v2 v2.1.0 ) @@ -122,4 +122,5 @@ require ( golang.org/x/text v0.37.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 32b40cf067..059bf17fec 100644 --- a/go.sum +++ b/go.sum @@ -342,6 +342,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4= +go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M= go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/licenses/data/in_yaml_go_yaml_v4/LICENSE b/licenses/data/in_yaml_go_yaml_v4/LICENSE new file mode 100644 index 0000000000..b0fa97112a --- /dev/null +++ b/licenses/data/in_yaml_go_yaml_v4/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2025 - The go-yaml Project Contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pkg/experimental/hiddenpath/BUILD.bazel b/pkg/experimental/hiddenpath/BUILD.bazel index 593bf570f8..5e4aada238 100644 --- a/pkg/experimental/hiddenpath/BUILD.bazel +++ b/pkg/experimental/hiddenpath/BUILD.bazel @@ -33,7 +33,7 @@ go_library( "//private/pathdb/query:go_default_library", "//private/segment/segverifier:go_default_library", "//private/segment/verifier:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) @@ -81,6 +81,6 @@ go_test( "@com_github_golang_mock//gomock:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/pkg/experimental/hiddenpath/group.go b/pkg/experimental/hiddenpath/group.go index d74e4298a5..da9f5af089 100644 --- a/pkg/experimental/hiddenpath/group.go +++ b/pkg/experimental/hiddenpath/group.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/pkg/experimental/hiddenpath/group_test.go b/pkg/experimental/hiddenpath/group_test.go index af0a80a31a..e429b2fa48 100644 --- a/pkg/experimental/hiddenpath/group_test.go +++ b/pkg/experimental/hiddenpath/group_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/experimental/hiddenpath" diff --git a/pkg/experimental/hiddenpath/registrationpolicy.go b/pkg/experimental/hiddenpath/registrationpolicy.go index 770bca5dd1..949f7ec756 100644 --- a/pkg/experimental/hiddenpath/registrationpolicy.go +++ b/pkg/experimental/hiddenpath/registrationpolicy.go @@ -17,7 +17,7 @@ package hiddenpath import ( "sort" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/private/serrors" "github.com/scionproto/scion/private/config" diff --git a/pkg/experimental/hiddenpath/registrationpolicy_test.go b/pkg/experimental/hiddenpath/registrationpolicy_test.go index 83a7679dd8..23b1dba3bf 100644 --- a/pkg/experimental/hiddenpath/registrationpolicy_test.go +++ b/pkg/experimental/hiddenpath/registrationpolicy_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/experimental/hiddenpath" diff --git a/pkg/private/xtest/graphupdater/BUILD.bazel b/pkg/private/xtest/graphupdater/BUILD.bazel index c0a23e0501..199f720684 100644 --- a/pkg/private/xtest/graphupdater/BUILD.bazel +++ b/pkg/private/xtest/graphupdater/BUILD.bazel @@ -14,7 +14,7 @@ go_library( deps = [ "//pkg/private/serrors:go_default_library", "//pkg/private/xtest/graph:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/pkg/private/xtest/graphupdater/updater.go b/pkg/private/xtest/graphupdater/updater.go index a8349f3d70..bd28a1f0fe 100644 --- a/pkg/private/xtest/graphupdater/updater.go +++ b/pkg/private/xtest/graphupdater/updater.go @@ -20,7 +20,7 @@ import ( "go/format" "os" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/private/serrors" "github.com/scionproto/scion/pkg/private/xtest/graph" diff --git a/private/path/pathpol/BUILD.bazel b/private/path/pathpol/BUILD.bazel index ae58d348d2..d274c874bb 100644 --- a/private/path/pathpol/BUILD.bazel +++ b/private/path/pathpol/BUILD.bazel @@ -45,6 +45,6 @@ go_test( "@com_github_golang_mock//gomock:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", "@com_github_stretchr_testify//require:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/private/path/pathpol/acl_test.go b/private/path/pathpol/acl_test.go index 6b9d7ee3d7..11b3e0cb04 100644 --- a/private/path/pathpol/acl_test.go +++ b/private/path/pathpol/acl_test.go @@ -20,7 +20,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/segment/iface" diff --git a/scion-pki/testcrypto/BUILD.bazel b/scion-pki/testcrypto/BUILD.bazel index dfb06c5918..367f2f2ead 100644 --- a/scion-pki/testcrypto/BUILD.bazel +++ b/scion-pki/testcrypto/BUILD.bazel @@ -22,7 +22,7 @@ go_library( "//scion-pki/key:go_default_library", "//scion-pki/trcs:go_default_library", "@com_github_spf13_cobra//:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/scion-pki/testcrypto/config.go b/scion-pki/testcrypto/config.go index fbc3901e51..676abae1e6 100644 --- a/scion-pki/testcrypto/config.go +++ b/scion-pki/testcrypto/config.go @@ -17,7 +17,7 @@ package testcrypto import ( "os" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/scion-pki/trcs/BUILD.bazel b/scion-pki/trcs/BUILD.bazel index b0a95a53c4..f6f5705b75 100644 --- a/scion-pki/trcs/BUILD.bazel +++ b/scion-pki/trcs/BUILD.bazel @@ -34,7 +34,7 @@ go_library( "@com_github_google_go_cmp//cmp:go_default_library", "@com_github_mattn_go_isatty//:go_default_library", "@com_github_spf13_cobra//:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/scion-pki/trcs/inspect.go b/scion-pki/trcs/inspect.go index 07e2ebca4e..66b036f269 100644 --- a/scion-pki/trcs/inspect.go +++ b/scion-pki/trcs/inspect.go @@ -26,7 +26,7 @@ import ( "time" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/scion-pki/trcs/payload.go b/scion-pki/trcs/payload.go index fce8e2d1bf..f502723c96 100644 --- a/scion-pki/trcs/payload.go +++ b/scion-pki/trcs/payload.go @@ -24,7 +24,7 @@ import ( "github.com/mattn/go-isatty" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/scion/cmd/scion/BUILD.bazel b/scion/cmd/scion/BUILD.bazel index 8a4de19ca6..7b1b6c920c 100644 --- a/scion/cmd/scion/BUILD.bazel +++ b/scion/cmd/scion/BUILD.bazel @@ -39,7 +39,7 @@ go_library( "@com_github_opentracing_opentracing_go//:go_default_library", "@com_github_spf13_cobra//:go_default_library", "@com_github_spf13_cobra//doc:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/scion/cmd/scion/ping.go b/scion/cmd/scion/ping.go index c3a8014745..efcca837d2 100644 --- a/scion/cmd/scion/ping.go +++ b/scion/cmd/scion/ping.go @@ -27,7 +27,7 @@ import ( "time" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/daemon" diff --git a/scion/cmd/scion/showpaths.go b/scion/cmd/scion/showpaths.go index 3f9640f2e4..1688245cc5 100644 --- a/scion/cmd/scion/showpaths.go +++ b/scion/cmd/scion/showpaths.go @@ -23,7 +23,7 @@ import ( "time" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/daemon" diff --git a/scion/cmd/scion/traceroute.go b/scion/cmd/scion/traceroute.go index 343263d1c3..ea0b7dbd5b 100644 --- a/scion/cmd/scion/traceroute.go +++ b/scion/cmd/scion/traceroute.go @@ -26,7 +26,7 @@ import ( "time" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/daemon" diff --git a/testing/clab/cmd/controller/config/BUILD.bazel b/testing/clab/cmd/controller/config/BUILD.bazel index 5ca1d9bda0..b092b8d034 100644 --- a/testing/clab/cmd/controller/config/BUILD.bazel +++ b/testing/clab/cmd/controller/config/BUILD.bazel @@ -12,7 +12,7 @@ go_library( deps = [ "//pkg/addr:go_default_library", "//pkg/private/serrors:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/testing/clab/cmd/controller/config/encode.go b/testing/clab/cmd/controller/config/encode.go index 4feefa42d5..755d7ee0ec 100644 --- a/testing/clab/cmd/controller/config/encode.go +++ b/testing/clab/cmd/controller/config/encode.go @@ -17,7 +17,7 @@ package config import ( "encoding/json" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/private/serrors" ) diff --git a/tools/integration/BUILD.bazel b/tools/integration/BUILD.bazel index 82281dd556..bfc3de27ed 100644 --- a/tools/integration/BUILD.bazel +++ b/tools/integration/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//pkg/snet:go_default_library", "//private/topology:go_default_library", "//tools/integration/progress:go_default_library", - "@in_gopkg_yaml_v3//:go_default_library", + "@in_yaml_go_yaml_v4//:go_default_library", ], ) diff --git a/tools/integration/aslist.go b/tools/integration/aslist.go index 9e0d293e00..5ad18cfa98 100644 --- a/tools/integration/aslist.go +++ b/tools/integration/aslist.go @@ -18,7 +18,7 @@ package integration import ( "os" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/private/serrors" diff --git a/tools/integration/networkalloc.go b/tools/integration/networkalloc.go index b586c352ae..de4b72f0ea 100644 --- a/tools/integration/networkalloc.go +++ b/tools/integration/networkalloc.go @@ -18,7 +18,7 @@ import ( "net" "os" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v4" "github.com/scionproto/scion/pkg/addr" "github.com/scionproto/scion/pkg/snet"