From dae831bf2f80ec57b0d34623f26730a48a2bd74a Mon Sep 17 00:00:00 2001 From: Brian Myers Date: Thu, 2 Jan 2025 13:14:48 -0600 Subject: [PATCH] rename rules_go to io_bazel_rules_go to work with dd-source --- BUILD.bazel | 2 +- MODULE.bazel | 4 ++-- examples/go-multiarch-image/BUILD.bazel | 2 +- examples/go-multiarch-image/go.bzl | 10 ++++++++-- go/cmd/ocitool/BUILD.bazel | 2 +- go/internal/flagutil/BUILD.bazel | 2 +- go/internal/set/BUILD.bazel | 2 +- go/internal/tarutil/BUILD.bazel | 2 +- go/pkg/blob/BUILD.bazel | 2 +- go/pkg/credhelper/BUILD.bazel | 2 +- go/pkg/deb2layer/BUILD.bazel | 2 +- go/pkg/jsonutil/BUILD.bazel | 2 +- go/pkg/layer/BUILD.bazel | 2 +- go/pkg/ociutil/BUILD.bazel | 2 +- release/pkg_go_binary_multiple_platforms.bzl | 2 +- 15 files changed, 23 insertions(+), 17 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index a5af016..28c5c5e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -29,7 +29,7 @@ gazelle_binary( alias( name = "go", - actual = "@rules_go//go", + actual = "@io_bazel_rules_go//go", ) write_source_files( diff --git a/MODULE.bazel b/MODULE.bazel index b0c3999..aaab418 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,7 +8,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.7.3") bazel_dep(name = "aspect_rules_lint", version = "1.0.8") bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "gazelle", version = "0.38.0") -bazel_dep(name = "rules_go", version = "0.47.1") +bazel_dep(name = "rules_go", version = "0.47.1", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_nodejs", version = "6.3.2") bazel_dep(name = "rules_pkg", version = "0.10.1") bazel_dep(name = "stardoc", version = "0.6.2") @@ -16,7 +16,7 @@ bazel_dep(name = "stardoc", version = "0.6.2") bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.6.1", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "7.3.1", dev_dependency = True) -go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") +go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") go_sdk.download( name = "go_sdk", version = "1.22.5", diff --git a/examples/go-multiarch-image/BUILD.bazel b/examples/go-multiarch-image/BUILD.bazel index 5cb0f9b..c135558 100644 --- a/examples/go-multiarch-image/BUILD.bazel +++ b/examples/go-multiarch-image/BUILD.bazel @@ -1,5 +1,5 @@ load("@com_github_datadog_rules_oci//oci:defs.bzl", "oci_push") -load("@rules_go//go:def.bzl", "go_binary", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") load(":go.bzl", "go_multiarch_image") go_library( diff --git a/examples/go-multiarch-image/go.bzl b/examples/go-multiarch-image/go.bzl index 362352f..ab9c3cd 100644 --- a/examples/go-multiarch-image/go.bzl +++ b/examples/go-multiarch-image/go.bzl @@ -1,8 +1,14 @@ # buildifier: disable=module-docstring load("@com_github_datadog_rules_oci//oci:defs.bzl", "oci_image", "oci_image_index", "oci_image_layer") -load("@rules_go//go:def.bzl", "go_binary") +load("@io_bazel_rules_go//go:def.bzl", "go_binary") -def go_multiarch_image(name, base, archs, binary_name = "", binary_dir = "/app", **kwargs): +def go_multiarch_image( + name, + base, + archs, + binary_name = "", + binary_dir = "/app", + **kwargs): # buildifier: disable=function-docstring-args """ Create a multiarch image from a go library. diff --git a/go/cmd/ocitool/BUILD.bazel b/go/cmd/ocitool/BUILD.bazel index 127df6b..85fe824 100644 --- a/go/cmd/ocitool/BUILD.bazel +++ b/go/cmd/ocitool/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_binary", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") go_library( name = "go_default_library", diff --git a/go/internal/flagutil/BUILD.bazel b/go/internal/flagutil/BUILD.bazel index 2b0b47a..b0ea088 100644 --- a/go/internal/flagutil/BUILD.bazel +++ b/go/internal/flagutil/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/internal/set/BUILD.bazel b/go/internal/set/BUILD.bazel index c7422bc..62fffba 100644 --- a/go/internal/set/BUILD.bazel +++ b/go/internal/set/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/internal/tarutil/BUILD.bazel b/go/internal/tarutil/BUILD.bazel index 82fa30d..e3c34fc 100644 --- a/go/internal/tarutil/BUILD.bazel +++ b/go/internal/tarutil/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/pkg/blob/BUILD.bazel b/go/pkg/blob/BUILD.bazel index 8988fd4..264ca30 100644 --- a/go/pkg/blob/BUILD.bazel +++ b/go/pkg/blob/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/pkg/credhelper/BUILD.bazel b/go/pkg/credhelper/BUILD.bazel index dc4de28..2351d3b 100644 --- a/go/pkg/credhelper/BUILD.bazel +++ b/go/pkg/credhelper/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/pkg/deb2layer/BUILD.bazel b/go/pkg/deb2layer/BUILD.bazel index 6618e70..f8bec80 100644 --- a/go/pkg/deb2layer/BUILD.bazel +++ b/go/pkg/deb2layer/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library", "go_test") +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", diff --git a/go/pkg/jsonutil/BUILD.bazel b/go/pkg/jsonutil/BUILD.bazel index 419502d..9f7d756 100644 --- a/go/pkg/jsonutil/BUILD.bazel +++ b/go/pkg/jsonutil/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/pkg/layer/BUILD.bazel b/go/pkg/layer/BUILD.bazel index 2cc644c..9e9d438 100644 --- a/go/pkg/layer/BUILD.bazel +++ b/go/pkg/layer/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/go/pkg/ociutil/BUILD.bazel b/go/pkg/ociutil/BUILD.bazel index 68da8f6..933946a 100644 --- a/go/pkg/ociutil/BUILD.bazel +++ b/go/pkg/ociutil/BUILD.bazel @@ -1,4 +1,4 @@ -load("@rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", diff --git a/release/pkg_go_binary_multiple_platforms.bzl b/release/pkg_go_binary_multiple_platforms.bzl index d63c604..4b4ded6 100644 --- a/release/pkg_go_binary_multiple_platforms.bzl +++ b/release/pkg_go_binary_multiple_platforms.bzl @@ -1,6 +1,6 @@ """ pkg_go_binary_multiple_platforms """ -load("@rules_go//go:def.bzl", _go_binary = "go_binary") +load("@io_bazel_rules_go//go:def.bzl", _go_binary = "go_binary") load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files") _GOOSS = ["darwin", "linux"]