From 594932cf043924f15f6ddad2f5003dddbfac8af1 Mon Sep 17 00:00:00 2001 From: Radek Ryckowski Date: Thu, 9 Nov 2023 15:53:05 +0000 Subject: [PATCH] bazel support for v0.44.0 --- WORKSPACE | 8 ++-- expfmt/BUILD.bazel | 7 ++-- go_repositories.bzl | 96 ++++++++++++++++++++++++--------------------- 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 01e576e8..b7e10b6d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,10 +5,10 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") http_archive( name = "io_bazel_rules_go", - sha256 = "f2dcd210c7095febe54b804bb1cd3a58fe8435a909db2ec04e31542631cf715c", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) @@ -59,7 +59,7 @@ go_dependencies() go_rules_dependencies() -go_register_toolchains(version = "1.18.4") +go_register_toolchains(version = "1.21.4") gazelle_dependencies() diff --git a/expfmt/BUILD.bazel b/expfmt/BUILD.bazel index d475433b..22dd6141 100644 --- a/expfmt/BUILD.bazel +++ b/expfmt/BUILD.bazel @@ -15,9 +15,10 @@ go_library( deps = [ "//internal/bitbucket.org/ww/goautoneg", "//model", - "@com_github_golang_protobuf//proto:go_default_library", "@com_github_matttproud_golang_protobuf_extensions//pbutil", "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//encoding/prototext", + "@org_golang_google_protobuf//proto", ], ) @@ -41,9 +42,9 @@ go_test( embed = [":expfmt"], deps = [ "//model", - "@com_github_golang_protobuf//proto:go_default_library", - "@com_github_golang_protobuf//ptypes:go_default_library_gen", "@com_github_matttproud_golang_protobuf_extensions//pbutil", "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//types/known/timestamppb", ], ) diff --git a/go_repositories.bzl b/go_repositories.bzl index d0112d58..e40bb217 100644 --- a/go_repositories.bzl +++ b/go_repositories.bzl @@ -6,8 +6,8 @@ def go_dependencies(): name = "com_github_alecthomas_kingpin_v2", build_file_proto_mode = "disable", importpath = "github.com/alecthomas/kingpin/v2", - sum = "h1:ANLJcKmQm4nIaog7xdr/id6FM6zm5hHnfZrvtKPxqGg=", - version = "v2.3.1", + sum = "h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU=", + version = "v2.3.2", ) go_repository( @@ -29,8 +29,8 @@ def go_dependencies(): name = "com_github_cespare_xxhash_v2", build_file_proto_mode = "disable", importpath = "github.com/cespare/xxhash/v2", - sum = "h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=", - version = "v2.1.2", + sum = "h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=", + version = "v2.2.0", ) go_repository( @@ -60,16 +60,16 @@ def go_dependencies(): name = "com_github_golang_protobuf", build_file_proto_mode = "disable", importpath = "github.com/golang/protobuf", - sum = "h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=", - version = "v1.5.2", + sum = "h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=", + version = "v1.5.3", ) go_repository( name = "com_github_google_go_cmp", build_file_proto_mode = "disable", importpath = "github.com/google/go-cmp", - sum = "h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=", - version = "v0.5.8", + sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=", + version = "v0.5.9", ) go_repository( @@ -99,8 +99,8 @@ def go_dependencies(): name = "com_github_kr_pretty", build_file_proto_mode = "disable", importpath = "github.com/kr/pretty", - sum = "h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=", - version = "v0.2.1", + sum = "h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=", + version = "v0.3.1", ) go_repository( name = "com_github_kr_pty", @@ -127,8 +127,8 @@ def go_dependencies(): name = "com_github_modern_go_concurrent", build_file_proto_mode = "disable", importpath = "github.com/modern-go/concurrent", - sum = "h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=", - version = "v0.0.0-20180228061459-e0a39a4cb421", + sum = "h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=", + version = "v0.0.0-20180306012644-bacd9c7ef1dd", ) go_repository( name = "com_github_modern_go_reflect2", @@ -156,45 +156,53 @@ def go_dependencies(): name = "com_github_prometheus_client_golang", build_file_proto_mode = "disable", importpath = "github.com/prometheus/client_golang", - sum = "h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=", - version = "v1.14.0", + sum = "h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=", + version = "v1.15.1", ) go_repository( name = "com_github_prometheus_client_model", build_file_proto_mode = "disable", importpath = "github.com/prometheus/client_model", - sum = "h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=", - version = "v0.3.0", + sum = "h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=", + version = "v0.4.0", ) go_repository( name = "com_github_prometheus_procfs", build_file_proto_mode = "disable", importpath = "github.com/prometheus/procfs", - sum = "h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=", - version = "v0.8.0", + sum = "h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=", + version = "v0.9.0", + ) + go_repository( + name = "com_github_rogpeppe_go_internal", + build_file_proto_mode = "disable", + importpath = "github.com/rogpeppe/go-internal", + sum = "h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=", + version = "v1.10.0", ) go_repository( name = "com_github_stretchr_objx", build_file_proto_mode = "disable", importpath = "github.com/stretchr/objx", - sum = "h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=", - version = "v0.4.0", + sum = "h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=", + version = "v0.1.0", ) go_repository( name = "com_github_stretchr_testify", build_file_proto_mode = "disable", importpath = "github.com/stretchr/testify", - sum = "h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=", - version = "v1.8.0", + sum = "h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=", + version = "v1.8.2", ) go_repository( - name = "com_github_xhit_go_str2duration", + name = "com_github_xhit_go_str2duration_v2", build_file_proto_mode = "disable", - importpath = "github.com/xhit/go-str2duration", - sum = "h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=", - version = "v1.2.0", + importpath = "github.com/xhit/go-str2duration/v2", + sum = "h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=", + version = "v2.1.0", ) + go_repository( name = "com_google_cloud_go_compute_metadata", build_file_proto_mode = "disable", @@ -238,8 +246,8 @@ def go_dependencies(): name = "org_golang_google_protobuf", build_file_proto_mode = "disable", importpath = "google.golang.org/protobuf", - sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=", - version = "v1.28.1", + sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=", + version = "v1.30.0", ) go_repository( name = "org_golang_x_crypto", @@ -253,58 +261,58 @@ def go_dependencies(): name = "org_golang_x_mod", build_file_proto_mode = "disable", importpath = "golang.org/x/mod", - sum = "h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=", - version = "v0.6.0-dev.0.20220419223038-86c51ed26bb4", + sum = "h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=", + version = "v0.8.0", ) go_repository( name = "org_golang_x_net", build_file_proto_mode = "disable", importpath = "golang.org/x/net", - sum = "h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=", - version = "v0.7.0", + sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=", + version = "v0.10.0", ) go_repository( name = "org_golang_x_oauth2", build_file_proto_mode = "disable", importpath = "golang.org/x/oauth2", - sum = "h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=", - version = "v0.5.0", + sum = "h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=", + version = "v0.8.0", ) go_repository( name = "org_golang_x_sync", build_file_proto_mode = "disable", importpath = "golang.org/x/sync", - sum = "h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=", - version = "v0.0.0-20220601150217-0de741cfad7f", + sum = "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=", + version = "v0.1.0", ) go_repository( name = "org_golang_x_sys", build_file_proto_mode = "disable", importpath = "golang.org/x/sys", - sum = "h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=", - version = "v0.5.0", + sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=", + version = "v0.8.0", ) go_repository( name = "org_golang_x_term", build_file_proto_mode = "disable", importpath = "golang.org/x/term", - sum = "h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=", - version = "v0.5.0", + sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=", + version = "v0.8.0", ) go_repository( name = "org_golang_x_text", build_file_proto_mode = "disable", importpath = "golang.org/x/text", - sum = "h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=", - version = "v0.7.0", + sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=", + version = "v0.9.0", ) go_repository( name = "org_golang_x_tools", build_file_proto_mode = "disable", importpath = "golang.org/x/tools", - sum = "h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=", - version = "v0.1.12", + sum = "h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=", + version = "v0.6.0", ) go_repository( name = "org_golang_x_xerrors",