Cleanup

Author: casibbald

.github/workflows/coverage.yml

@@ -49,65 +49,11 @@ jobs:
 #        with:
 #          sarif_file: trivy-results.sarif
 
-  llvm-cov:
-    name: llvm-cov
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y libssl-dev pkg-config clang llvm pkg-config nettle-dev 
-
-      # Set up Rust
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
-
-
-      - name: Install Clippy
-        run: rustup component add clippy
-
-      # Cache Cargo dependencies
-      - name: Cache Cargo registry
-        uses: actions/cache@v3
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-registry-
-
-      - name: Cache Cargo index
-        uses: actions/cache@v3
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-index-
-
-      - name: Cache target directory
-        uses: actions/cache@v3
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-target-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-target-
 
-      - name: Generate code coverage
-        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
-
-
-  codeql:
-    name: SonarQube
+  coverage:
+    name: Code Coverage
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -117,21 +63,15 @@ jobs:
           sudo apt update
           sudo apt install -y libssl-dev pkg-config clang llvm pkg-config nettle-dev 
 
-      # Set up Rust
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
           toolchain: nightly
           override: true
 
-      - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@cargo-llvm-cov
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
 
-      - name: Install Clippy
-        run: rustup component add clippy
-
-      # Cache Cargo dependencies
       - name: Cache Cargo registry
         uses: actions/cache@v3
         with:
@@ -156,17 +96,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-target-
 
-      - name: Generate code coverage
-        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
-
-      - name: Install cargo-sonar and run Clippy
+      - name: Run code coverage
         run: |
-          cargo install cargo-sonar 
-          cargo clippy --message-format json > my-clippy-report.json
-          cargo sonar --clippy-path my-clippy-report.json
+          cargo tarpaulin --out Xml --timeout 240
 
-      - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#      - name: Upload coverage to Codecov
+#        uses: codecov/codecov-action@v3
+#        with:
+#          files: target/tarpaulin/coverage.xml
+#          fail_ci_if_error: true
+#          verbose: true

.github/workflows/scan.yml

@@ -9,21 +9,13 @@
     // unused_qualifications
 )]
 
-use base64::Engine;
-use pgp::ser::Serialize;
-use pgp::{Deserializable, Message, SignedPublicKey};
-use sops_gitops_github_action::{
-    create_default_sops_config_file, create_secret_file, find_secret_files, get_key_fingerprint,
-    get_pubkey_fingerprint, gpg_mock_private_key, import_gpg_key, public_keys_provided,
-    read_public_key, set_message, sops_config_file_exists, update_secret_file, update_sops_config,
-};
-use std::fs;
-use std::fs::File;
-use std::io::Read;
+use sops_gitops_github_action::{get_pubkey_fingerprint, read_public_key, set_message};
+
 use std::sync::LazyLock;
-use tempfile::tempdir;
 
 const MOCK_KEY_FOOTPRINT: &str = "9C243A3FDC4EF1474372915F9C1B6F1F746AF12C";
+
+#[allow(dead_code)]
 static GPG_MOCK_PUBLIC_KEY: LazyLock<String> =
     LazyLock::new(|| read_public_key("tests/mock-public.key.asc"));