move shellcheck

Author: pawelchcki

.github/actions/lint_code/action.yaml

@@ -3,11 +3,15 @@ description: "Run lints checks for project"
 runs:
   using: composite
   steps:
+    - uses: cachix/install-nix-action@v27
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
     - name: Install runner
       uses: ./.github/actions/install_runner
     - run: source venv/bin/activate
       shell: bash
-    - name: Black, pylint and tailing whitespaces checks
+
+    - name: All checks + pylint checks
       shell: bash
       run: ./format.sh --check
     - if: ${{ failure() }}
@@ -18,12 +22,6 @@ runs:
         exit 1
 
         '
-    - name: 'Install shellcheck'
-      shell: bash
-      run: sudo apt-get install -y shellcheck
-    - name: 'Run shellcheck'
-      shell: bash
-      run: ./utils/scripts/shellcheck.sh
     - name: Install node
       uses: actions/setup-node@v4
       with:

.github/workflows/nix-github-actions.yml

@@ -36,21 +36,11 @@
 
     treefmt = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
 
-    lints = pkgs.stdenv.mkDerivation {
-      name = "lint-check";
-      src = ./.;
-      doCheck = true;
-      nativeBuildInputs = with pkgs; [pylint];
-      checkPhase = ''
-        pylint utils
-      '';
-    };
-
     python = pkgs.python39;
   in {
     packages = {
-      default = black;
-      inherit black lints;
+      default = treefmt.config.build.wrapper;
+      inherit black treefmt;
     };
     devShells.default =
       pkgs.mkShell
@@ -65,12 +55,11 @@
 
           treefmt.config.build.wrapper
           python
-          python.pkgs.venvShellHook
 
           pkgs.ruff
         ];
 
-        # buildInputs = [python.pkgs.venvShellHook];
+        buildInputs = [python.pkgs.venvShellHook];
         venvDir = "./venv";
 
         postVenvCreation = ''

.shellcheck

@@ -29,46 +29,23 @@ while [[ "$#" -gt 0 ]]; do
     shift
 done
 
+echo "Running treefmt-nix ..."
+if [ "$COMMAND" == "fix" ]; then
+  nix fmt
+
+
+else
+  nix flake check
+fi
+
 if [ ! -d "venv/" ]; then
   echo "Runner is not installed, installing it (ETA 60s)"
   ./build.sh -i runner
 fi
 
+# shellcheck source=/dev/null
 source venv/bin/activate
 
-echo "Checking Python files..."
-if [ "$COMMAND" == "fix" ]; then
-  black .
-else
-  black --check --diff .
-fi
 pylint utils  # pylint does not have a fix mode
 
-# not py, as it's handled by black
-INCLUDE_EXTENSIONS=("*.md" "*.yml" "*.yaml" "*.sh" "*.cs" "*.Dockerfile" "*.java" "*.sql" "*.ts" "*.js" "*.php")
-EXCLUDE_DIRS=("logs*" "*/node_modules/*" "./venv/*" "./manifests/*" "./utils/build/virtual_machine/*")
-
-INCLUDE_ARGS=()
-for ext in "${INCLUDE_EXTENSIONS[@]}"; do
-  INCLUDE_ARGS+=(-name "$ext" -o)
-done
-unset 'INCLUDE_ARGS[${#INCLUDE_ARGS[@]}-1]'  # remove last -o
-
-EXCLUDE_ARGS=()
-for dir in "${EXCLUDE_DIRS[@]}"; do
-  EXCLUDE_ARGS+=(-not -path "$dir")
-done
-
-echo "Checking tailing whitespaces..."
-FILES=$(find . "${EXCLUDE_ARGS[@]}" \( "${INCLUDE_ARGS[@]}" \) -exec grep -l " $" {} \;)
-if [ "$COMMAND" == "fix" ]; then
-  echo "$FILES" | xargs -I {} sed -i '' -r 's/ +$//g' {}
-else
-  if [ -n "$FILES" ]; then
-    echo "Some tailing white spaces has been found, please fix them 💥 💔 💥"
-    echo "$FILES"
-    exit 1
-  fi
-fi
-
 echo "All good, the system-tests CI will be happy! ✨ 🍰 ✨"

.shellcheckrc

@@ -12,7 +12,53 @@
   programs.black.enable = true;
   # Format .sh scripts
   # programs.shfmt.enable = true;
-  settings.global.excludes = ["tests/fuzzer/**" "tests/appsec/waf/blocked*" "utils/parametric/protos/*.py"];
+
+  programs.shellcheck.enable = true;
+
+  settings.formatter.shellcheck = {
+    excludes = [
+      # TODO: scripts to fix
+      "utils/scripts/load-binary.sh"
+      "utils/scripts/install_mitm_certificate.sh"
+      "utils/scripts/update_dashboard_CI_visibility.sh"
+      "utils/scripts/slack/report.sh"
+      "utils/scripts/docker_base_image.sh"
+      "utils/scripts/upload_results_CI_visibility.sh"
+      "utils/build/docker/postgres-init-db.sh"
+      "utils/build/docker/nodejs/app.sh"
+      "utils/build/docker/nodejs/install_ddtrace.sh"
+      "utils/build/docker/set-uds-transport.sh"
+      "utils/build/docker/python/flask/app.sh"
+      "utils/build/docker/python/install_ddtrace.sh"
+      "utils/build/docker/python/django/app.sh"
+      "utils/build/docker/golang/app.sh"
+      "utils/build/docker/golang/install_ddtrace.sh"
+      "utils/build/docker/weblog-cmd.sh"
+      "utils/build/docker/java/app.sh"
+      "utils/build/docker/java/install_ddtrace.sh"
+      "utils/build/docker/java/spring-boot/app.sh"
+      "utils/build/docker/php/apache-mod/build.sh"
+      "utils/build/docker/php/apache-mod/entrypoint.sh"
+      "utils/build/docker/php/php-fpm/build.sh"
+      "utils/build/docker/php/php-fpm/entrypoint.sh"
+      "utils/build/docker/php/common/install_ddtrace.sh"
+      "utils/build/docker/dotnet/app.sh"
+      "utils/build/docker/dotnet/install_ddtrace.sh"
+      "utils/build/docker/cpp/install_ddprof.sh"
+      "utils/build/docker/cpp/nginx/app.sh"
+      "utils/build/docker/cpp/nginx/install_ddtrace.sh"
+      "utils/build/docker/ruby/install_ddtrace.sh"
+      "utils/build/build.sh"
+      "utils/interfaces/schemas/serve.sh"
+      "build.sh"
+      # "format.sh"
+
+      # ignored paths
+      "tests/perfs/*.sh"
+      "parametric/*.sh"
+      "lib-injection/*.sh"
+    ];
+  };
 
   settings.formatter.whitespace = {
     command = "${pkgs.bash}/bin/bash";
@@ -28,4 +74,6 @@
 
     settings.global.excludes = ["./venv/*" "*/node_modules/*" "tests/appsec/waf/blocked*" "utils/parametric/protos/*.py"];
   };
+
+  settings.global.excludes = ["tests/fuzzer/**" "tests/appsec/waf/blocked*" "utils/parametric/protos/*.py"];
 }

flake.nix

@@ -6,7 +6,7 @@ if [ -z "$INSTALLER_URL" ]; then
     INSTALLER_URL="https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh"
 fi
 
-curl -L $INSTALLER_URL --output install_script_agent7.sh
+curl -L "$INSTALLER_URL" --output install_script_agent7.sh
 chmod 755 install_script_agent7.sh
 # shellcheck disable=SC2154
 sed  "s/\"7\"/\"$DD_injection_major_version\"/g" install_script_agent7.sh > install_script_agent7_autoinject_temp.sh