Merge pull request #1419 from dsalaza4/main

refac(back): #1378 deprecate builtins
fluidattacks · Dec 19, 2024 · 226f3a1 · 226f3a1
2 parents fe49378 + 401e3f6
commit 226f3a1
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 206 deletions.
diff --git a/src/args/agnostic.nix b/src/args/agnostic.nix
@@ -72,18 +72,11 @@ let
         import ./make-ruby-gems-environment/default.nix self;
       makeRubyGemsInstall = import ./make-ruby-gems-install/default.nix self;
       makeScript = import ./make-script/default.nix self;
-      makeScriptParallel = import ./make-script-parallel/default.nix self;
       makeSearchPaths = import ./make-search-paths/default.nix self;
       makeSecretForAwsFromEnv =
         import ./make-secret-for-aws-from-env/default.nix self;
-      makeSecretForAwsFromGitlab =
-        import ./make-secret-for-aws-from-gitlab/default.nix self;
       makeSecretForEnvFromSops =
         import ./make-secret-for-env-from-sops/default.nix self;
-      makeSecretForKubernetesConfigFromAws =
-        import ./make-secret-for-kubernetes-config-from-aws/default.nix self;
-      makeSecretForNomadFromEnv =
-        import ./make-secret-for-nomad-from-env/default.nix self;
       makeSecretForTerraformFromEnv =
         import ./make-secret-for-terraform-from-env/default.nix self;
       makeTerraformEnvironment =

diff --git a/src/args/make-script-parallel/default.nix b/src/args/make-script-parallel/default.nix
diff --git a/src/args/make-script-parallel/entrypoint.sh b/src/args/make-script-parallel/entrypoint.sh
diff --git a/src/args/make-secret-for-aws-from-gitlab/default.nix b/src/args/make-secret-for-aws-from-gitlab/default.nix
diff --git a/src/args/make-secret-for-aws-from-gitlab/template.sh b/src/args/make-secret-for-aws-from-gitlab/template.sh
diff --git a/src/args/make-secret-for-kubernetes-config-from-aws/default.nix b/src/args/make-secret-for-kubernetes-config-from-aws/default.nix
diff --git a/src/args/make-secret-for-kubernetes-config-from-aws/template.sh b/src/args/make-secret-for-kubernetes-config-from-aws/template.sh
diff --git a/src/args/make-secret-for-nomad-from-env/default.nix b/src/args/make-secret-for-nomad-from-env/default.nix
diff --git a/src/args/make-secret-for-nomad-from-env/template.sh b/src/args/make-secret-for-nomad-from-env/template.sh
diff --git a/src/evaluator/modules/default.nix b/src/evaluator/modules/default.nix
@@ -24,7 +24,6 @@
     (import ./lint-with-ajv/default.nix args)
     (import ./pipelines/default.nix args)
     (import ./secrets-for-aws-from-env/default.nix args)
-    (import ./secrets-for-aws-from-gitlab/default.nix args)
     (import ./secrets-for-env-from-sops/default.nix args)
     (import ./secrets-for-terraform-from-env/default.nix args)
     (import ./test-license/default.nix args)

diff --git a/src/evaluator/modules/secrets-for-aws-from-gitlab/default.nix b/src/evaluator/modules/secrets-for-aws-from-gitlab/default.nix
diff --git a/tests/pipelines/makes.nix b/tests/pipelines/makes.nix
@@ -1,8 +1,6 @@
 {
-  pipelines = {
-    example = {
-      gitlabPath = "/tests/pipelines/.gitlab-ci.yaml";
-      jobs = [ { output = "/lintNix"; } { output = "/formatNix"; } ];
-    };
+  pipelines.example = {
+    gitlabPath = "/tests/pipelines/.gitlab-ci.yaml";
+    jobs = [ { output = "/lintNix"; } { output = "/formatNix"; } ];
   };
 }