Separate off id generation to a separate library

... and rename appropriately to reflect contents more precisely
than the generic "common". This separation also disentangles
dependencies a bit.

6 files changed, 25 insertions, 11 deletions

diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 1aff977d..f7258cb6 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -2,8 +2,7 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["common"]
   , "hdrs":
-    [ "execution_common.hpp"
-    , "execution_api.hpp"
+    [ "execution_api.hpp"
     , "execution_action.hpp"
     , "execution_response.hpp"
     , "tree_reader.hpp"
@@ -22,19 +21,33 @@
     , ["src/buildtool/execution_engine/dag", "dag"]
     , ["src/buildtool/file_system", "git_repo"]
     , ["src/buildtool/file_system", "object_type"]
-    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     , ["src/utils/cpp", "expected"]
-    , ["src/utils/cpp", "gsl"]
-    , ["src/utils/cpp", "hex_string"]
     ]
   , "private-deps":
     [ ["@", "json", "", "json"]
     , ["src/buildtool/common", "artifact_digest_factory"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/utils/cpp", "hex_string"]
     , ["src/utils/cpp", "path"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
+, "ids":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["common"]
+  , "hdrs": ["ids.hpp"]
+  , "deps":
+    [ ["@", "fmt", "", "fmt"]
+    , ["@", "gsl", "", "gsl"]
+    , ["src/buildtool/crypto", "hash_function"]
+    , ["src/buildtool/logging", "log_level"]
+    , ["src/buildtool/logging", "logging"]
+    , ["src/utils/cpp", "gsl"]
+    , ["src/utils/cpp", "hex_string"]
+    ]
+  , "stage": ["src", "buildtool", "execution_api", "common"]
+  }
 , "bytestream_utils":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["bytestream_utils"]
diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/ids.hpp
index 7a55003c..0c5f689a 100644
--- a/src/buildtool/execution_api/common/execution_common.hpp
+++ b/src/buildtool/execution_api/common/ids.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
-#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP
+#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP
 
 #ifdef __unix__
 #include <sys/types.h>
@@ -129,4 +129,4 @@ static void EncodeUUIDVariant1(std::string* uuid) {
     return ss.str();
 }
 
-#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_EXECUTION_COMMON_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_IDS_HPP
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 67507594..04f78c34 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -48,6 +48,7 @@
     , ["@", "json", "", "json"]
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     , ["src/buildtool/execution_api/common", "common_api"]
+    , ["src/buildtool/execution_api/common", "ids"]
     , ["src/buildtool/execution_api/execution_service", "cas_utils"]
     , ["src/buildtool/execution_api/utils", "outputscheck"]
     , ["src/buildtool/file_system", "object_type"]
diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp
index 8847692b..0d73d923 100644
--- a/src/buildtool/execution_api/local/local_action.cpp
+++ b/src/buildtool/execution_api/local/local_action.cpp
@@ -28,7 +28,7 @@
 #include "nlohmann/json.hpp"
 #include "src/buildtool/common/artifact_digest_factory.hpp"
 #include "src/buildtool/common/protocol_traits.hpp"
-#include "src/buildtool/execution_api/common/execution_common.hpp"
+#include "src/buildtool/execution_api/common/ids.hpp"
 #include "src/buildtool/execution_api/common/tree_reader.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
 #include "src/buildtool/execution_api/local/local_cas_reader.hpp"
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index 6f9df1c3..39c1a444 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -51,7 +51,7 @@
     , ["src/buildtool/common", "protocol_traits"]
     , ["src/buildtool/common/remote", "retry"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
-    , ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/execution_api/common", "ids"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/utils/cpp", "back_map"]
     , ["src/utils/cpp", "gsl"]
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
index be4b9f0f..d6814b08 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp
@@ -33,7 +33,7 @@
 #include "src/buildtool/common/remote/retry.hpp"
 #include "src/buildtool/common/remote/retry_config.hpp"
 #include "src/buildtool/execution_api/common/bytestream_utils.hpp"
-#include "src/buildtool/execution_api/common/execution_common.hpp"
+#include "src/buildtool/execution_api/common/ids.hpp"
 #include "src/buildtool/execution_api/common/message_limits.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
 #include "src/buildtool/logging/log_level.hpp"