diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index fc4309a..fa9bcb2 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -1,28 +1,16 @@ -load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "register_yq_toolchains") +load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains") -load("@base_pip3//:requirements.bzl", pip_dependencies = "install_deps") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") -load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") load("@com_github_aignas_rules_shellcheck//:deps.bzl", "shellcheck_dependencies") -load("@com_github_chrusty_protoc_gen_jsonschema//:deps.bzl", protoc_gen_jsonschema_go_dependencies = "go_dependencies") load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps") -load("@dev_pip3//:requirements.bzl", pip_dev_dependencies = "install_deps") -load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") -load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains") load("@envoy_toolshed//compile:sanitizer_libs.bzl", "setup_sanitizer_libs") load("@envoy_toolshed//coverage/grcov:grcov_repository.bzl", "grcov_repository") -load("@fuzzing_pip3//:requirements.bzl", pip_fuzzing_dependencies = "install_deps") load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies") -load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies") load("@rules_buf//buf:repositories.bzl", "rules_buf_toolchains") load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies") load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains") -load("@rules_rust//crate_universe:defs.bzl", "crates_repository") -load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") -load("@rules_rust//rust:defs.bzl", "rust_common") -load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") # go version for rules_go GO_VERSION = "1.24.6" @@ -36,7 +23,6 @@ BUF_VERSION = "v1.56.0" def envoy_dependency_imports( go_version = GO_VERSION, jq_version = JQ_VERSION, - yq_version = YQ_VERSION, buf_sha = BUF_SHA, buf_version = BUF_VERSION): compatibility_proxy_repo() @@ -47,41 +33,14 @@ def envoy_dependency_imports( go_rules_dependencies() go_register_toolchains(version = "host") gazelle_dependencies(go_sdk = "go_sdk") - apple_rules_dependencies() - pip_dependencies() - pip_dev_dependencies() - pip_fuzzing_dependencies() rules_pkg_dependencies() - emscripten_deps(emscripten_version = "4.0.6") - register_emscripten_toolchains() - - rust_repository_set( - name = "rust_linux_s390x", - exec_triple = "s390x-unknown-linux-gnu", - extra_target_triples = [ - "wasm32-unknown-unknown", - "wasm32-wasi", - ], - versions = [rust_common.default_version], - ) - rules_rust_dependencies() - rust_register_toolchains( - extra_target_triples = [ - "wasm32-unknown-unknown", - "wasm32-wasi", - ], - ) - crate_universe_dependencies() - crates_repositories() grcov_repository() shellcheck_dependencies() - proxy_wasm_rust_sdk_dependencies() rules_fuzzing_dependencies( - oss_fuzz = True, + oss_fuzz = False, honggfuzz = False, ) register_jq_toolchains(version = jq_version) - register_yq_toolchains(version = yq_version) parser_deps() rules_buf_toolchains( @@ -168,9 +127,14 @@ def envoy_dependency_imports( go_repository( name = "com_github_spf13_afero", importpath = "github.com/spf13/afero", - sum = "h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=", - version = "v1.3.4", + sum = "h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=", + version = "v1.10.0", build_external = "external", + build_directives = [ + "gazelle:resolve go golang.org/x/text/runes @org_golang_x_text//runes", + "gazelle:resolve go golang.org/x/text/transform @org_golang_x_text//transform", + "gazelle:resolve go golang.org/x/text/unicode/norm @org_golang_x_text//unicode/norm", + ], # project_url = "https://pkg.go.dev/github.com/spf13/afero", # last_update = "2021-03-20" # use_category = ["api"], @@ -179,9 +143,18 @@ def envoy_dependency_imports( go_repository( name = "com_github_lyft_protoc_gen_star_v2", importpath = "github.com/lyft/protoc-gen-star/v2", - sum = "h1:keaAo8hRuAT0O3DfJ/wM3rufbAjGeJ1lAtWZHDjKGB0=", - version = "v2.0.1", + sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=", + version = "v2.0.4-0.20230330145011-496ad1ac90a4", build_external = "external", + build_file_generation = "on", + build_directives = [ + "gazelle:resolve go github.com/spf13/afero @com_github_spf13_afero//:afero", + "gazelle:resolve go google.golang.org/protobuf/proto @org_golang_google_protobuf//proto", + "gazelle:resolve go google.golang.org/protobuf/runtime/protoimpl @org_golang_google_protobuf//runtime/protoimpl", + "gazelle:resolve go google.golang.org/protobuf/types/descriptorpb @org_golang_google_protobuf//types/descriptorpb", + "gazelle:resolve go google.golang.org/protobuf/types/pluginpb @org_golang_google_protobuf//types/pluginpb", + ], + build_extra_args = ["-exclude=lang/go/goimports.go"], # project_url = "https://pkg.go.dev/github.com/lyft/protoc-gen-star", # last_update = "2023-01-06" # use_category = ["api"], @@ -190,8 +163,8 @@ def envoy_dependency_imports( go_repository( name = "com_github_iancoleman_strcase", importpath = "github.com/iancoleman/strcase", - sum = "h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk=", - version = "v0.0.0-20180726023541-3605ed457bf7", + sum = "h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=", + version = "v0.2.0", build_external = "external", # project_url = "https://pkg.go.dev/github.com/iancoleman/strcase", # last_update = "2020-11-22" @@ -206,39 +179,5 @@ def envoy_dependency_imports( build_external = "external", ) - protoc_gen_jsonschema_go_dependencies() rules_proto_grpc_toolchains() -def envoy_download_go_sdks(go_version): - go_download_sdk( - name = "go_linux_amd64", - goos = "linux", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_linux_arm64", - goos = "linux", - goarch = "arm64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_amd64", - goos = "darwin", - goarch = "amd64", - version = go_version, - ) - go_download_sdk( - name = "go_darwin_arm64", - goos = "darwin", - goarch = "arm64", - version = go_version, - ) - -def crates_repositories(): - crates_repository( - name = "dynamic_modules_rust_sdk_crate_index", - cargo_lockfile = "@envoy//source/extensions/dynamic_modules/sdk/rust:Cargo.lock", - lockfile = Label("@envoy//source/extensions/dynamic_modules/sdk/rust:Cargo.Bazel.lock"), - manifests = ["@envoy//source/extensions/dynamic_modules/sdk/rust:Cargo.toml"], - )