diff options
Diffstat (limited to 'test')
12 files changed, 358 insertions, 99 deletions
diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp index d02aea8e..7bb8ab3e 100644 --- a/test/buildtool/build_engine/target_map/target_map.test.cpp +++ b/test/buildtool/build_engine/target_map/target_map.test.cpp @@ -99,7 +99,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "simple targets", "[target_map]") { auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -542,7 +544,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -630,7 +634,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -728,7 +734,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "built-in rules", "[target_map]") { auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -936,7 +944,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "target reference", "[target_map]") { auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1077,7 +1087,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "trees", "[target_map]") { auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1184,7 +1196,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), @@ -1348,7 +1362,9 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "wrong arguments", "[target_map]") { auto serve_config = TestServeConfig::ReadServeConfigFromEnvironment(); REQUIRE(serve_config); - ApiBundle const apis{nullptr, RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{/*repo_config=*/nullptr, + /*authentication=*/nullptr, + RemoteExecutionConfig::RemoteAddress()}; auto serve = ServeApi::Create(*serve_config, &apis); AnalyseContext ctx{.repo_config = &repo_config, .target_cache = &Storage::Instance().TargetCache(), diff --git a/test/buildtool/execution_api/bazel/TARGETS b/test/buildtool/execution_api/bazel/TARGETS index eeae31ea..dd93a373 100644 --- a/test/buildtool/execution_api/bazel/TARGETS +++ b/test/buildtool/execution_api/bazel/TARGETS @@ -88,6 +88,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["utils", "catch-main-remote-execution"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel"] , ["buildtool/execution_api/common", "api_test"] ] diff --git a/test/buildtool/execution_api/bazel/bazel_api.test.cpp b/test/buildtool/execution_api/bazel/bazel_api.test.cpp index 268edb1e..af457066 100644 --- a/test/buildtool/execution_api/bazel/bazel_api.test.cpp +++ b/test/buildtool/execution_api/bazel/bazel_api.test.cpp @@ -13,9 +13,11 @@ // limitations under the License. #include <cstdlib> +#include <optional> #include <string> #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "test/buildtool/execution_api/common/api_test.hpp" @@ -25,8 +27,15 @@ namespace { auto const kApiFactory = []() { static auto const& server = RemoteExecutionConfig::RemoteAddress(); - return IExecutionApi::Ptr{ - new BazelApi{"remote-execution", server->host, server->port, {}}}; + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + return IExecutionApi::Ptr{new BazelApi{"remote-execution", + server->host, + server->port, + auth ? &*auth : nullptr, + {}}}; }; } // namespace diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS index 57ef9b44..0cca077d 100644 --- a/test/buildtool/execution_engine/executor/TARGETS +++ b/test/buildtool/execution_engine/executor/TARGETS @@ -2,6 +2,21 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["executor_api_tests"] , "hdrs": ["executor_api.test.hpp"] + , "deps": + [ ["@", "src", "src/buildtool/auth", "auth"] + , ["@", "src", "src/buildtool/common", "artifact_description"] + , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/common", "common"] + , ["@", "src", "src/buildtool/execution_api/common", "common"] + , ["@", "src", "src/buildtool/execution_api/remote", "config"] + , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] + , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] + , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/progress_reporting", "progress"] + , ["utils", "test_env"] + , ["@", "catch2", "", "catch2"] + , ["@", "gsl", "", "gsl"] + ] , "stage": ["test", "buildtool", "execution_engine", "executor"] } , "executor": @@ -29,12 +44,11 @@ , "data": ["test_data"] , "private-deps": [ "executor_api_tests" - , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/execution_api/local", "local"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] - , ["@", "src", "src/buildtool/execution_engine/dag", "dag"] , ["@", "src", "src/buildtool/execution_engine/executor", "executor"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["utils", "catch-main-remote-execution"] @@ -50,7 +64,7 @@ , "data": ["test_data"] , "private-deps": [ "executor_api_tests" - , ["@", "src", "src/buildtool/common", "artifact_factory"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/execution_api/remote", "bazel"] diff --git a/test/buildtool/execution_engine/executor/executor.test.cpp b/test/buildtool/execution_engine/executor/executor.test.cpp index f063ffe4..a55c398d 100644 --- a/test/buildtool/execution_engine/executor/executor.test.cpp +++ b/test/buildtool/execution_engine/executor/executor.test.cpp @@ -280,8 +280,14 @@ TEST_CASE("Executor: Process artifact", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -293,8 +299,14 @@ TEST_CASE("Executor: Process artifact", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(not runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -306,8 +318,14 @@ TEST_CASE("Executor: Process artifact", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(not runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -342,8 +360,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -358,8 +382,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -374,8 +404,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -393,8 +429,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -409,8 +451,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); @@ -428,8 +476,14 @@ TEST_CASE("Executor: Process action", "[executor]") { auto api = TestApi::Ptr{new TestApi{config}}; Statistics stats{}; Progress progress{}; - Executor runner{ - &repo_config, api.get(), api.get(), {}, {}, &stats, &progress}; + Executor runner{&repo_config, + api.get(), + api.get(), + /*properties=*/{}, + /*dispatch_list=*/{}, + /*auth=*/nullptr, + &stats, + &progress}; CHECK(runner.Process(g.ArtifactNodeWithId(local_cpp_id))); CHECK(runner.Process(g.ArtifactNodeWithId(known_cpp_id))); diff --git a/test/buildtool/execution_engine/executor/executor_api.test.hpp b/test/buildtool/execution_engine/executor/executor_api.test.hpp index 8c3c84ca..db80e861 100644 --- a/test/buildtool/execution_engine/executor/executor_api.test.hpp +++ b/test/buildtool/execution_engine/executor/executor_api.test.hpp @@ -24,6 +24,7 @@ #include "catch2/catch_test_macros.hpp" #include "gsl/gsl" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/artifact_factory.hpp" @@ -93,6 +94,7 @@ static inline void RunHelloWorldCompilation( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, bool is_hermetic = true, int expected_queued = 0, int expected_cached = 0) { @@ -131,6 +133,7 @@ static inline void RunHelloWorldCompilation( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; @@ -165,6 +168,7 @@ static inline void RunGreeterCompilation( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, std::string const& greetcpp, bool is_hermetic = true, int expected_queued = 0, @@ -251,6 +255,7 @@ static inline void RunGreeterCompilation( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; @@ -298,18 +303,19 @@ static inline void RunGreeterCompilation( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, bool is_hermetic = true) { SetupConfig(repo_config); // expecting 1 action queued, 0 results from cache // NOLINTNEXTLINE RunHelloWorldCompilation( - repo_config, stats, progress, factory, is_hermetic, 1, 0); + repo_config, stats, progress, factory, auth, is_hermetic, 1, 0); SECTION("Running same compilation again") { // expecting 2 actions queued, 1 result from cache // NOLINTNEXTLINE RunHelloWorldCompilation( - repo_config, stats, progress, factory, is_hermetic, 2, 1); + repo_config, stats, progress, factory, auth, is_hermetic, 2, 1); } } @@ -318,12 +324,20 @@ static inline void RunGreeterCompilation( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, bool is_hermetic = true) { SetupConfig(repo_config); // expecting 3 action queued, 0 results from cache // NOLINTNEXTLINE - RunGreeterCompilation( - repo_config, stats, progress, factory, "greet.cpp", is_hermetic, 3, 0); + RunGreeterCompilation(repo_config, + stats, + progress, + factory, + auth, + "greet.cpp", + is_hermetic, + 3, + 0); SECTION("Running same compilation again") { // expecting 6 actions queued, 3 results from cache @@ -331,6 +345,7 @@ static inline void RunGreeterCompilation( stats, progress, factory, + auth, "greet.cpp", is_hermetic, 6, // NOLINT @@ -343,6 +358,7 @@ static inline void RunGreeterCompilation( stats, progress, factory, + auth, "greet_mod.cpp", is_hermetic, 6, // NOLINT @@ -355,6 +371,7 @@ static inline void TestUploadAndDownloadTrees( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, bool /*is_hermetic*/ = true, int /*expected_queued*/ = 0, int /*expected_cached*/ = 0) { @@ -399,6 +416,7 @@ static inline void TestUploadAndDownloadTrees( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; REQUIRE(runner.Process(g.ArtifactNodeWithId(foo_id))); @@ -507,6 +525,7 @@ static inline void TestRetrieveOutputDirectories( gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, ApiFactory const& factory, + Auth::TLS const* auth, bool /*is_hermetic*/ = true, int /*expected_queued*/ = 0, int /*expected_cached*/ = 0) { @@ -560,6 +579,7 @@ static inline void TestRetrieveOutputDirectories( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; REQUIRE(runner.Process(action)); @@ -610,6 +630,7 @@ static inline void TestRetrieveOutputDirectories( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; REQUIRE(runner.Process(action)); @@ -676,6 +697,7 @@ static inline void TestRetrieveOutputDirectories( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; REQUIRE(runner.Process(action)); @@ -747,6 +769,7 @@ static inline void TestRetrieveOutputDirectories( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; CHECK_FALSE(runner.Process(action)); @@ -771,6 +794,7 @@ static inline void TestRetrieveOutputDirectories( api.get(), RemoteExecutionConfig::PlatformProperties(), RemoteExecutionConfig::DispatchList(), + auth, stats, progress}; CHECK_FALSE(runner.Process(action)); diff --git a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp index 670a3fa7..b6ffe2d7 100755 --- a/test/buildtool/execution_engine/executor/executor_api_local.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_local.test.cpp @@ -13,8 +13,10 @@ // limitations under the License. #include <memory> +#include <optional> #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" @@ -38,9 +40,18 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; - TestHelloWorldCompilation(&repo_config, &stats, &progress, [&] { - return std::make_unique<LocalApi>(&repo_config); - }); + + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + + TestHelloWorldCompilation( + &repo_config, + &stats, + &progress, + [&] { return std::make_unique<LocalApi>(&repo_config); }, + auth ? &*auth : nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, @@ -49,9 +60,18 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; - TestGreeterCompilation(&repo_config, &stats, &progress, [&] { - return std::make_unique<LocalApi>(&repo_config); - }); + + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + + TestGreeterCompilation( + &repo_config, + &stats, + &progress, + [&] { return std::make_unique<LocalApi>(&repo_config); }, + auth ? &*auth : nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, @@ -60,9 +80,18 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; - TestUploadAndDownloadTrees(&repo_config, &stats, &progress, [&] { - return std::make_unique<LocalApi>(&repo_config); - }); + + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + + TestUploadAndDownloadTrees( + &repo_config, + &stats, + &progress, + [&] { return std::make_unique<LocalApi>(&repo_config); }, + auth ? &*auth : nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, @@ -71,7 +100,16 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, RepositoryConfig repo_config{}; Statistics stats{}; Progress progress{}; - TestRetrieveOutputDirectories(&repo_config, &stats, &progress, [&] { - return std::make_unique<LocalApi>(&repo_config); - }); + + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + + TestRetrieveOutputDirectories( + &repo_config, + &stats, + &progress, + [&] { return std::make_unique<LocalApi>(&repo_config); }, + auth ? &*auth : nullptr); } diff --git a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp index 56094fc3..83554e64 100755 --- a/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp +++ b/test/buildtool/execution_engine/executor/executor_api_remote_bazel.test.cpp @@ -12,7 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <optional> + #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" @@ -25,10 +28,17 @@ TEST_CASE("Executor<BazelApi>: Upload blob", "[executor]") { RepositoryConfig repo_config{}; ExecutionConfiguration config; auto const& info = RemoteExecutionConfig::RemoteAddress(); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } TestBlobUpload(&repo_config, [&] { - return BazelApi::Ptr{ - new BazelApi{"remote-execution", info->host, info->port, config}}; + return BazelApi::Ptr{new BazelApi{"remote-execution", + info->host, + info->port, + auth ? &*auth : nullptr, + config}}; }); } @@ -41,14 +51,23 @@ TEST_CASE("Executor<BazelApi>: Compile hello world", "[executor]") { auto const& info = RemoteExecutionConfig::RemoteAddress(); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestHelloWorldCompilation( &repo_config, &stats, &progress, [&] { - return BazelApi::Ptr{new BazelApi{ - "remote-execution", info->host, info->port, config}}; + return BazelApi::Ptr{new BazelApi{"remote-execution", + info->host, + info->port, + auth ? &*auth : nullptr, + config}}; }, + auth ? &*auth : nullptr, false /* not hermetic */); } @@ -61,14 +80,23 @@ TEST_CASE("Executor<BazelApi>: Compile greeter", "[executor]") { auto const& info = RemoteExecutionConfig::RemoteAddress(); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestGreeterCompilation( &repo_config, &stats, &progress, [&] { - return BazelApi::Ptr{new BazelApi{ - "remote-execution", info->host, info->port, config}}; + return BazelApi::Ptr{new BazelApi{"remote-execution", + info->host, + info->port, + auth ? &*auth : nullptr, + config}}; }, + auth ? &*auth : nullptr, false /* not hermetic */); } @@ -81,14 +109,23 @@ TEST_CASE("Executor<BazelApi>: Upload and download trees", "[executor]") { auto const& info = RemoteExecutionConfig::RemoteAddress(); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestUploadAndDownloadTrees( &repo_config, &stats, &progress, [&] { - return BazelApi::Ptr{new BazelApi{ - "remote-execution", info->host, info->port, config}}; + return BazelApi::Ptr{new BazelApi{"remote-execution", + info->host, + info->port, + auth ? &*auth : nullptr, + config}}; }, + auth ? &*auth : nullptr, false /* not hermetic */); } @@ -101,13 +138,22 @@ TEST_CASE("Executor<BazelApi>: Retrieve output directories", "[executor]") { auto const& info = RemoteExecutionConfig::RemoteAddress(); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestRetrieveOutputDirectories( &repo_config, &stats, &progress, [&] { - return BazelApi::Ptr{new BazelApi{ - "remote-execution", info->host, info->port, config}}; + return BazelApi::Ptr{new BazelApi{"remote-execution", + info->host, + info->port, + auth ? &*auth : nullptr, + config}}; }, + auth ? &*auth : nullptr, false /* not hermetic */); } diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS index 937f3b04..c67ded03 100644 --- a/test/buildtool/graph_traverser/TARGETS +++ b/test/buildtool/graph_traverser/TARGETS @@ -5,6 +5,7 @@ , "deps": [ ["@", "catch2", "", "catch2"] , ["@", "json", "", "json"] + , ["@", "src", "src/buildtool/auth", "auth"] , ["@", "src", "src/buildtool/common", "common"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] @@ -40,6 +41,7 @@ [ "graph_traverser_tests" , ["@", "catch2", "", "catch2"] , ["utils", "catch-main-remote-execution"] + , ["@", "src", "src/buildtool/auth", "auth"] ] , "stage": ["test", "buildtool", "graph_traverser"] } diff --git a/test/buildtool/graph_traverser/graph_traverser.test.hpp b/test/buildtool/graph_traverser/graph_traverser.test.hpp index 3f235087..7d23dcd5 100644 --- a/test/buildtool/graph_traverser/graph_traverser.test.hpp +++ b/test/buildtool/graph_traverser/graph_traverser.test.hpp @@ -18,6 +18,7 @@ #include <chrono> #include <cstdlib> #include <filesystem> +#include <optional> #include <sstream> #include <string> #include <thread> @@ -26,6 +27,7 @@ #include "catch2/catch_test_macros.hpp" #include "nlohmann/json.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/local/config.hpp" @@ -150,6 +152,7 @@ inline void SetLauncher() { } // namespace [[maybe_unused]] static void TestHelloWorldCopyMessage( + Auth::TLS const* auth, bool is_hermetic = true) { TestProject p("hello_world_copy_message"); @@ -157,8 +160,8 @@ inline void SetLauncher() { auto const clargs = p.CmdLineArgs(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser const gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -185,8 +188,8 @@ inline void SetLauncher() { SECTION("Executable is retrieved as executable") { auto const clargs_exec = p.CmdLineArgs("_entry_points_get_executable"); - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser const gt_get_exec{ clargs_exec.gtargs, p.GetRepoConfig(), @@ -214,15 +217,16 @@ inline void SetLauncher() { } } -[[maybe_unused]] static void TestCopyLocalFile(bool is_hermetic = true) { +[[maybe_unused]] static void TestCopyLocalFile(Auth::TLS const* auth, + bool is_hermetic = true) { TestProject p("copy_local_file"); SetLauncher(); auto const clargs = p.CmdLineArgs(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser const gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -245,6 +249,7 @@ inline void SetLauncher() { } [[maybe_unused]] static void TestSequencePrinterBuildLibraryOnly( + Auth::TLS const* auth, bool is_hermetic = true) { TestProject p("sequence_printer_build_library_only"); @@ -252,8 +257,8 @@ inline void SetLauncher() { auto const clargs = p.CmdLineArgs(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser const gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -296,6 +301,7 @@ inline void SetLauncher() { } [[maybe_unused]] static void TestHelloWorldWithKnownSource( + Auth::TLS const* auth, bool is_hermetic = true) { TestProject full_hello_world("hello_world_copy_message"); @@ -305,6 +311,7 @@ inline void SetLauncher() { Statistics stats{}; Progress progress{}; ApiBundle const apis{full_hello_world.GetRepoConfig(), + auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser const gt_upload{clargs_update_cpp.gtargs, full_hello_world.GetRepoConfig(), @@ -353,15 +360,16 @@ inline void SetLauncher() { } } -static void TestBlobsUploadedAndUsed(bool is_hermetic = true) { +static void TestBlobsUploadedAndUsed(Auth::TLS const* auth, + bool is_hermetic = true) { TestProject p("use_uploaded_blobs"); auto const clargs = p.CmdLineArgs(); SetLauncher(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -391,15 +399,16 @@ static void TestBlobsUploadedAndUsed(bool is_hermetic = true) { } } -static void TestEnvironmentVariablesSetAndUsed(bool is_hermetic = true) { +static void TestEnvironmentVariablesSetAndUsed(Auth::TLS const* auth, + bool is_hermetic = true) { TestProject p("use_env_variables"); auto const clargs = p.CmdLineArgs(); SetLauncher(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -429,15 +438,15 @@ static void TestEnvironmentVariablesSetAndUsed(bool is_hermetic = true) { } } -static void TestTreesUsed(bool is_hermetic = true) { +static void TestTreesUsed(Auth::TLS const* auth, bool is_hermetic = true) { TestProject p("use_trees"); auto const clargs = p.CmdLineArgs(); SetLauncher(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -467,15 +476,16 @@ static void TestTreesUsed(bool is_hermetic = true) { } } -static void TestNestedTreesUsed(bool is_hermetic = true) { +static void TestNestedTreesUsed(Auth::TLS const* auth, + bool is_hermetic = true) { TestProject p("use_nested_trees"); auto const clargs = p.CmdLineArgs(); SetLauncher(); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; GraphTraverser gt{clargs.gtargs, p.GetRepoConfig(), RemoteExecutionConfig::PlatformProperties(), @@ -505,13 +515,14 @@ static void TestNestedTreesUsed(bool is_hermetic = true) { } } -static void TestFlakyHelloWorldDetected(bool /*is_hermetic*/ = true) { +static void TestFlakyHelloWorldDetected(Auth::TLS const* auth, + bool /*is_hermetic*/ = true) { TestProject p("flaky_hello_world"); Statistics stats{}; Progress progress{}; - ApiBundle const apis{p.GetRepoConfig(), - RemoteExecutionConfig::RemoteAddress()}; + ApiBundle const apis{ + p.GetRepoConfig(), auth, RemoteExecutionConfig::RemoteAddress()}; { SetLauncher(); diff --git a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp index bfb8a2e0..64d7189b 100644 --- a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp +++ b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp @@ -19,53 +19,53 @@ TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Output created when entry point is local artifact", "[graph_traverser]") { - TestCopyLocalFile(); + TestCopyLocalFile(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Output created and contents are correct", "[graph_traverser]") { - TestHelloWorldCopyMessage(); + TestHelloWorldCopyMessage(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Actions are not re-run", "[graph_traverser]") { - TestSequencePrinterBuildLibraryOnly(); + TestSequencePrinterBuildLibraryOnly(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: KNOWN artifact", "[graph_traverser]") { - TestHelloWorldWithKnownSource(); + TestHelloWorldWithKnownSource(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Blobs uploaded and correctly used", "[graph_traverser]") { - TestBlobsUploadedAndUsed(); + TestBlobsUploadedAndUsed(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Environment variables are set and used", "[graph_traverser]") { - TestEnvironmentVariablesSetAndUsed(); + TestEnvironmentVariablesSetAndUsed(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Trees correctly used", "[graph_traverser]") { - TestTreesUsed(); + TestTreesUsed(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Nested trees correctly used", "[graph_traverser]") { - TestNestedTreesUsed(); + TestNestedTreesUsed(/*auth=*/nullptr); } TEST_CASE_METHOD(HermeticLocalTestFixture, "Local: Detect flaky actions", "[graph_traverser]") { - TestFlakyHelloWorldDetected(); + TestFlakyHelloWorldDetected(/*auth=*/nullptr); } diff --git a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp index 48867d16..e33d5d27 100644 --- a/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp +++ b/test/buildtool/graph_traverser/graph_traverser_remote.test.cpp @@ -12,44 +12,88 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <optional> + #include "catch2/catch_test_macros.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "test/buildtool/graph_traverser/graph_traverser.test.hpp" TEST_CASE("Remote: Output created and contents are correct", "[graph_traverser]") { - TestHelloWorldCopyMessage(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestHelloWorldCopyMessage(auth ? &*auth : nullptr, + false /* not hermetic */); } TEST_CASE("Remote: Output created when entry point is local artifact", "[graph_traverser]") { - TestCopyLocalFile(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestCopyLocalFile(auth ? &*auth : nullptr, false /* not hermetic */); } TEST_CASE("Remote: Actions are not re-run", "[graph_traverser]") { - TestSequencePrinterBuildLibraryOnly(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestSequencePrinterBuildLibraryOnly(auth ? &*auth : nullptr, + false /* not hermetic */); } TEST_CASE("Remote: KNOWN artifact", "[graph_traverser]") { - TestHelloWorldWithKnownSource(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestHelloWorldWithKnownSource(auth ? &*auth : nullptr, + false /* not hermetic */); } TEST_CASE("Remote: Blobs uploaded and correctly used", "[graph_traverser]") { - TestBlobsUploadedAndUsed(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestBlobsUploadedAndUsed(auth ? &*auth : nullptr, false /* not hermetic */); } TEST_CASE("Remote: Environment variables are set and used", "[graph_traverser]") { - TestEnvironmentVariablesSetAndUsed(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestEnvironmentVariablesSetAndUsed(auth ? &*auth : nullptr, + false /* not hermetic */); } TEST_CASE("Remote: Trees correctly used", "[graph_traverser]") { - TestTreesUsed(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestTreesUsed(auth ? &*auth : nullptr, false /* not hermetic */); } TEST_CASE("Remote: Nested trees correctly used", "[graph_traverser]") { - TestNestedTreesUsed(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestNestedTreesUsed(auth ? &*auth : nullptr, false /* not hermetic */); } TEST_CASE("Remote: Detect flaky actions", "[graph_traverser]") { - TestFlakyHelloWorldDetected(false /* not hermetic */); + std::optional<Auth::TLS> auth = {}; + if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + auth = Auth::TLS::Instance(); + } + TestFlakyHelloWorldDetected(auth ? &*auth : nullptr, + false /* not hermetic */); } |