Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ module(

# Lower-bound dependency versions.
# Do not change unless the rules no longer work with the current version.
# Needed for #804 Use statically-linked bsdtar on all platforms
bazel_dep(name = "aspect_bazel_lib", version = "2.6.1")
bazel_dep(name = "aspect_bazel_lib", version = "2.19.3")
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "rules_oci", version = "1.7.4")
bazel_dep(name = "rules_python", version = "0.29.0")
bazel_dep(name = "tar.bzl", version = "0.3.0")

# Development dependencies which are not exposed to users
bazel_dep(name = "aspect_rules_py", version = "1.6.6", dev_dependency = True)
Expand Down
22 changes: 2 additions & 20 deletions aws/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@aspect_bazel_lib//:bzl_library.bzl", "bzl_library")
load("//aws/private:resolved_toolchain.bzl", "resolved_toolchain")

# This is the target rule authors should put in their "toolchains"
Expand All @@ -17,25 +17,6 @@ resolved_toolchain(
visibility = ["//visibility:public"],
)

bzl_library(
name = "repositories",
srcs = ["repositories.bzl"],
visibility = ["//visibility:public"],
deps = [
"//aws/private:toolchains_repo",
"//aws/private:versions",
"@bazel_tools//tools/build_defs/repo:http.bzl",
"@bazel_tools//tools/build_defs/repo:utils.bzl",
],
)

bzl_library(
name = "extensions",
srcs = ["extensions.bzl"],
visibility = ["//visibility:public"],
deps = [":repositories"],
)

bzl_library(
name = "defs",
srcs = ["defs.bzl"],
Expand All @@ -45,6 +26,7 @@ bzl_library(
"//aws/private:s3_sync",
"@rules_oci//oci:defs",
"@rules_python//python:defs_bzl",
"@tar.bzl//:tar",
],
)

Expand Down
2 changes: 1 addition & 1 deletion aws/private/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@aspect_bazel_lib//:bzl_library.bzl", "bzl_library")

exports_files(["s3_sync.sh"])

Expand Down
2 changes: 1 addition & 1 deletion aws/private/py_lambda.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"Rule to produce tar files with py_binary deps and app"

load("@aspect_bazel_lib//lib:tar.bzl", "tar")
load("@tar.bzl", "tar")

# Write these two separate layers, so application changes are a small delta when pushing to a registry
_LAYERS = ["app", "deps"]
Expand Down
9 changes: 8 additions & 1 deletion aws/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ def rules_aws_dependencies():
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.5.3/bazel-lib-v2.5.3.tar.gz",
)

http_archive(
name = "tar.bzl",
sha256 = "5a50cca492e849d5074ae0a9025f753e1ee81c20c7a45882ccf99ed8d5f56939",
strip_prefix = "tar.bzl-0.3.0",
url = "https://github.com/bazel-contrib/tar.bzl/releases/download/v0.3.0/tar.bzl-v0.3.0.tar.gz",
)

########
# Remaining content of the file is only used to support toolchains.
########
Expand Down Expand Up @@ -126,7 +133,7 @@ alias(name = "aws", actual = "//installed:{}/aws", visibility = ["//visibility:p

rctx.file("installed/BUILD.bazel", """\
# Generated by aws/repositories.bzl
load("@aspect_bazel_lib//lib:tar.bzl", "mtree_spec", "tar")
load("@tar.bzl", "mtree_spec", "tar")

package(default_visibility=["//visibility:public"])

Expand Down
Loading