diff --git a/MODULE.bazel b/MODULE.bazel index 388950354..c8a28c800 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,7 +5,7 @@ bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "gazelle", version = "0.36.0") bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_go", version = "0.47.1", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_go", version = "0.48.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "rules_pkg", version = "0.10.1") bazel_dep(name = "rules_proto", version = "6.0.0") bazel_dep(name = "rules_python", version = "0.32.2") @@ -20,15 +20,6 @@ git_override( remote = "https://github.com/bazelbuild/bazel-gazelle", ) -# replace go with a pre-release version -# move timeout handling back to bzltestutil -# remove after https://github.com/bazelbuild/rules_go/pull/3939 is merged -git_override( - module_name = "rules_go", - commit = "cc911bfec4f52d93d1c47cc92a3bc03ec8f9cb33", - remote = "https://github.com/bazelbuild/rules_go", -) - go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") go_sdk.download( name = "go_sdk", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index c16b5b1e0..d1c3a7da7 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "f5aabeaa86601f89a9e222914be7b7bef4cef74d7352d4d82650140637278493", + "moduleFileHash": "1434155b8f89da6ec56086071a305bf426ed01c58cfd80be5a47044b524ab9a2", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -30,7 +30,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 32, + "line": 23, "column": 23 }, "imports": {}, @@ -48,7 +48,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 33, + "line": 24, "column": 16 } } @@ -62,7 +62,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 41, + "line": 32, "column": 24 }, "imports": { @@ -193,7 +193,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 42, + "line": 33, "column": 18 } }, @@ -208,7 +208,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 170, + "line": 161, "column": 29 } }, @@ -223,7 +223,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 170, + "line": 161, "column": 29 } }, @@ -238,7 +238,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 170, + "line": 161, "column": 29 } }, @@ -253,7 +253,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 179, + "line": 170, "column": 24 } }, @@ -268,7 +268,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 185, + "line": 176, "column": 24 } }, @@ -286,7 +286,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 191, + "line": 182, "column": 24 } }, @@ -303,7 +303,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 200, + "line": 191, "column": 24 } } @@ -318,7 +318,7 @@ "gazelle": "gazelle@_", "hermetic_cc_toolchain": "hermetic_cc_toolchain@3.1.0", "rules_cc": "rules_cc@0.0.9", - "io_bazel_rules_go": "rules_go@_", + "io_bazel_rules_go": "rules_go@0.48.0", "rules_pkg": "rules_pkg@0.10.1", "rules_proto": "rules_proto@6.0.0", "rules_python": "rules_python@0.32.2", @@ -620,7 +620,7 @@ "bazel_features": "bazel_features@1.9.1", "bazel_skylib": "bazel_skylib@1.6.1", "com_google_protobuf": "protobuf@21.7", - "io_bazel_rules_go": "rules_go@_", + "io_bazel_rules_go": "rules_go@0.48.0", "rules_proto": "rules_proto@6.0.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -731,10 +731,10 @@ } } }, - "rules_go@_": { + "rules_go@0.48.0": { "name": "rules_go", - "version": "0.47.1", - "key": "rules_go@_", + "version": "0.48.0", + "key": "rules_go@0.48.0", "repoName": "io_bazel_rules_go", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -744,9 +744,9 @@ { "extensionBzlFile": "@io_bazel_rules_go//go:extensions.bzl", "extensionName": "go_sdk", - "usingModule": "rules_go@_", + "usingModule": "rules_go@0.48.0", "location": { - "file": "@@rules_go~//:MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_go/0.48.0/MODULE.bazel", "line": 16, "column": 23 }, @@ -764,7 +764,7 @@ }, "devDependency": false, "location": { - "file": "@@rules_go~//:MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_go/0.48.0/MODULE.bazel", "line": 17, "column": 16 } @@ -776,9 +776,9 @@ { "extensionBzlFile": "@gazelle//:extensions.bzl", "extensionName": "go_deps", - "usingModule": "rules_go@_", + "usingModule": "rules_go@0.48.0", "location": { - "file": "@@rules_go~//:MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_go/0.48.0/MODULE.bazel", "line": 32, "column": 24 }, @@ -803,7 +803,7 @@ }, "devDependency": false, "location": { - "file": "@@rules_go~//:MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_go/0.48.0/MODULE.bazel", "line": 33, "column": 18 } @@ -822,6 +822,19 @@ "gazelle": "gazelle@_", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip" + ], + "integrity": "sha256-M6zErg9wUC20uJPJ/B3Xqb+ZjCPn/yxFF3QdQEmpdvg=", + "strip_prefix": "", + "remote_patches": {}, + "remote_patch_strip": 0 + } } }, "rules_pkg@0.10.1": { diff --git a/go.mod b/go.mod index 22a04cf78..4e57c8910 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.7 github.com/aws/smithy-go v1.20.2 github.com/bazelbuild/buildtools v0.0.0-20240422193413-1429e15ae755 - github.com/bazelbuild/rules_go v0.47.1 + github.com/bazelbuild/rules_go v0.48.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/docker/docker v26.1.2+incompatible github.com/edgelesssys/go-azguestattestation v0.0.0-20240513062303-05f8770a633d diff --git a/go.sum b/go.sum index 4807f7721..70e2e754c 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/bazelbuild/buildtools v0.0.0-20240422193413-1429e15ae755 h1:hqhMmuZiSNwCWVHqnpr4DZfIeZ2/aJF7fs207eg7HZo= github.com/bazelbuild/buildtools v0.0.0-20240422193413-1429e15ae755/go.mod h1:689QdV3hBP7Vo9dJMmzhoYIyo/9iMhEmHkJcnaPRCbo= -github.com/bazelbuild/rules_go v0.47.1 h1:9s9FA2l8IAxCbwV97E1WLu5ai21muLNrjZRV0+agTRs= -github.com/bazelbuild/rules_go v0.47.1/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= +github.com/bazelbuild/rules_go v0.48.0 h1:fZgo6mCUKeL/+GQiMWy5/QU1FjNXGPnTd5bAeao1pbg= +github.com/bazelbuild/rules_go v0.48.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=