Enable InsertBraces in clang-format (#1851)

Co-authored-by: Mauro Ezequiel Moltrasio <[email protected]>
stackrox · Sep 20, 2024 · 0fed6de · 0fed6de
1 parent 7479943
commit 0fed6de
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 18 deletions.
diff --git a/.clang-format b/.clang-format
@@ -7,6 +7,8 @@ PointerAlignment: Left
 
 IndentPPDirectives: AfterHash
 
+InsertBraces: true
+
 IncludeBlocks: Regroup
 IncludeCategories:
 - Regex: '^((\"|<)(api|internalapi|storage)/)'

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,18 +4,43 @@ on: [pull_request]
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    container:
+      image: fedora:40
     steps:
+      - name: dnf install dependencies
+        run: |
+          dnf install -y \
+            git \
+            golang \
+            shellcheck \
+            clang-tools-extra
+
+          echo "PATH=${HOME}/bin:${PATH}" >> "${GITHUB_ENV}"
+
       - uses: actions/checkout@v4
         with:
           # fetch all to allow linting of differences between branches
           fetch-depth: 0
+
+      - name: Mark repo as safe
+        run: |
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
       - uses: actions/setup-python@v5
-      - uses: mfinelli/setup-shfmt@v2
+
+      - name: Install shfmt
+        run: |
+          GOBIN="${HOME}/bin/" go install mvdan.cc/sh/v3/cmd/shfmt@latest
 
       - name: Install actionlint
         run: |
           # Install actionlint to ~/bin/, otherwise pre-commit won't be able to find the executable.
           GOBIN="${HOME}/bin/" go install github.com/rhysd/actionlint/cmd/actionlint@latest
 
-      - uses: pre-commit/[email protected]
+      - name: Run pre-commit
+        run: |
+          python3 -m venv .venv
+          source .venv/bin/activate
+          python3 -m pip install pre-commit
+          pre-commit run --show-diff-on-failure --color=always --all-files
diff --git a/collector/lib/CollectorStats.h b/collector/lib/CollectorStats.h
@@ -90,7 +90,7 @@ class CollectorStats {
 
   std::array<std::atomic<int64_t>, counter_type_max> counter_ = {{}};
 
-  CollectorStats(){};
+  CollectorStats() {};
 };
 
 template <typename T>

diff --git a/collector/lib/DuplexGRPC.h b/collector/lib/DuplexGRPC.h
@@ -550,8 +550,7 @@ class DuplexClientReaderWriter : public DuplexClientWriter<W> {
     // Shutdown the client and drain the queue.
     this->Shutdown();  // ignore errors
     auto now = ToDeadline(time_point::min());
-    while (ProcessSingle(nullptr, now, nullptr))
-      ;
+    while (ProcessSingle(nullptr, now, nullptr));
   }
 
   template <typename TS = time_point>

diff --git a/collector/lib/ProcfsScraper.cpp b/collector/lib/ProcfsScraper.cpp
@@ -44,8 +44,7 @@ const char* nextfield(const char* p, const char* endp) {
   while (p < endp && *p && !std::isspace(*p)) {
     p++;
   }
-  while (p < endp && *p && std::isspace(*++p))
-    ;
+  while (p < endp && *p && std::isspace(*++p));
   return (p < endp && *p) ? p : nullptr;
 }
 

diff --git a/collector/lib/SignalServiceClient.cpp b/collector/lib/SignalServiceClient.cpp
@@ -43,8 +43,7 @@ bool SignalServiceClient::EstablishGRPCStreamSingle() {
 }
 
 void SignalServiceClient::EstablishGRPCStream() {
-  while (EstablishGRPCStreamSingle())
-    ;
+  while (EstablishGRPCStreamSingle());
   CLOG(INFO) << "Signal service client terminating.";
 }
 

diff --git a/collector/lib/SignalServiceClient.h b/collector/lib/SignalServiceClient.h
@@ -66,8 +66,8 @@ class StdoutSignalServiceClient : public ISignalServiceClient {
 
   explicit StdoutSignalServiceClient() {}
 
-  void Start(){};
-  void Stop(){};
+  void Start() {};
+  void Stop() {};
 
   SignalHandler::Result PushSignals(const SignalStreamMessage& msg);
 };

diff --git a/collector/test/HostHeuristicsTest.cpp b/collector/test/HostHeuristicsTest.cpp
@@ -51,7 +51,7 @@ class MockHostInfoHeuristics : public HostInfo {
 class MockCollectorConfig : public CollectorConfig {
  public:
   MockCollectorConfig()
-      : CollectorConfig(){};
+      : CollectorConfig() {};
 
   void SetCollectionMethod(CollectionMethod cm) {
     if (host_config_.HasCollectionMethod()) {

diff --git a/integration-tests/container/perf/scripts/init.sh b/integration-tests/container/perf/scripts/init.sh
@@ -123,6 +123,11 @@ check_headers() {
     return 0
 }
 
+if [[ "$(sysctl -n kernel.kptr_restrict)" != "0" ]]; then
+    # If this is not zero, it can interfere with most of the tools
+    sysctl -w kernel.kptr_restrict=0
+fi
+
 if [[ ! -e "/lib/modules/.installed" ]]; then
     if check_headers "${HOST_MODULES_DIR}"; then
         HEADERS_TARGET="${HOST_MODULES_DIR}/source"
@@ -139,8 +144,3 @@ else
     echo "Headers already installed"
     exit 0
 fi
-
-if [[ "$(sysctl -n kernel.kptr_restrict)" != "0" ]]; then
-    # If this is not zero, it can interfere with most of the tools
-    sysctl -w kernel.kptr_restrict=0
-fi