From 72f91f032bbda43e2151196ea70bee84a435d4b8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 6 Jun 2022 21:24:53 +0000 Subject: refactor(ops/buildkite): Use tools.checks.validateTerraform Remove some code duplication. Change-Id: I7ff49e728e1bd584bca3b84cdc033d93e60aefc2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5851 Tested-by: BuildkiteCI Reviewed-by: asmundo --- ops/buildkite/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ops/buildkite/default.nix b/ops/buildkite/default.nix index 46c20e4a5f93..0d39bc06010d 100644 --- a/ops/buildkite/default.nix +++ b/ops/buildkite/default.nix @@ -5,12 +5,10 @@ depot.nix.readTree.drvTargets rec { p.buildkite ]); - validate = pkgs.runCommand "tf-validate-buildkite" - { - BUILDKITE_API_TOKEN = "ci-dummy"; - } '' - cp -r ${lib.cleanSource ./.}/* . && chmod -R u+w . - ${terraform}/bin/terraform init -upgrade -backend=false -input=false - ${terraform}/bin/terraform validate | tee $out - ''; + validate = depot.tools.checks.validateTerraform { + inherit terraform; + name = "buildkite"; + src = lib.cleanSource ./.; + env.BUILDKITE_API_TOKEN = "ci-dummy"; + }; } -- cgit 1.4.1