Merge pull request fluidattacks#1393 from dsalaza4/main

refac(back): fluidattacks#1378 deprecate calculate scorecard
dsalaza4 · Dec 12, 2024 · 37bc7bf · 37bc7bf
2 parents 10b061b + a487f2f
commit 37bc7bf
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 245 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -19,26 +19,6 @@ jobs:
       - name: __all__
         run: nix-env -if . && m . __all__
 
-  linux_calculatescorecard:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /calculateScorecard
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /calculateScorecard"
-  macos_calculatescorecard:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
-      - name: /calculateScorecard
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: nix-env -if . && m . /calculateScorecard
-
   linux_deployTerraform_module:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -94,28 +94,6 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-  linux_calculatescorecard:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /calculateScorecard
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /calculateScorecard"
-  macos_calculatescorecard:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
-      - name: /calculateScorecard
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-        run: nix-env -if . && m . /calculateScorecard
-
   linux_deployTerraform_module:
     runs-on: ubuntu-latest
     steps:

diff --git a/.mailmap b/.mailmap
@@ -22,6 +22,7 @@ Fluid Attacks <[email protected]> Fluid Attacks <[email protected]>
 Github Dependabot <49699333+dependabot[bot]@users.noreply.github.com> dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 Github Octocat <[email protected]> GitHub <[email protected]>
 GuangTao Zhang <[email protected]> GTrunSec <[email protected]>
+Jaime Hurtado <[email protected]> Jaime Hurtado <[email protected]>
 John Perez <[email protected]> John Perez <[email protected]>
 John Perez <[email protected]> John Perez <[email protected]>
 Julian Gomez <[email protected]> Julian Gomez <[email protected]>

diff --git a/docs/mkdocs.yaml b/docs/mkdocs.yaml
@@ -119,7 +119,6 @@ nav:
           - api/builtins/format.md
           - api/builtins/framework-configuration.md
           - api/builtins/lint.md
-          - api/builtins/monitoring.md
           - api/builtins/performance.md
           - api/builtins/secrets.md
           - api/builtins/security.md

diff --git a/docs/src/api/builtins/monitoring.md b/docs/src/api/builtins/monitoring.md
diff --git a/makes.nix b/makes.nix
@@ -14,10 +14,6 @@
       };
     };
   };
-  calculateScorecard = {
-    enable = true;
-    target = "github.com/fluidattacks/makes";
-  };
   deployContainer = {
     makesAmd64 = {
       credentials = {

diff --git a/src/args/agnostic.nix b/src/args/agnostic.nix
@@ -27,7 +27,6 @@ let
       attrsMerge = builtins.foldl' __nixpkgs__.lib.recursiveUpdate { };
       attrsOptional = __nixpkgs__.lib.optionalAttrs;
       calculateCvss3 = import ./calculate-cvss-3/default.nix self;
-      calculateScorecard = import ./calculate-scorecard/default.nix self;
       chunks = import ./chunks/default.nix self;
       computeOnAwsBatch = import ./compute-on-aws-batch/default.nix self;
       deployContainer = import ./deploy-container/default.nix self;

diff --git a/src/args/calculate-scorecard/default.nix b/src/args/calculate-scorecard/default.nix
diff --git a/src/args/calculate-scorecard/entrypoint.sh b/src/args/calculate-scorecard/entrypoint.sh
diff --git a/src/evaluator/modules/calculate-scorecard/default.nix b/src/evaluator/modules/calculate-scorecard/default.nix
diff --git a/src/evaluator/modules/default.nix b/src/evaluator/modules/default.nix
@@ -2,7 +2,6 @@
 , toFileJson, ... }@args: {
   imports = [
     (import ./cache/default.nix args)
-    (import ./calculate-scorecard/default.nix args)
     (import ./compute-on-aws-batch/default.nix args)
     (import ./dev/default.nix args)
     (import ./deploy-container/default.nix args)