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

terraform: 0.12.13 -> 0.12.14 (#73393) 

update terraform to it's latest version
This commit is contained in:
Bastien Rivière 2019-11-14 15:30:19 +00:00 committed by zimbatm
parent e5db97d2b0
commit 136c6c1815
1 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,12 @@
{ stdenv { stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper
, lib , runCommand, writeText, terraform-providers }:
, buildEnv
, buildGoPackage
, fetchFromGitHub
, makeWrapper
, runCommand
, writeText
, terraform-providers
}:
let let
goPackagePath = "github.com/hashicorp/terraform"; goPackagePath = "github.com/hashicorp/terraform";
generic = { version, sha256, ... }@attrs: generic = { version, sha256, ... }@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in let attrs' = builtins.removeAttrs attrs [ "version" "sha256" ];
buildGoPackage ({ in buildGoPackage ({
name = "terraform-${version}"; name = "terraform-${version}";
inherit goPackagePath; inherit goPackagePath;
@ -40,10 +32,17 @@ let
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for building, changing, and versioning infrastructure"; description =
homepage = https://www.terraform.io/; "Tool for building, changing, and versioning infrastructure";
homepage = "https://www.terraform.io/";
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ zimbatm peterhoeg kalbasit marsam ]; maintainers = with maintainers; [
zimbatm
peterhoeg
kalbasit
marsam
babariviere
];
}; };
} // attrs'); } // attrs');
@ -54,38 +53,54 @@ let
actualPlugins = plugins terraform.plugins; actualPlugins = plugins terraform.plugins;
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))); wrapperInputs = lib.unique (lib.flatten
(lib.catAttrs "propagatedBuildInputs"
(builtins.filter (x: x != null) actualPlugins)));
passthru = { passthru = {
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); withPlugins = newplugins:
withPlugins (x: newplugins x ++ actualPlugins);
full = withPlugins lib.attrValues; full = withPlugins lib.attrValues;
# Ouch # Ouch
overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; overrideDerivation = f:
overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins; (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
override = x: (pluggable (terraform.override x)).withPlugins plugins; overrideAttrs = f:
(pluggable (terraform.overrideAttrs f)).withPlugins plugins;
override = x:
(pluggable (terraform.override x)).withPlugins plugins;
}; };
in
# Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
# of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
if actualPlugins == [] in if actualPlugins == [ ] then
then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) terraform.overrideAttrs
else lib.appendToName "with-plugins"(stdenv.mkDerivation { (orig: { passthru = orig.passthru // passthru; })
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name; inherit (terraform) name;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin/ mkdir -p $out/bin/
makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
--set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \ --set NIX_TERRAFORM_PLUGIN_DIR "${
buildEnv {
name = "tf-plugin-env";
paths = actualPlugins;
}
}/bin" \
--prefix PATH : "${lib.makeBinPath wrapperInputs}" --prefix PATH : "${lib.makeBinPath wrapperInputs}"
''; '';
inherit passthru; inherit passthru;
}); });
in withPlugins (_: []); in withPlugins (_: [ ]);
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; plugins = removeAttrs terraform-providers [
"override"
"overrideDerivation"
"recurseForDerivations"
];
in rec { in rec {
terraform_0_11 = pluggable (generic { terraform_0_11 = pluggable (generic {
version = "0.11.14"; version = "0.11.14";
@ -97,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full; terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic { terraform_0_12 = pluggable (generic {
version = "0.12.13"; version = "0.12.14";
sha256 = "11nbr9avw6jx349jdmxgxiawk8i5mpw3p4rrl89yly0wfhg0fh4a"; sha256 = "0pq4sfnnlj91gxyxvyzzrgglnvh8xpan90gnc9jvnnb23iv4q96l";
patches = [ ./provider-path.patch ]; patches = [ ./provider-path.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };
}); });
@ -112,8 +127,8 @@ in rec {
resource "random_id" "test" {} resource "random_id" "test" {}
''; '';
terraform = terraform_0_11.withPlugins (p: [ p.random ]); terraform = terraform_0_11.withPlugins (p: [ p.random ]);
test = runCommand "terraform-plugin-test" { buildInputs = [terraform]; } test =
'' runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } ''
set -e set -e
# make it fail outside of sandbox # make it fail outside of sandbox
export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0