Merge pull request fluidattacks#1397 from dsalaza4/main

refac(back): fluidattacks#1378 deprecate taint terraform
dsalaza4 · Dec 12, 2024 · 62686a8 · 62686a8
2 parents 9186bdc + 0c00961
commit 62686a8
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 186 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -397,22 +397,6 @@ jobs:
       - name: /secretsForGpgFromEnv/example
         run: nix-env -if . && m . /secretsForGpgFromEnv/example
 
-  linux_taintTerraform_module:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /taintTerraform/module
-        with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /taintTerraform/module"
-  macos_taintTerraform_module:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
-      - name: /taintTerraform/module
-        run: nix-env -if . && m . /taintTerraform/module
-
   linux_testLicense:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -571,26 +571,6 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-  linux_taintTerraform_module:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://docker.io/nixos/nix@sha256:c3db4c484f6b1ee6c9bb8ca90307cfbeca8ef88156840911356a677eeaff4845
-        name: /taintTerraform/module
-        with:
-          args: sh -c "chown -R root:root /github/workspace && nix-env -if . && m . /taintTerraform/module"
-        env:
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-  macos_taintTerraform_module:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: cachix/install-nix-action@6ed004b9ccb68dbc28e7c85bee15fa93dbd214ac
-      - name: /taintTerraform/module
-        run: nix-env -if . && m . /taintTerraform/module
-        env:
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
   linux_testLicense:
     runs-on: ubuntu-latest
     steps:

diff --git a/docs/src/api/builtins/deploy.md b/docs/src/api/builtins/deploy.md
@@ -367,58 +367,5 @@ Example:
     m . /deployTerraform/module1
     ```
 
-## taintTerraform
-
-Taint Terraform code
-by performing a `terraform taint $resource`
-over the specified Terraform modules.
-
-Types:
-
-- taintTerraform:
-    - modules (`attrsOf moduleType`): Optional.
-        Path to Terraform modules to lint.
-        Defaults to `{ }`.
-- moduleType (`submodule`):
-    - reDeploy (`bool`): Optional.
-        Perform a `terraform apply` after tainting resources.
-        Defaults to `false`.
-    - resources (`listOf str`):
-        Resources to taint.
-    - setup (`listOf package`): Optional.
-        [Makes Environment][makes_environment]
-        or [Makes Secrets][makes_secrets]
-        to `source` (as in Bash's `source`)
-        before anything else.
-        Defaults to `[ ]`.
-    - src (`str`):
-        Path to the Terraform module.
-    - version (`enum [ "0.14" "0.15" "1.0" ]`):
-        Terraform version your module is built with.
-
-Example:
-
-=== "makes.nix"
-
-    ```nix
-    {
-      taintTerraform = {
-        modules = {
-          module = {
-            resources = [ "null_resource.example" ];
-            src = "/test/terraform/module";
-            version = "0.14";
-          };
-        };
-      };
-    }
-    ```
-
-=== "Invocation"
-
-    ```bash
-    m . /taintTerraform/module
-    ```
-
 [makes_environment]: ./environment.md
 [makes_secrets]: ./secrets.md
diff --git a/makes.nix b/makes.nix
@@ -192,15 +192,6 @@
     };
   };
   secretsForTerraformFromEnv = { example = { test = "VAR_NAME"; }; };
-  taintTerraform = {
-    modules = {
-      module = {
-        resources = [ "null_resource.example" ];
-        src = "/test/terraform/module";
-        version = "1.0";
-      };
-    };
-  };
   testLicense = { enable = true; };
   testTerraform = {
     modules = {

diff --git a/src/args/agnostic.nix b/src/args/agnostic.nix
@@ -119,7 +119,6 @@ let
         (a: b: __nixpkgs__.lib.toLower a < __nixpkgs__.lib.toLower b);
       stringCapitalize = import ./string-capitalize/default.nix self;
       sublist = import ./sublist/default.nix self;
-      taintTerraform = import ./taint-terraform/default.nix self;
       testLicense = import ./test-license/default.nix self;
       testTerraform = import ./test-terraform/default.nix self;
       toDerivationName = __nixpkgs__.lib.strings.sanitizeDerivationName;

diff --git a/src/args/taint-terraform/default.nix b/src/args/taint-terraform/default.nix
diff --git a/src/args/taint-terraform/entrypoint.sh b/src/args/taint-terraform/entrypoint.sh
diff --git a/src/evaluator/modules/default.nix b/src/evaluator/modules/default.nix
@@ -36,7 +36,6 @@
     (import ./secrets-for-gpg-from-env/default.nix args)
     (import ./secrets-for-kubernetes-config-from-aws/default.nix args)
     (import ./secrets-for-terraform-from-env/default.nix args)
-    (import ./taint-terraform/default.nix args)
     (import ./test-license/default.nix args)
     (import ./test-terraform/default.nix args)
     (import ./workspace-for-terraform-from-env args)

diff --git a/src/evaluator/modules/taint-terraform/default.nix b/src/evaluator/modules/taint-terraform/default.nix