JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #100072 from zimbatm/tf-0.13-fixups

Browse Source 
terraform-full: fix evaluation
This commit is contained in:
zimbatm 2020-10-09 14:55:47 +00:00 committed by GitHub
commit 0e354d87bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

@ -8,24 +8,18 @@ let
list = lib.importJSON ./providers.json; list = lib.importJSON ./providers.json;
toDrv = name: data: toDrv = name: data:
let buildGoPackage {
fallbackProviderSourceAddress = "nixpkgs/${data.owner}/${name}"; pname = data.repo;
providerSourceAddress = data.provider-source-address or fallbackProviderSourceAddress; version = data.version;
in goPackagePath = "github.com/${data.owner}/${data.repo}";
buildGoPackage rec {
inherit (data) owner repo rev version sha256;
name = "${repo}-${version}";
goPackagePath = "github.com/${owner}/${repo}";
subPackages = [ "." ]; subPackages = [ "." ];
src = fetchFromGitHub { src = fetchFromGitHub {
inherit owner repo rev sha256; inherit (data) owner repo rev sha256;
}; };
# Terraform allow checking the provider versions, but this breaks # Terraform allow checking the provider versions, but this breaks
# if the versions are not provided via file paths. # if the versions are not provided via file paths.
postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}"; postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}";
passthru = { passthru = data;
inherit providerSourceAddress;
};
}; };
# Google is now using the vendored go modules, which works a bit differently # Google is now using the vendored go modules, which works a bit differently

2
pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
View File

@ -4,7 +4,7 @@
}: }:
buildGoModule rec { buildGoModule rec {
name = "terraform-provider-keycloak-${version}"; pname = "terraform-provider-keycloak";
version = "1.20.0"; version = "1.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {

16
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -62,21 +62,27 @@ let
# Make providers available in Terraform 0.13 and 0.12 search paths. # Make providers available in Terraform 0.13 and 0.12 search paths.
pluginDir = lib.concatMapStrings (pl: let pluginDir = lib.concatMapStrings (pl: let
inherit (pl) repo version GOOS GOARCH; inherit (pl) version GOOS GOARCH;
inherit (pl.passthru) providerSourceAddress;
pname = pl.pname or (throw "${pl.name} is missing a pname attribute");
# This is just the name, without the terraform-provider- prefix
plugin_name = lib.removePrefix "terraform-provider-" pname;
slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}";
shim = writeText "shim" '' shim = writeText "shim" ''
#!${runtimeShell} #!${runtimeShell}
exec ${pl}/bin/${repo}_v${version} \$@ exec ${pl}/bin/${pname}_v${version} "$@"
''; '';
in '' in ''
TF_0_13_PROVIDER_PATH=$out/plugins/${providerSourceAddress}/${version}/${GOOS}_${GOARCH}/${repo}_v${version} TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version}
mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)"
cp ${shim} "$TF_0_13_PROVIDER_PATH" cp ${shim} "$TF_0_13_PROVIDER_PATH"
chmod +x "$TF_0_13_PROVIDER_PATH" chmod +x "$TF_0_13_PROVIDER_PATH"
TF_0_12_PROVIDER_PATH=$out/plugins/${repo}_v${version} TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version}
cp ${shim} "$TF_0_12_PROVIDER_PATH" cp ${shim} "$TF_0_12_PROVIDER_PATH"
chmod +x "$TF_0_12_PROVIDER_PATH" chmod +x "$TF_0_12_PROVIDER_PATH"