Use pkg_tar from rules_pkg to fix image build workflow

PiperOrigin-RevId: 692764143
GoogleCloudPlatform · Nov 4, 2024 · d2ba834 · d2ba834
1 parent 1f0e1da
commit d2ba834
Show file tree

Hide file tree

Showing 3 changed files with 142 additions and 40 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -0,0 +1,2 @@
+common --noenable_bzlmod
+common --@io_bazel_rules_docker//transitions:enable=false
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,22 +16,29 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "ab21448cef298740765f33a7f5acee0607203e4ea321219f2a4c85a6e0fb0a27",
+    sha256 = "67b4d1f517ba73e0a92eb2f57d821f2ddc21f5bc2bd7a231573f11bd8758192e",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.32.0/rules_go-v0.32.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.32.0/rules_go-v0.32.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.50.0/rules_go-v0.50.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.50.0/rules_go-v0.50.0.zip",
     ],
 )
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "62ca106be173579c0a167deb23358fdfe71ffa1e4cfdddf5582af26520f1c66f",
+    sha256 = "b760f7fe75173886007f7c2e616a21241208f3d90e8657dc65d36a771e916b6a",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.23.0/bazel-gazelle-v0.23.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.39.1/bazel-gazelle-v0.39.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.39.1/bazel-gazelle-v0.39.1.tar.gz",
     ],
 )
 
+http_archive(
+    name = "rules_proto",
+    sha256 = "303e86e722a520f6f326a50b41cfc16b98fe6d1955ce46642a5b7a67c11c0f5d",
+    strip_prefix = "rules_proto-6.0.0",
+    url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz",
+)
+
 http_archive(
     name = "com_google_protobuf",
     sha256 = "d0f5f605d0d656007ce6c8b5a82df3037e1d8fe8b121ed42e536f569dec16113",
@@ -46,11 +53,48 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
-load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
+
+rules_proto_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+
+rules_proto_toolchains()
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
-go_register_toolchains(version = "1.18.2")
+go_register_toolchains(version = "1.23.0")
+
+http_archive(
+    name = "rules_pkg",
+    sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
+    ],
+)
+
+load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+
+rules_pkg_dependencies()
+
+http_archive(
+    name = "rules_license",
+    sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381",
+    urls = [
+        "https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
+    ],
+)
+
+load("@rules_license//:deps.bzl", "rules_license_dependencies")
+
+rules_license_dependencies()
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
@@ -59,79 +103,136 @@ gazelle_dependencies()
 go_repository(
     name = "io_opencensus_go",
     importpath = "go.opencensus.io",
-    sum = "h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=",
-    version = "v0.23.0",
+    sum = "h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=",
+    version = "v0.24.0",
 )
 
 go_repository(
     name = "org_golang_google_grpc",
     importpath = "google.golang.org/grpc",
-    sum = "h1:c+E5hkHV2oYLLcjZ0Uulu4thvOFKB0a9TWvowIWqgu4=",
-    version = "v1.39.0-dev.0.20210518002758-2713b77e8526",
+    sum = "h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=",
+    version = "v1.65.0",
 )
 
 go_repository(
     name = "io_opencensus_go_contrib_exporter_stackdriver",
+    importpath = "contrib.go.opencensus.io/exporter/stackdriver",
     sum = "h1:lIFYmQsqejvlq+GobFUbC5F0prD5gvhP6r0gWLZRDq4=",
     version = "v0.13.8",
-    importpath = "contrib.go.opencensus.io/exporter/stackdriver",
 )
 
 go_repository(
-   name = "org_golang_google_api",
+    name = "org_golang_google_api",
     importpath = "google.golang.org/api",
-    sum = "h1:MDkAbYIB1JpSgCTOCYYoIec/coMlKK4oVbpnBLLcyT0=",
-    version = "v0.58.0",
+    sum = "h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ=",
+    version = "v0.103.0",
+)
+
+GOOGLEAPIS_GIT_SHA = "5e6eb76b661f7002a944add149e1ed840ca82bae"  # Feb 1, 2024
+
+http_archive(
+    name = "com_google_googleapis",
+    sha256 = "3285aa5fadc1ea023a82109cf417d818e593df1698faba47ca451ea2502dc43c",
+    strip_prefix = "googleapis-" + GOOGLEAPIS_GIT_SHA,
+    urls = ["https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_GIT_SHA + ".tar.gz"],
+)
+
+load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+
+switched_rules_by_language(
+    name = "com_google_googleapis_imports",
+    go = True,
+    grpc = True,
+)
+
+go_repository(
+    name = "com_github_googleapis_gax_go_v2",
+    build_directives = [
+        "gazelle:resolve proto google/rpc/code.proto @com_google_googleapis//google/rpc:code_proto",
+        "gazelle:resolve proto go google/rpc/code.proto @org_golang_google_genproto_googleapis_rpc//code:code",
+    ],
+    importpath = "github.com/googleapis/gax-go/v2",
+    sum = "h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=",
+    version = "v2.11.0",
+)
+
+go_repository(
+    name = "org_golang_google_genproto_googleapis_api",
+    importpath = "google.golang.org/genproto/googleapis/api",
+    sum = "h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw=",
+    version = "v0.0.0-20241021214115-324edc3d5d38",
+)
+
+go_repository(
+    name = "com_google_cloud_go_iam",
     build_file_proto_mode = "disable_global",
+    importpath = "cloud.google.com/go/iam",
+    sum = "h1:hlQJMovyJJwYjZcTohUH4o1L8Z8kYz+E+W/zktiLCBc=",
+    version = "v1.0.0",
 )
 
 go_repository(
-    name = "com_github_googleapis_gax_go",
-    commit = "be11bb253a768098254dc71e95d1a81ced778de3",
-    importpath = "github.com/googleapis/gax-go",
+    name = "org_golang_google_genproto_googleapis_rpc",
+    importpath = "google.golang.org/genproto/googleapis/rpc",
+    sum = "h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=",
+    version = "v0.0.0-20230530153820-e85fd2cbaebc",
+)
+
+go_repository(
+    name = "com_google_cloud_go_compute_metadata",
+    importpath = "cloud.google.com/go/compute/metadata",
+    sum = "h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=",
+    version = "v0.2.3",
+)
+
+go_repository(
+    name = "com_github_googleapis_enterprise_certificate_proxy",
+    importpath = "github.com/googleapis/enterprise-certificate-proxy",
+    sum = "h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=",
+    version = "v0.2.0",
 )
 
 go_repository(
     name = "com_google_cloud_go",
     importpath = "cloud.google.com/go",
-    sum = "h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY=",
-    version = "v0.99.0",
+    sum = "h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM=",
+    version = "v0.111.0",
 )
 
 go_repository(
     name = "com_google_cloud_go_monitoring",
     importpath = "cloud.google.com/go/monitoring",
-    sum = "h1:BbbME861YCj/jJnvO/gVcPmqqjfGhiGgFu3DFeP09yU=",
-    version = "v1.0.0",
+    sum = "h1:c9riaGSPQ4dUKWB+M1Fl0N+iLxstMbCktdEwYSPGDvA=",
+    version = "v1.8.0",
 )
 
 go_repository(
     name = "com_google_cloud_go_pubsub",
     importpath = "cloud.google.com/go/pubsub",
-    sum = "h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU=",
-    version = "v1.3.1",
+    sum = "h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g=",
+    version = "v1.33.0",
 )
 
 go_repository(
     name = "com_google_cloud_go_trace",
     importpath = "cloud.google.com/go/trace",
-    sum = "h1:laKx2y7IWMjguCe5zZx6n7qLtREk4kyE69SXVC0VSN8=",
-    version = "v1.0.0",
+    sum = "h1:qO9eLn2esajC9sxpqp1YKX37nXC3L4BfGnPS0Cx9dYo=",
+    version = "v1.4.0",
 )
 
 go_repository(
     name = "com_github_census_instrumentation_opencensus_proto",
-    importpath = "github.com/census-instrumentation/opencensus-proto",
-    sum = "h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=",
-    version = "v0.2.1",
     build_extra_args = ["-exclude=src"],  # See https://github.com/census-instrumentation/opencensus-proto/issues/200
+    importpath = "github.com/census-instrumentation/opencensus-proto",
+    sum = "h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=",
+    version = "v0.4.1",
 )
 
 go_repository(
     name = "com_github_aws_aws_sdk_go",
     importpath = "github.com/aws/aws-sdk-go",
-    sum = "h1:m45+Ru/wA+73cOZXiEGLDH2d9uLN3iHqMc0/z4noDXE=",
-    version = "v1.15.11",
+    sum = "h1:0xphMHGMLBrPMfxR2AmVjZKcMEESEgWF8Kru94BNByk=",
+    version = "v1.27.0",
 )
 
 go_repository(
@@ -142,7 +243,7 @@ go_repository(
 )
 
 go_repository(
-   name = "com_github_jmespath_go_jmespath",
+    name = "com_github_jmespath_go_jmespath",
     importpath = "github.com/jmespath/go-jmespath",
     sum = "h1:SMvOWPJCES2GdFracYbBQh93GXac8fq7HeN6JnpduB8=",
     version = "v0.0.0-20160803190731-bd40a432e4c7",
@@ -206,9 +307,8 @@ go_repository(
 )
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "27d53c1d646fc9537a70427ad7b034734d08a9c38924cc6357cc973fed300820",
-    strip_prefix = "rules_docker-0.24.0",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.24.0/rules_docker-v0.24.0.tar.gz"],
+    sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"],
 )
 
 load("@io_bazel_rules_docker//go:image.bzl", _go_image_repos = "repositories")
@@ -227,7 +327,7 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
 
 container_pull(
     name = "ubuntu",
+    digest = "sha256:89f4d2d70727ff2fcccd6674a7b6dd1456e054732718ecc9904e6a9c16cf760c",
     registry = "gcr.io",
-    repository = "cloud-marketplace-containers/google/ubuntu1604",
-    digest = "sha256:8f0b64fd212007183434b8b3271b723700ab14e4230b5bec1415b79aaa3ac97b",
-)
+    repository = "cloud-marketplace-containers/google/ubuntu2404",
+)
diff --git a/shared/monitoring/BUILD.bazel b/shared/monitoring/BUILD.bazel
@@ -24,7 +24,7 @@ go_library(
         "//shared/util:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_google_uuid//:go_default_library",
-        "@com_google_cloud_go//compute/metadata:go_default_library",
+        "@com_google_cloud_go_compute_metadata//:go_default_library",
         "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
         "@io_opencensus_go//stats:go_default_library",
         "@io_opencensus_go//stats/view:go_default_library",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		common --noenable_bzlmod
		common --@io_bazel_rules_docker//transitions:enable=false