From 61d89cd04191c5c293af606e5dc9b591cc1fc24e Mon Sep 17 00:00:00 2001 From: allada Date: Tue, 15 Aug 2023 21:45:58 -0500 Subject: [PATCH] Move Cargo.toml to Workspace and config to single library towards: #231 --- Cargo.Bazel.lock | 492 +++++++++--------- Cargo.lock | 112 ++-- Cargo.toml | 75 --- WORKSPACE | 163 +++++- config/BUILD | 39 +- config/cas_server.rs | 9 +- config/lib.rs | 6 +- config/schedulers.rs | 4 +- deployment-examples/docker-compose/Dockerfile | 2 +- proto/{BUILD => BUILD.bazel} | 0 10 files changed, 476 insertions(+), 426 deletions(-) delete mode 100644 Cargo.toml rename proto/{BUILD => BUILD.bazel} (100%) diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock index 483066a0f..ce839bcbe 100644 --- a/Cargo.Bazel.lock +++ b/Cargo.Bazel.lock @@ -1,5 +1,5 @@ { - "checksum": "dbd5cb231b829ad5fecb66047898c06e0f97a3c67302fbe78854dfbd0917ae48", + "checksum": "802af8a828f5206bae0c121dec1cbd3192f4218b0e944efaef9e66e22ff54975", "crates": { "addr2line 0.20.0": { "name": "addr2line", @@ -2494,6 +2494,245 @@ }, "license": "MIT OR Apache-2.0" }, + "direct-cargo-bazel-deps 0.0.1": { + "name": "direct-cargo-bazel-deps", + "version": "0.0.1", + "repository": null, + "targets": [ + { + "Library": { + "crate_name": "direct_cargo_bazel_deps", + "crate_root": ".direct_cargo_bazel_deps.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "direct_cargo_bazel_deps", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "async-lock 2.7.0", + "target": "async_lock" + }, + { + "id": "axum 0.6.19", + "target": "axum" + }, + { + "id": "bincode 1.3.3", + "target": "bincode" + }, + { + "id": "blake3 1.4.1", + "target": "blake3" + }, + { + "id": "byteorder 1.4.3", + "target": "byteorder" + }, + { + "id": "bytes 1.4.0", + "target": "bytes" + }, + { + "id": "clap 4.3.15", + "target": "clap" + }, + { + "id": "drop_guard 0.3.0", + "target": "drop_guard" + }, + { + "id": "env_logger 0.10.0", + "target": "env_logger" + }, + { + "id": "filetime 0.2.21", + "target": "filetime" + }, + { + "id": "fixed-buffer 0.2.3", + "target": "fixed_buffer" + }, + { + "id": "futures 0.3.28", + "target": "futures" + }, + { + "id": "hashbrown 0.14.0", + "target": "hashbrown" + }, + { + "id": "hex 0.4.3", + "target": "hex" + }, + { + "id": "http 0.2.9", + "target": "http" + }, + { + "id": "hyper 0.14.27", + "target": "hyper" + }, + { + "id": "json5 0.4.1", + "target": "json5" + }, + { + "id": "lazy_static 1.4.0", + "target": "lazy_static" + }, + { + "id": "log 0.4.19", + "target": "log" + }, + { + "id": "lru 0.10.1", + "target": "lru" + }, + { + "id": "lz4_flex 0.11.1", + "target": "lz4_flex" + }, + { + "id": "maplit 1.0.2", + "target": "maplit" + }, + { + "id": "mock_instant 0.3.1", + "target": "mock_instant" + }, + { + "id": "nix 0.26.2", + "target": "nix" + }, + { + "id": "parking_lot 0.12.1", + "target": "parking_lot" + }, + { + "id": "pin-project-lite 0.2.10", + "target": "pin_project_lite" + }, + { + "id": "pretty_assertions 1.4.0", + "target": "pretty_assertions" + }, + { + "id": "prometheus-client 0.21.2", + "target": "prometheus_client" + }, + { + "id": "prost 0.11.9", + "target": "prost" + }, + { + "id": "prost-build 0.11.9", + "target": "prost_build" + }, + { + "id": "prost-types 0.11.9", + "target": "prost_types" + }, + { + "id": "rand 0.8.5", + "target": "rand" + }, + { + "id": "relative-path 1.8.0", + "target": "relative_path" + }, + { + "id": "rusoto_core 0.48.0", + "target": "rusoto_core" + }, + { + "id": "rusoto_mock 0.48.0", + "target": "rusoto_mock" + }, + { + "id": "rusoto_s3 0.48.0", + "target": "rusoto_s3" + }, + { + "id": "rusoto_signature 0.48.0", + "target": "rusoto_signature" + }, + { + "id": "serde 1.0.171", + "target": "serde" + }, + { + "id": "sha2 0.10.7", + "target": "sha2" + }, + { + "id": "shellexpand 3.1.0", + "target": "shellexpand" + }, + { + "id": "shlex 1.1.0", + "target": "shlex" + }, + { + "id": "stdext 0.3.1", + "target": "stdext" + }, + { + "id": "tokio 1.29.1", + "target": "tokio" + }, + { + "id": "tokio-stream 0.1.14", + "target": "tokio_stream" + }, + { + "id": "tokio-util 0.7.8", + "target": "tokio_util" + }, + { + "id": "tonic 0.9.2", + "target": "tonic" + }, + { + "id": "tonic-build 0.9.2", + "target": "tonic_build" + }, + { + "id": "tower 0.4.13", + "target": "tower" + }, + { + "id": "uuid 1.4.1", + "target": "uuid" + } + ], + "selects": {} + }, + "edition": "2018", + "proc_macro_deps": { + "common": [ + { + "id": "async-trait 0.1.71", + "target": "async_trait" + }, + { + "id": "ctor 0.2.4", + "target": "ctor" + } + ], + "selects": {} + }, + "version": "0.0.1" + }, + "license": null + }, "dirs 5.0.1": { "name": "dirs", "version": "5.0.1", @@ -2747,255 +2986,6 @@ }, "license": "MIT OR Apache-2.0" }, - "dummy_name_to_make_cargo_tooling_happy 0.0.0": { - "name": "dummy_name_to_make_cargo_tooling_happy", - "version": "0.0.0", - "repository": null, - "targets": [ - { - "Library": { - "crate_name": "dummy_name_to_make_cargo_tooling_happy", - "crate_root": "needed_only_to_make_cargo_tooling_happy.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "dummy_name_to_make_cargo_tooling_happy", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "async-lock 2.7.0", - "target": "async_lock" - }, - { - "id": "axum 0.6.19", - "target": "axum" - }, - { - "id": "bincode 1.3.3", - "target": "bincode" - }, - { - "id": "blake3 1.4.1", - "target": "blake3" - }, - { - "id": "byteorder 1.4.3", - "target": "byteorder" - }, - { - "id": "bytes 1.4.0", - "target": "bytes" - }, - { - "id": "clap 4.3.15", - "target": "clap" - }, - { - "id": "drop_guard 0.3.0", - "target": "drop_guard" - }, - { - "id": "env_logger 0.10.0", - "target": "env_logger" - }, - { - "id": "filetime 0.2.21", - "target": "filetime" - }, - { - "id": "fixed-buffer 0.2.3", - "target": "fixed_buffer" - }, - { - "id": "futures 0.3.28", - "target": "futures" - }, - { - "id": "hashbrown 0.14.0", - "target": "hashbrown" - }, - { - "id": "hex 0.4.3", - "target": "hex" - }, - { - "id": "http 0.2.9", - "target": "http" - }, - { - "id": "hyper 0.14.27", - "target": "hyper" - }, - { - "id": "json5 0.4.1", - "target": "json5" - }, - { - "id": "lazy_static 1.4.0", - "target": "lazy_static" - }, - { - "id": "log 0.4.19", - "target": "log" - }, - { - "id": "lru 0.10.1", - "target": "lru" - }, - { - "id": "lz4_flex 0.11.1", - "target": "lz4_flex" - }, - { - "id": "nix 0.26.2", - "target": "nix" - }, - { - "id": "parking_lot 0.12.1", - "target": "parking_lot" - }, - { - "id": "pin-project-lite 0.2.10", - "target": "pin_project_lite" - }, - { - "id": "prometheus-client 0.21.2", - "target": "prometheus_client" - }, - { - "id": "prost 0.11.9", - "target": "prost" - }, - { - "id": "prost-types 0.11.9", - "target": "prost_types" - }, - { - "id": "rand 0.8.5", - "target": "rand" - }, - { - "id": "relative-path 1.8.0", - "target": "relative_path" - }, - { - "id": "rusoto_core 0.48.0", - "target": "rusoto_core" - }, - { - "id": "rusoto_s3 0.48.0", - "target": "rusoto_s3" - }, - { - "id": "rusoto_signature 0.48.0", - "target": "rusoto_signature" - }, - { - "id": "serde 1.0.171", - "target": "serde" - }, - { - "id": "sha2 0.10.7", - "target": "sha2" - }, - { - "id": "shellexpand 3.1.0", - "target": "shellexpand" - }, - { - "id": "shlex 1.1.0", - "target": "shlex" - }, - { - "id": "tokio 1.29.1", - "target": "tokio" - }, - { - "id": "tokio-stream 0.1.14", - "target": "tokio_stream" - }, - { - "id": "tokio-util 0.7.8", - "target": "tokio_util" - }, - { - "id": "tonic 0.9.2", - "target": "tonic" - }, - { - "id": "tower 0.4.13", - "target": "tower" - }, - { - "id": "uuid 1.4.1", - "target": "uuid" - } - ], - "selects": {} - }, - "deps_dev": { - "common": [ - { - "id": "maplit 1.0.2", - "target": "maplit" - }, - { - "id": "mock_instant 0.3.1", - "target": "mock_instant" - }, - { - "id": "pretty_assertions 1.4.0", - "target": "pretty_assertions" - }, - { - "id": "prost-build 0.11.9", - "target": "prost_build" - }, - { - "id": "rusoto_mock 0.48.0", - "target": "rusoto_mock" - }, - { - "id": "stdext 0.3.1", - "target": "stdext" - }, - { - "id": "tonic-build 0.9.2", - "target": "tonic_build" - } - ], - "selects": {} - }, - "edition": "2015", - "proc_macro_deps": { - "common": [ - { - "id": "async-trait 0.1.71", - "target": "async_trait" - } - ], - "selects": {} - }, - "proc_macro_deps_dev": { - "common": [ - { - "id": "ctor 0.2.4", - "target": "ctor" - } - ], - "selects": {} - }, - "version": "0.0.0" - }, - "license": null - }, "either 1.8.1": { "name": "either", "version": "1.8.1", @@ -13817,7 +13807,7 @@ }, "binary_crates": [], "workspace_members": { - "dummy_name_to_make_cargo_tooling_happy 0.0.0": "" + "direct-cargo-bazel-deps 0.0.1": "" }, "conditions": { "aarch64-linux-android": [], diff --git a/Cargo.lock b/Cargo.lock index eff14273e..9b0f1a000 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -470,62 +470,8 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "drop_guard" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dummy_name_to_make_cargo_tooling_happy" -version = "0.0.0" +name = "direct-cargo-bazel-deps" +version = "0.0.1" dependencies = [ "async-lock", "async-trait", @@ -580,6 +526,60 @@ dependencies = [ "uuid", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "drop_guard" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + [[package]] name = "either" version = "1.8.1" diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index 51c4d42af..000000000 --- a/Cargo.toml +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2022 The Turbo Cache Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[package] -name = "dummy_name_to_make_cargo_tooling_happy" -version = "0.0.0" - -[lib] -path = "needed_only_to_make_cargo_tooling_happy.rs" - -[dependencies] -prost = "0.11.9" -prost-types = "0.11.9" -hex = "0.4.3" -async-trait = "0.1.71" -fixed-buffer = "0.2.3" -futures = "0.3.28" -tokio = { version = "1.29.1", features = ["macros", "io-util", "fs", "rt-multi-thread", "parking_lot"] } -tokio-stream = { version = "0.1.14", features = ["fs", "sync"] } -tokio-util = { version = "0.7.8", features = ["io", "io-util", "codec"] } -tonic = { version = "0.9.2", features = ["gzip"] } -log = "0.4.19" -env_logger = "0.10.0" -serde = "1.0.167" -json5 = "0.4.1" -sha2 = "0.10.7" -lru = "0.10.1" -rand = "0.8.5" -rusoto_s3 = "0.48.0" -rusoto_core = "0.48.0" -rusoto_signature = "0.48.0" -http = "^0.2" -pin-project-lite = "0.2.10" -async-lock = "2.7.0" -lz4_flex = "0.11.1" -bincode = "1.3.3" -bytes = "1.4.0" -shellexpand = "3.1.0" -byteorder = "1.4.3" -lazy_static = "1.4.0" -filetime = "0.2.21" -nix = "0.26.2" -clap = { version = "4.3.11", features = ["derive"] } -uuid = { version = "1.4.0", features = ["v4"] } -shlex = "1.1.0" -relative-path = "1.8.0" -parking_lot = "0.12.1" -hashbrown = "0.14" -hyper = "0.14.27" -axum = "0.6.18" -tower = "0.4.13" -prometheus-client = "0.21.2" -blake3 = "1.4.1" -drop_guard = "0.3.0" - -[dev-dependencies] -stdext = "0.3.1" -prost-build = "0.11.9" -tonic-build = "0.9.2" -pretty_assertions = "1.4.0" -maplit = "1.0.2" -mock_instant = "0.3.1" -rusoto_mock = "=0.48.0" -ctor = "0.2.3" diff --git a/WORKSPACE b/WORKSPACE index 6c9b935e6..298666c9a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -39,13 +39,174 @@ load( "@rules_rust//crate_universe:defs.bzl", "crates_repository", "render_config", + "crate", ) crates_repository( name = "crate_index", cargo_lockfile = "//:Cargo.lock", lockfile = "//:Cargo.Bazel.lock", - manifests = ["//:Cargo.toml"], + packages = { + "prost": crate.spec( + version = "0.11.9", + ), + "prost-types": crate.spec( + version = "0.11.9", + ), + "hex": crate.spec( + version = "0.4.3", + ), + "async-trait": crate.spec( + version = "0.1.71", + ), + "fixed-buffer": crate.spec( + version = "0.2.3", + ), + "futures": crate.spec( + version = "0.3.28", + ), + "tokio": crate.spec( + version = "1.29.1", + features = ["macros", "io-util", "fs", "rt-multi-thread", "parking_lot"], + ), + "tokio-stream": crate.spec( + version = "0.1.14", + features = ["fs", "sync"], + ), + "tokio-util": crate.spec( + version = "0.7.8", + features = ["io", "io-util", "codec"], + ), + "tonic": crate.spec( + version = "0.9.2", + features = ["gzip"], + ), + "log": crate.spec( + version = "0.4.19", + ), + "env_logger": crate.spec( + version = "0.10.0", + ), + "serde": crate.spec( + version = "1.0.167", + ), + "json5": crate.spec( + version = "0.4.1", + ), + "sha2": crate.spec( + version = "0.10.7", + ), + "lru": crate.spec( + version = "0.10.1", + ), + "rand": crate.spec( + version = "0.8.5", + ), + "rusoto_s3": crate.spec( + version = "0.48.0", + ), + "rusoto_core": crate.spec( + version = "0.48.0", + ), + "rusoto_signature": crate.spec( + version = "0.48.0", + ), + "http": crate.spec( + version = "^0.2", + ), + "pin-project-lite": crate.spec( + version = "0.2.10", + ), + "async-lock": crate.spec( + version = "2.7.0", + ), + "lz4_flex": crate.spec( + version = "0.11.1", + ), + "bincode": crate.spec( + version = "1.3.3", + ), + "bytes": crate.spec( + version = "1.4.0", + ), + "shellexpand": crate.spec( + version = "3.1.0", + ), + "byteorder": crate.spec( + version = "1.4.3", + ), + "lazy_static": crate.spec( + version = "1.4.0", + ), + "filetime": crate.spec( + version = "0.2.21", + ), + "nix": crate.spec( + version = "0.26.2", + ), + "clap": crate.spec( + version = "4.3.11", + features = ["derive"], + ), + "uuid": crate.spec( + version = "1.4.0", + features = ["v4"], + ), + "shlex": crate.spec( + version = "1.1.0", + ), + "relative-path": crate.spec( + version = "1.8.0", + ), + "parking_lot": crate.spec( + version = "0.12.1", + ), + "hashbrown": crate.spec( + version = "0.14", + ), + "hyper": crate.spec( + version = "0.14.27", + ), + "axum": crate.spec( + version = "0.6.18", + ), + "tower": crate.spec( + version = "0.4.13", + ), + "prometheus-client": crate.spec( + version = "0.21.2", + ), + "blake3": crate.spec( + version = "1.4.1", + ), + "drop_guard": crate.spec( + version = "0.3.0", + ), + "stdext": crate.spec( + version = "0.3.1", + ), + "prost-build": crate.spec( + version = "0.11.9", + ), + "tonic-build": crate.spec( + version = "0.9.2", + ), + "pretty_assertions": crate.spec( + version = "1.4.0", + ), + "maplit": crate.spec( + version = "1.0.2", + ), + "mock_instant": crate.spec( + version = "0.3.1", + ), + "rusoto_mock": crate.spec( + version = "=0.48.0", + ), + "ctor": crate.spec( + version = "0.2.3", + ), + }, render_config = render_config( default_package_name = "", ), diff --git a/config/BUILD b/config/BUILD index 031d9bb8b..427bf32f1 100644 --- a/config/BUILD +++ b/config/BUILD @@ -8,41 +8,14 @@ exports_files([ rust_library( name = "config", - srcs = ["lib.rs"], - visibility = ["//visibility:public"], - deps = [ - ":schedulers", - ":stores", - ":cas_server", - "@crate_index//:serde", + srcs = [ + "lib.rs", + "cas_server.rs", + "stores.rs", + "schedulers.rs", ], -) - -rust_library( - name = "cas_server", - srcs = ["cas_server.rs"], - deps = [ - ":schedulers", - ":stores", - "//util:serde_utils", - "@crate_index//:serde", - ], -) - -rust_library( - name = "stores", - srcs = ["stores.rs"], - deps = [ - "//util:serde_utils", - "@crate_index//:serde", - ], -) - -rust_library( - name = "schedulers", - srcs = ["schedulers.rs"], + visibility = ["//visibility:public"], deps = [ - ":stores", "//util:serde_utils", "@crate_index//:serde", ], diff --git a/config/cas_server.rs b/config/cas_server.rs index ab0451c3f..633f4bb8f 100644 --- a/config/cas_server.rs +++ b/config/cas_server.rs @@ -15,9 +15,10 @@ use std::collections::HashMap; use serde::Deserialize; - use serde_utils::{convert_numeric_with_shellexpand, convert_string_with_shellexpand}; -use stores::StoreRefName; + +use crate::schedulers::SchedulerConfig; +use crate::stores::{StoreConfig, StoreRefName}; /// Name of the scheduler. This type will be used when referencing a /// scheduler in the `CasConfig::schedulers`'s map key. @@ -358,7 +359,7 @@ pub struct GlobalConfig { pub struct CasConfig { /// List of stores available to use in this config. /// The keys can be used in other configs when needing to reference a store. - pub stores: HashMap, + pub stores: HashMap, /// Worker configurations used to execute jobs. pub workers: Option>, @@ -366,7 +367,7 @@ pub struct CasConfig { /// List of schedulers available to use in this config. /// The keys can be used in other configs when needing to reference a /// scheduler. - pub schedulers: Option>, + pub schedulers: Option>, /// Servers to setup for this process. pub servers: Vec, diff --git a/config/lib.rs b/config/lib.rs index f613c2935..95282a63e 100644 --- a/config/lib.rs +++ b/config/lib.rs @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -pub use cas_server; -pub use schedulers; -pub use stores; +pub mod cas_server; +pub mod schedulers; +pub mod stores; diff --git a/config/schedulers.rs b/config/schedulers.rs index 91bb7fb83..a53263155 100644 --- a/config/schedulers.rs +++ b/config/schedulers.rs @@ -15,9 +15,9 @@ use std::collections::HashMap; use serde::Deserialize; - use serde_utils::{convert_numeric_with_shellexpand, convert_string_with_shellexpand}; -use stores::StoreRefName; + +use crate::stores::StoreRefName; #[allow(non_camel_case_types)] #[derive(Deserialize, Debug)] diff --git a/deployment-examples/docker-compose/Dockerfile b/deployment-examples/docker-compose/Dockerfile index c9977fc52..01acda5f2 100644 --- a/deployment-examples/docker-compose/Dockerfile +++ b/deployment-examples/docker-compose/Dockerfile @@ -59,7 +59,7 @@ RUN bazel fetch //... FROM builder-with-externals as builder-only-bazel-and-build-files WORKDIR /root/turbo-cache COPY . . -RUN find . -type f -regextype egrep ! -regex '.*/(BUILD|WORKSPACE|\.bazel.*|Cargo\..*|\.rustfmt\.toml)' -delete && \ +RUN find . -type f -regextype egrep ! -regex '.*/(BUILD|BUILD.bazel|WORKSPACE|\.bazel.*|Cargo\..*|\.rustfmt\.toml)' -delete && \ find . -type d -empty -delete diff --git a/proto/BUILD b/proto/BUILD.bazel similarity index 100% rename from proto/BUILD rename to proto/BUILD.bazel