feat(build): #37 update repo

- Update repo to the latest `Makes` version Signed-off-by: Robin Quintero <rohaquinlop301@gmail.com>
fluidattacks · Jan 26, 2024 · 3d40bf7 · 3d40bf7
1 parent 79c0f5b
commit 3d40bf7
Show file tree

Hide file tree

Showing 11 changed files with 288 additions and 169 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -13,8 +13,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /api/deploy
         with:
-          set-safe-directory: /github/workspace
-          args: m . /api/deploy dev
+          args: sh -c "chown -R root:root /github/workspace && m . /api/deploy dev"
         env:
           STACKHERO_SERVICE_ID: ${{ secrets.STACKHERO_SERVICE_ID }}
           STACKHERO_PASSWORD: ${{ secrets.STACKHERO_PASSWORD }}
@@ -28,8 +27,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatBash
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatBash
+          args: sh -c "chown -R root:root /github/workspace && m . /formatBash"
 
   formatMarkdown:
     runs-on: ubuntu-latest
@@ -38,8 +36,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatMarkdown
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatMarkdown
+          args: sh -c "chown -R root:root /github/workspace && m . /formatMarkdown"
 
   formatNix:
     runs-on: ubuntu-latest
@@ -48,8 +45,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatNix
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatNix
+          args: sh -c "chown -R root:root /github/workspace && m . /formatNix"
 
   formatPython_default:
     runs-on: ubuntu-latest
@@ -58,8 +54,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatPython/default
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatPython/default
+          args: sh -c "chown -R root:root /github/workspace && m . /formatPython/default"
 
   lintBash:
     runs-on: ubuntu-latest
@@ -70,8 +65,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintBash
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintBash
+          args: sh -c "chown -R root:root /github/workspace && m . /lintBash"
 
   lintGitCommitMsg:
     runs-on: ubuntu-latest
@@ -82,8 +76,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintGitCommitMsg
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintGitCommitMsg
+          args: sh -c "chown -R root:root /github/workspace && m . /lintGitCommitMsg"
 
   lintGitMailMap:
     runs-on: ubuntu-latest
@@ -94,8 +87,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintGitMailMap
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintGitMailMap
+          args: sh -c "chown -R root:root /github/workspace && m . /lintGitMailMap"
 
   lintMarkdown_readme:
     runs-on: ubuntu-latest
@@ -104,8 +96,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintMarkdown/readme
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintMarkdown/readme
+          args: sh -c "chown -R root:root /github/workspace && m . /lintMarkdown/readme"
 
   lintNix:
     runs-on: ubuntu-latest
@@ -114,8 +105,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintNix
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintNix
+          args: sh -c "chown -R root:root /github/workspace && m . /lintNix"
 
   lintPython_module_api:
     runs-on: ubuntu-latest
@@ -124,8 +114,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintPython/module/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintPython/module/api
+          args: sh -c "chown -R root:root /github/workspace && m . /lintPython/module/api"
 
   lintWithLizard_api:
     runs-on: ubuntu-latest
@@ -134,8 +123,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintWithLizard/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintWithLizard/api
+          args: sh -c "chown -R root:root /github/workspace && m . /lintWithLizard/api"
 
   securePythonWithBandit_api:
     runs-on: ubuntu-latest
@@ -144,8 +132,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /securePythonWithBandit/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /securePythonWithBandit/api
+          args: sh -c "chown -R root:root /github/workspace && m . /securePythonWithBandit/api"
 name: dev
 on:
   pull_request:

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -13,8 +13,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /api/deploy
         with:
-          set-safe-directory: /github/workspace
-          args: m . /api/deploy prod
+          args: sh -c "chown -R root:root /github/workspace && m . /api/deploy prod"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
           STACKHERO_SERVICE_ID: ${{ secrets.STACKHERO_SERVICE_ID }}
@@ -29,8 +28,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatBash
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatBash
+          args: sh -c "chown -R root:root /github/workspace && m . /formatBash"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -41,8 +39,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatMarkdown
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatMarkdown
+          args: sh -c "chown -R root:root /github/workspace && m . /formatMarkdown"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -53,8 +50,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatNix
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatNix
+          args: sh -c "chown -R root:root /github/workspace && m . /formatNix"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -65,8 +61,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /formatPython/default
         with:
-          set-safe-directory: /github/workspace
-          args: m . /formatPython/default
+          args: sh -c "chown -R root:root /github/workspace && m . /formatPython/default"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -79,8 +74,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintBash
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintBash
+          args: sh -c "chown -R root:root /github/workspace && m . /lintBash"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -93,8 +87,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintGitCommitMsg
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintGitCommitMsg
+          args: sh -c "chown -R root:root /github/workspace && m . /lintGitCommitMsg"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -107,8 +100,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintGitMailMap
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintGitMailMap
+          args: sh -c "chown -R root:root /github/workspace && m . /lintGitMailMap"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -119,8 +111,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintMarkdown/readme
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintMarkdown/readme
+          args: sh -c "chown -R root:root /github/workspace && m . /lintMarkdown/readme"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -131,8 +122,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintNix
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintNix
+          args: sh -c "chown -R root:root /github/workspace && m . /lintNix"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -143,8 +133,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintPython/module/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintPython/module/api
+          args: sh -c "chown -R root:root /github/workspace && m . /lintPython/module/api"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -155,8 +144,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /lintWithLizard/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /lintWithLizard/api
+          args: sh -c "chown -R root:root /github/workspace && m . /lintWithLizard/api"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
@@ -167,8 +155,7 @@ jobs:
       - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
         name: /securePythonWithBandit/api
         with:
-          set-safe-directory: /github/workspace
-          args: m . /securePythonWithBandit/api
+          args: sh -c "chown -R root:root /github/workspace && m . /securePythonWithBandit/api"
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 name: prod

diff --git a/.mailmap b/.mailmap
@@ -3,3 +3,4 @@ Daniel Salazar <podany270895@gmail.com> Daniel Salazar <dsalazar@fluidattacks.co
 Daniel Salazar <podany270895@gmail.com> Daniel Salazar <podany270895@gmail.com>
 Github Octocat <noreply@github.com> GitHub <noreply@github.com>
 Jason Chavarria <jchavarria@fluidattacks.com> Jason Chavarria <jchavarria@fluidattacks.com>
+Robin Quintero <rohaquinlop301@gmail.com> Robin Quintero <rquintero@fluidattacks.com>
diff --git a/api/env/main.nix b/api/env/main.nix
@@ -1,5 +1,32 @@
-{makePythonPypiEnvironment, ...}:
-makePythonPypiEnvironment {
-  name = "api-env";
-  sourcesYaml = ./pypi-sources.yaml;
-}
+{makePythonEnvironment, ...}: let
+  overrideWithHome = pkg: super:
+    super.${pkg}.overridePythonAttrs (
+      old: {
+        preBuild = ''
+          export HOME="."
+        '';
+      }
+    );
+  packagesToOverride = [
+    "pytest"
+    "pylint"
+    "pylint-plugin-utils"
+    "pylint-django"
+    "pylint-celery"
+    "pylint-flask"
+  ];
+in
+  makePythonEnvironment {
+    pythonProjectDir = ./.;
+    pythonVersion = "3.11";
+    overrides = self: super:
+      builtins.listToAttrs (
+        builtins.map (
+          pkg: {
+            name = pkg;
+            value = overrideWithHome pkg super;
+          }
+        )
+        packagesToOverride
+      );
+  }