From 982da2f3eaa76bb63b6868bdf07df954f63d1af4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 20 Mar 2024 15:28:02 +0200 Subject: feat(ops/terraform/deploy-nixos): add outPath output parameter We already did all the instantiation, grabbing the calculated output path too is cheap. Change-Id: Id591865c65159409da739f706a9de29a9f50456a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11214 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- ops/terraform/deploy-nixos/nix-eval.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ops/terraform/deploy-nixos/nix-eval.sh') diff --git a/ops/terraform/deploy-nixos/nix-eval.sh b/ops/terraform/deploy-nixos/nix-eval.sh index 2591da28ae0f..d7d59e317b61 100755 --- a/ops/terraform/deploy-nixos/nix-eval.sh +++ b/ops/terraform/deploy-nixos/nix-eval.sh @@ -27,8 +27,12 @@ eval "$(jq -r '@sh "attrpath=\(.attrpath) && entrypoint=\(.entrypoint) && argstr # shellcheck disable=SC2086,SC2154 drv=$(nix-instantiate -A "${attrpath}" "${entrypoint}" ${argstr}) +# Determine the output path. +outPath=$(nix show-derivation "${drv}" | jq -r ".\"${drv}\".outputs.out.path") + # Return a JSON back to stdout. # It contains the following keys: # # - `drv`: the store path of the Derivation that has been instantiated. -jq -n --arg drv "$drv" '{"drv":$drv}' +# - `outPath`: the output store path. +jq -n --arg drv "$drv" --arg outPath "$outPath" '{"drv":$drv, "outPath":$outPath}' -- cgit 1.4.1