Skip to content

Commit e9f0fcd

Browse files
poblin-orangepoblin-orange
authored
Merge pull request #19 from poblin-orange/master
bump terraform 0.13.6 + support execution http proxy configuration
2 parents c184f92 + fa6a308 commit e9f0fcd

File tree

10 files changed

+84
-5
lines changed

10 files changed

+84
-5
lines changed

‎.final_builds/jobs/terraform-apply/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ builds:
33
version: 0a3b5518844757da07446caccca6a6e7a520fe9c94cfaebc11b9b390e341b62a
44
blobstore_id: 6a5e379c-d414-4677-6f38-3df44bb061ed
55
sha1: sha256:fa6a2fb8c09352e6c17e02fc09edac5b54dba637426320fbb97ec99111d89c41
6+
6b14d9620b03cc90d51d9a3afd67323dfd5021c4ceada2ececbb9e2595dcd4b9:
7+
version: 6b14d9620b03cc90d51d9a3afd67323dfd5021c4ceada2ececbb9e2595dcd4b9
8+
blobstore_id: d147018c-846d-4a97-40c2-6beba8af4c7c
9+
sha1: sha256:7f0c06b4761d5a4ba394158585b5b58286c1f89d545e14ae9c1f671e470a98e9
610
7547814f282b21b309d0e714dd0a2a72ca006f8d959ae69849ca462bb2245b47:
711
version: 7547814f282b21b309d0e714dd0a2a72ca006f8d959ae69849ca462bb2245b47
812
blobstore_id: 0b0c16c6-f909-40ec-7735-752ddc1f5802

‎.final_builds/packages/terraform-package-0.13/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ builds:
33
version: 4bb49e6e1493dca15cf7a7637cb454393e348c46df3382a7091259a676399af3
44
blobstore_id: 824bdc13-09e7-4b29-614e-87a69e874095
55
sha1: sha256:cf4324ed160b1869b2b60f7018dc18bcfb829a7e6c4b5e75f378e4c5d8bda196
6+
cdb04a31912dd900fedcaca81b3e81108d45461a244b74940788a1611362cb0a:
7+
version: cdb04a31912dd900fedcaca81b3e81108d45461a244b74940788a1611362cb0a
8+
blobstore_id: c9223cb7-8500-4f67-602d-1491af957139
9+
sha1: sha256:e60470240b6175b7685879435cf6006d04c9fe6813142854075eeb5988db259e
610
format-version: "2"

‎config/blobs.yml

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ terraform-0.13.3.zip:
1010
size: 34879507
1111
object_id: 02e665cd-fe76-4178-615c-f44c3e5c7ff1
1212
sha: sha256:35c662be9d32d38815cde5fa4c9fa61a3b7f39952ecd50ebf92fd1b2ddd6109b
13+
terraform-0.13.6.zip:
14+
size: 34880158
15+
object_id: 8bdbf9a0-5090-4b23-602c-40a8e7f1ce0c
16+
sha: sha256:55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9
1317
terraform-provider-cloudfoundry_v0.11.2:
1418
size: 39127656
1519
object_id: be89f5fd-0361-48e6-50f4-e7f1b8cb3ad6

‎getblobs-0.13.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
TERRAFORM_VERSION="0.13.3"
2+
TERRAFORM_VERSION="0.13.6"
33
wget "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -nv -O ./terraform-${TERRAFORM_VERSION}.zip
44
bosh add-blob ./terraform-${TERRAFORM_VERSION}.zip terraform-${TERRAFORM_VERSION}.zip
55

‎jobs/terraform-apply/spec

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
name: terraform-apply
33
packages:
4-
- terraform-package
54
- terraform-package-0.13
65
- git
76
templates:
@@ -30,7 +29,7 @@ properties:
3029
array of terraform file to apply
3130
terraform.https_proxy:
3231
description:
33-
if set, http url to use as proxy env for terraform, eg http://myproxy:3128
32+
if set, http url to use as proxy env for terraform init, eg http://myproxy:3128
3433
terraform.no_proxy:
3534
description:
3635
if set, coma separated list of domain and ips to exclude from proxy (go lang syntax)
@@ -39,6 +38,17 @@ properties:
3938
description: plan and apply on bosh errand launch
4039
default: true
4140

41+
terraform.execution_https_proxy:
42+
description:
43+
if set, http url to use as proxy env for terraform execution, eg http://myproxy:3128
44+
terraform.execution_no_proxy:
45+
description:
46+
if set, coma separated list of domain and ips to exclude from proxy (go lang syntax)
47+
48+
terraform.lifecycle.errand:
49+
description: plan and apply on bosh errand launch
50+
default: true
51+
4252

4353
terraform.lifecycle.pre-start:
4454
description: plan and apply on bosh instance pre-start

‎jobs/terraform-apply/templates/bin/terraform-plan-apply.erb

+13
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,19 @@ cp -f /var/vcap/jobs/terraform-apply/config/terraform.tfvars.json terraform.tfva
5353
terraform init
5454
terraform providers
5555

56+
#now set proxy for execution
57+
export https_proxy=
58+
export no_proxy=
59+
60+
<% if_p('terraform.execution_https_proxy') do |proxy| %>
61+
export https_proxy=<%= proxy %>
62+
<% end %>
63+
64+
<% if_p('terraform.execution_no_proxy') do |no_proxy| %>
65+
export no_proxy=<%= no_proxy %>
66+
<% end %>
67+
68+
5669
echo "terraform plan"
5770
terraform plan -detailed-exitcode -no-color -out=${STORE_DIR}/tfplan -var-file=${STORE_DIR}/terraform.tfvars.json -state=${STORE_DIR}/terraform.tfstate
5871
EXITSTATUS=$?

‎packages/terraform-package-0.13/packaging

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ CPUS=$(grep -c ^processor /proc/cpuinfo)
88
# $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
99
export HOME=/var/vcap
1010

11-
unzip $BOSH_COMPILE_TARGET/terraform-0.13.3.zip -d $BOSH_INSTALL_TARGET
11+
unzip $BOSH_COMPILE_TARGET/terraform-0.13.6.zip -d $BOSH_INSTALL_TARGET
1212

‎packages/terraform-package-0.13/spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
name: terraform-package-0.13
33
dependencies: []
44
files:
5-
- terraform-0.13.3.zip
5+
- terraform-0.13.6.zip

‎releases/terraform/index.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ builds:
55
version: "3"
66
7ba42ade-7022-4b15-5b0e-f79733fc5653:
77
version: "1"
8+
ceb65c50-947b-4c7b-4d1b-e3036a47c99a:
9+
version: "4"
810
format-version: "2"

‎releases/terraform/terraform-4.yml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: terraform
2+
version: "4"
3+
commit_hash: c982a5a
4+
uncommitted_changes: false
5+
jobs:
6+
- name: terraform-apply
7+
version: 6b14d9620b03cc90d51d9a3afd67323dfd5021c4ceada2ececbb9e2595dcd4b9
8+
fingerprint: 6b14d9620b03cc90d51d9a3afd67323dfd5021c4ceada2ececbb9e2595dcd4b9
9+
sha1: sha256:7f0c06b4761d5a4ba394158585b5b58286c1f89d545e14ae9c1f671e470a98e9
10+
packages:
11+
- terraform-package-0.13
12+
- git
13+
- name: terraform-plan-only
14+
version: 3b553c39589c4499bc767dad6e21d1150e06916510091251d796deaff5db69c7
15+
fingerprint: 3b553c39589c4499bc767dad6e21d1150e06916510091251d796deaff5db69c7
16+
sha1: sha256:154bf00bc123632c0d164d8bdbc3e04fe1a12123254830436c22244b8399b3ee
17+
packages: []
18+
packages:
19+
- name: git
20+
version: 86209ea3cbf073e75b2f334e3501b28739538f24b9bcb85c14befcdbd32498af
21+
fingerprint: 86209ea3cbf073e75b2f334e3501b28739538f24b9bcb85c14befcdbd32498af
22+
sha1: sha256:3354d3820c298b22dfc8c4c385e515a324fe22f482db7b6a37f48ea07397803a
23+
dependencies: []
24+
- name: terraform-package
25+
version: 01dd58dae25be9a9c91f67ddbc39890ed504a1c155d6fdd2484d700e7f5b7cc2
26+
fingerprint: 01dd58dae25be9a9c91f67ddbc39890ed504a1c155d6fdd2484d700e7f5b7cc2
27+
sha1: sha256:f654501214832cc5729b73338ab22d613584f30217a3bc4316696160f9a913b2
28+
dependencies: []
29+
- name: terraform-package-0.13
30+
version: cdb04a31912dd900fedcaca81b3e81108d45461a244b74940788a1611362cb0a
31+
fingerprint: cdb04a31912dd900fedcaca81b3e81108d45461a244b74940788a1611362cb0a
32+
sha1: sha256:e60470240b6175b7685879435cf6006d04c9fe6813142854075eeb5988db259e
33+
dependencies: []
34+
- name: terraform-plugins
35+
version: dc45c3be9226d170ec881a303419f5e72f868d3037ee411f48b4332e137871c2
36+
fingerprint: dc45c3be9226d170ec881a303419f5e72f868d3037ee411f48b4332e137871c2
37+
sha1: sha256:21cebe1e9f83956ec9602c910e893720744feba4e7a80dc0b85c8c8817e7f171
38+
dependencies: []
39+
license:
40+
version: c52a2c414b935147f0ccbe8d798edbbcd65c5e9084079f727b3fb5727a44e50d
41+
fingerprint: c52a2c414b935147f0ccbe8d798edbbcd65c5e9084079f727b3fb5727a44e50d
42+
sha1: sha256:4b6af63893f5709071eb6dfd211439d7945a3c63a05e1db3edad3075953a50ab

0 commit comments

Comments
 (0)