diff options
| author | Florian Klink <flokli@flokli.de> | 2023-03-01T13·56+0100 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-03-03T14·53+0000 |
| commit | c3750079f75662a6d01a79c0a1c6335456b2d40a (patch) | |
| tree | 32d554993e64dca4d1ac906dc12c6f5d1b28336f /ops/terraform/deploy-nixos/nixos-eval.sh | |
| parent | 344c1193700370f4762ae709c076aae11ca50b18 (diff) | |
feat(ops/terraform): allow specifying an entrypoint for the attrset r/5871
This adds an additional parameter `entrypoint`, pointing to a .nix file (or a directory containing a `default.nix` file) that's providing the attribute path asked for. If not set / kept at the default (empty string), it falls back to the root dir of the repository as before. Change-Id: I2e63114f21660c842153ac15424b3491d66624d2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8190 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to '')
| -rwxr-xr-x | ops/terraform/deploy-nixos/nixos-eval.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ops/terraform/deploy-nixos/nixos-eval.sh b/ops/terraform/deploy-nixos/nixos-eval.sh index dd15784b1b49..38f036bba936 100755 --- a/ops/terraform/deploy-nixos/nixos-eval.sh +++ b/ops/terraform/deploy-nixos/nixos-eval.sh @@ -5,12 +5,11 @@ set -ueo pipefail # Load input variables from Terraform. jq's @sh format takes care of # escaping. -eval "$(jq -r '@sh "ATTRPATH=\(.attrpath)"')" +eval "$(jq -r '@sh "ATTRPATH=\(.attrpath) && ENTRYPOINT=\(.entrypoint)"')" # Evaluate the system derivation. -# TODO: configurable REPO_ROOT -REPO_ROOT=$(git rev-parse --show-toplevel) -SYSTEM_DRV=$(nix-instantiate -A "${ATTRPATH}" "${REPO_ROOT}") +[[ -z "$ENTRYPOINT" ]] && ENTRYPOINT=$(git rev-parse --show-toplevel) +SYSTEM_DRV=$(nix-instantiate -A "${ATTRPATH}" "${ENTRYPOINT}") # Return system derivation back to Terraform. jq -n --arg drv "$SYSTEM_DRV" '{"drv":$drv}' |