From d0f2ba0ab15e63aa3511218a837eb6f057632ace Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Thu, 14 Mar 2024 16:21:55 +0100
Subject: Clean up more includes and targets

Some of the more specific issues addressed:
- missing log_level target/include
- header-only libs wrongly marking deps as private
- missing/misplaced gsl includes
---
 src/buildtool/storage/TARGETS          | 7 ++++++-
 src/buildtool/storage/fs_utils.cpp     | 2 ++
 src/buildtool/storage/local_ac.tpp     | 1 +
 src/buildtool/storage/local_cas.hpp    | 2 ++
 src/buildtool/storage/local_cas.tpp    | 1 +
 src/buildtool/storage/storage.hpp      | 3 +++
 src/buildtool/storage/target_cache.tpp | 1 +
 7 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/buildtool/storage')

diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index 5bcca567..a3e06628 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -56,7 +56,10 @@
     , ["src/buildtool/common", "artifact_description"]
     ]
   , "stage": ["src", "buildtool", "storage"]
-  , "private-deps": [["src/buildtool/execution_api/remote", "config"]]
+  , "private-deps":
+    [ ["src/buildtool/execution_api/remote", "config"]
+    , ["src/buildtool/logging", "log_level"]
+    ]
   }
 , "fs_utils":
   { "type": ["@", "rules", "CC", "library"]
@@ -71,6 +74,8 @@
   , "private-deps":
     [ ["@", "json", "", "json"]
     , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "path"]
     , "config"
     , "storage"
diff --git a/src/buildtool/storage/fs_utils.cpp b/src/buildtool/storage/fs_utils.cpp
index b606431c..95b5e72b 100644
--- a/src/buildtool/storage/fs_utils.cpp
+++ b/src/buildtool/storage/fs_utils.cpp
@@ -19,6 +19,8 @@
 
 #include "nlohmann/json.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
+#include "src/buildtool/logging/log_level.hpp"
+#include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/storage/config.hpp"
 #include "src/buildtool/storage/storage.hpp"
 #include "src/utils/cpp/path.hpp"
diff --git a/src/buildtool/storage/local_ac.tpp b/src/buildtool/storage/local_ac.tpp
index e285a899..3f74d97e 100644
--- a/src/buildtool/storage/local_ac.tpp
+++ b/src/buildtool/storage/local_ac.tpp
@@ -16,6 +16,7 @@
 #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_AC_TPP
 
 #include "src/buildtool/common/bazel_types.hpp"
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/storage/local_ac.hpp"
 
 template <bool kDoGlobalUplink>
diff --git a/src/buildtool/storage/local_cas.hpp b/src/buildtool/storage/local_cas.hpp
index 84de7e95..382af848 100644
--- a/src/buildtool/storage/local_cas.hpp
+++ b/src/buildtool/storage/local_cas.hpp
@@ -15,9 +15,11 @@
 #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_HPP
 #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_HPP
 
+#include <filesystem>
 #include <optional>
 #include <unordered_set>
 
+#include "gsl/gsl"
 #include "src/buildtool/file_system/git_repo.hpp"
 #include "src/buildtool/file_system/object_cas.hpp"
 #include "src/buildtool/storage/garbage_collector.hpp"
diff --git a/src/buildtool/storage/local_cas.tpp b/src/buildtool/storage/local_cas.tpp
index f1c7d1cb..9bcb090d 100644
--- a/src/buildtool/storage/local_cas.tpp
+++ b/src/buildtool/storage/local_cas.tpp
@@ -16,6 +16,7 @@
 #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_TPP
 
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/storage/local_cas.hpp"
 
 namespace detail {
diff --git a/src/buildtool/storage/storage.hpp b/src/buildtool/storage/storage.hpp
index fe6c1e1f..d4ea83fe 100644
--- a/src/buildtool/storage/storage.hpp
+++ b/src/buildtool/storage/storage.hpp
@@ -15,8 +15,11 @@
 #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP
 #define INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP
 
+#include <filesystem>
 #include <optional>
+#include <vector>
 
+#include "gsl/gsl"
 #include "src/buildtool/common/artifact.hpp"
 #include "src/buildtool/execution_api/common/execution_common.hpp"
 #include "src/buildtool/storage/config.hpp"
diff --git a/src/buildtool/storage/target_cache.tpp b/src/buildtool/storage/target_cache.tpp
index cd56ef59..ed1991e8 100644
--- a/src/buildtool/storage/target_cache.tpp
+++ b/src/buildtool/storage/target_cache.tpp
@@ -15,6 +15,7 @@
 #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_TARGET_CACHE_TPP
 #define INCLUDED_SRC_BUILDTOOL_STORAGE_TARGET_CACHE_TPP
 
+#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/storage/target_cache.hpp"
 
 template <bool kDoGlobalUplink>
-- 
cgit v1.2.3