Skip to content

Commit

Permalink
format: apply clang format to new container field impl
Browse files Browse the repository at this point in the history
Signed-off-by: Lorenzo Susini <susinilorenzo1@gmail.com>
  • Loading branch information
loresuso committed Oct 14, 2024
1 parent 020230b commit 3188e9e
Show file tree
Hide file tree
Showing 7 changed files with 293 additions and 116 deletions.
9 changes: 3 additions & 6 deletions userspace/libsinsp/container_engine/docker/async_source.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,18 +824,15 @@ bool docker_async_source::parse(const docker_lookup_request& request,
container.m_privileged = privileged.asBool();
}
const Json::Value& host_pid = host_config_obj["PidMode"];
if(!host_pid.isNull() && host_pid.isString() && host_pid.asString() == "host")
{
if(!host_pid.isNull() && host_pid.isString() && host_pid.asString() == "host") {
container.m_host_pid = true;

Check warning on line 828 in userspace/libsinsp/container_engine/docker/async_source.cpp

View check run for this annotation

Codecov / codecov/patch

userspace/libsinsp/container_engine/docker/async_source.cpp#L828

Added line #L828 was not covered by tests
}
const Json::Value& host_net = host_config_obj["NetworkMode"];
if(!host_net.isNull() && host_net.isString() && host_net.asString() == "host")
{
if(!host_net.isNull() && host_net.isString() && host_net.asString() == "host") {
container.m_host_network = true;

Check warning on line 832 in userspace/libsinsp/container_engine/docker/async_source.cpp

View check run for this annotation

Codecov / codecov/patch

userspace/libsinsp/container_engine/docker/async_source.cpp#L832

Added line #L832 was not covered by tests
}
const Json::Value& ipc_mode = host_config_obj["IpcMode"];
if(!ipc_mode.isNull() && ipc_mode.isString() && ipc_mode.asString() == "host")
{
if(!ipc_mode.isNull() && ipc_mode.isString() && ipc_mode.asString() == "host") {
container.m_host_ipc = true;

Check warning on line 836 in userspace/libsinsp/container_engine/docker/async_source.cpp

View check run for this annotation

Codecov / codecov/patch

userspace/libsinsp/container_engine/docker/async_source.cpp#L836

Added line #L836 was not covered by tests
}

Expand Down
36 changes: 17 additions & 19 deletions userspace/libsinsp/container_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,25 +216,23 @@ class sinsp_container_info {
};

sinsp_container_info(sinsp_container_lookup &&lookup = sinsp_container_lookup()):
m_type(CT_UNKNOWN),
m_container_ip(0),
m_privileged(false),
m_host_pid(false),
m_host_network(false),
m_host_ipc(false),
m_memory_limit(0),
m_swap_limit(0),
m_cpu_shares(1024),
m_cpu_quota(0),
m_cpu_period(100000),
m_cpuset_cpu_count(0),
m_is_pod_sandbox(false),
m_lookup(std::move(lookup)),
m_container_user("<NA>"),
m_metadata_deadline(0),
m_size_rw_bytes(-1)
{
}
m_type(CT_UNKNOWN),
m_container_ip(0),
m_privileged(false),
m_host_pid(false),
m_host_network(false),
m_host_ipc(false),
m_memory_limit(0),
m_swap_limit(0),
m_cpu_shares(1024),
m_cpu_quota(0),
m_cpu_period(100000),
m_cpuset_cpu_count(0),
m_is_pod_sandbox(false),
m_lookup(std::move(lookup)),
m_container_user("<NA>"),
m_metadata_deadline(0),
m_size_rw_bytes(-1) {}

void clear() {
this->~sinsp_container_info();
Expand Down
15 changes: 7 additions & 8 deletions userspace/libsinsp/cri.h
Original file line number Diff line number Diff line change
Expand Up @@ -363,25 +363,24 @@ class cri_interface {
* @return true if successful
*/
bool parse_cri_pod_sandbox_network(const typename api::PodSandboxStatus &status,
const Json::Value &root,
sinsp_container_info &container);
const Json::Value &root,
sinsp_container_info &container);

/**
* @brief fill out pod sandbox network namespace mode info
* @param status `status` field of the PodSandboxStatusResponse
* @param container the container info to fill out
*/
void parse_cri_pod_sandbox_pid(const typename api::PodSandboxStatus &status,
sinsp_container_info &container);
void parse_cri_pod_sandbox_pid(const typename api::PodSandboxStatus &status,
sinsp_container_info &container);

/**
* @brief fill out pod sandbox ipc namespace mode info
* @param status `status` field of the PodSandboxStatusResponse
* @param container the container info to fill out
*/
void parse_cri_pod_sandbox_ipc(const typename api::PodSandboxStatus &status,
sinsp_container_info &container);

void parse_cri_pod_sandbox_ipc(const typename api::PodSandboxStatus &status,
sinsp_container_info &container);

/////////////////////////////
// Generic parsers helpers
Expand Down
21 changes: 9 additions & 12 deletions userspace/libsinsp/cri.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,7 @@ inline bool cri_interface<api>::parse_cri_pod_sandbox_network(
//
// Pod network namespace mode
//
if (status.linux().namespaces().options().network() == api::NamespaceMode::NODE)
{
if(status.linux().namespaces().options().network() == api::NamespaceMode::NODE) {
container.m_host_network = true;

Check warning on line 640 in userspace/libsinsp/cri.hpp

View check run for this annotation

Codecov / codecov/patch

userspace/libsinsp/cri.hpp#L640

Added line #L640 was not covered by tests
}

Expand Down Expand Up @@ -713,27 +712,25 @@ inline bool cri_interface<api>::parse_cri_pod_sandbox_network(
}

template<typename api>
inline void cri_interface<api>::parse_cri_pod_sandbox_pid(const typename api::PodSandboxStatus &status,
sinsp_container_info &container)
{
inline void cri_interface<api>::parse_cri_pod_sandbox_pid(
const typename api::PodSandboxStatus &status,
sinsp_container_info &container) {
//
// Pod pid namespace mode
//
if (status.linux().namespaces().options().pid() == api::NamespaceMode::NODE)
{
if(status.linux().namespaces().options().pid() == api::NamespaceMode::NODE) {
container.m_host_pid = true;
}
}

template<typename api>
inline void cri_interface<api>::parse_cri_pod_sandbox_ipc(const typename api::PodSandboxStatus &status,
sinsp_container_info &container)
{
inline void cri_interface<api>::parse_cri_pod_sandbox_ipc(
const typename api::PodSandboxStatus &status,
sinsp_container_info &container) {
//
// Pod ipc namespace mode
//
if (status.linux().namespaces().options().ipc() == api::NamespaceMode::NODE)
{
if(status.linux().namespaces().options().ipc() == api::NamespaceMode::NODE) {
container.m_host_ipc = true;
}
}
Expand Down
26 changes: 11 additions & 15 deletions userspace/libsinsp/parsers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4736,27 +4736,23 @@ void sinsp_parser::parse_container_json_evt(sinsp_evt *evt) {
if(check_json_val_is_convertible(privileged, Json::booleanValue, "privileged")) {
container_info->m_privileged = privileged.asBool();
}
const Json::Value& host_pid = container["host_pid"];
if(check_json_val_is_convertible(host_pid, Json::booleanValue, "host_pid"))
{
const Json::Value &host_pid = container["host_pid"];
if(check_json_val_is_convertible(host_pid, Json::booleanValue, "host_pid")) {
container_info->m_host_pid = host_pid.asBool();
}
const Json::Value& host_network = container["host_network"];
if(check_json_val_is_convertible(host_network, Json::booleanValue, "host_network"))
{
const Json::Value &host_network = container["host_network"];
if(check_json_val_is_convertible(host_network, Json::booleanValue, "host_network")) {
container_info->m_host_network = host_network.asBool();
}
const Json::Value& host_ipc = container["host_ipc"];
if(check_json_val_is_convertible(host_ipc, Json::booleanValue, "host_ipc"))
{
const Json::Value &host_ipc = container["host_ipc"];
if(check_json_val_is_convertible(host_ipc, Json::booleanValue, "host_ipc")) {
container_info->m_host_ipc = host_ipc.asBool();
}
const Json::Value& lookup_state = container["lookup_state"];
if(check_json_val_is_convertible(lookup_state, Json::uintValue, "lookup_state"))
{
container_info->set_lookup_status(static_cast<sinsp_container_lookup::state>(lookup_state.asUInt()));
switch(container_info->get_lookup_status())
{
const Json::Value &lookup_state = container["lookup_state"];
if(check_json_val_is_convertible(lookup_state, Json::uintValue, "lookup_state")) {
container_info->set_lookup_status(
static_cast<sinsp_container_lookup::state>(lookup_state.asUInt()));
switch(container_info->get_lookup_status()) {
case sinsp_container_lookup::state::STARTED:
case sinsp_container_lookup::state::SUCCESSFUL:
case sinsp_container_lookup::state::FAILED:
Expand Down
Loading

0 comments on commit 3188e9e

Please sign in to comment.