e917b3357c
Merge pull request #8157 from BedeGaming/azurerm-update
...
provier/azurerm: update Azure SDK to 3.2 Beta
2016-08-12 19:33:12 -04:00
e909bc8ad2
Update CHANGELOG.md
2016-08-12 18:07:23 -05:00
b9f950f1d4
Merge pull request #8167 from hashicorp/b-tainted-no-attrs-still-replaces
...
terraform: diffs with only tainted set are non-empty
2016-08-12 18:06:32 -05:00
3dccfa0cc9
terraform: diffs with only tainted set are non-empty
...
Fixes issue where a resource marked as tainted with no other attribute
diffs would never show up in the plan or apply as needing to be
replaced.
One unrelated test needed updating due to a quirk in the testDiffFn
logic - it adds a "type" field diff if the diff is non-Empty. NBD
2016-08-12 17:37:49 -05:00
81ea297f1f
Merge pull request #8164 from hashicorp/jbardin/GH-8154
...
Fix panic when there's no state to print
2016-08-12 15:42:00 -04:00
1be5a650fc
Add test for showing an empty state
...
Make sure we don't panic if there's no state to print
2016-08-12 15:01:25 -04:00
191d7c1007
Fix panic when showing empty state
...
Fixes a nil dereference when there's no state to print.
Fix some slice declaration to use the recommended style when allocations
don't matter.
2016-08-12 14:19:42 -04:00
02fee11477
Update CHANGELOG.md
2016-08-12 17:53:53 +01:00
ef9f3a45b1
Add S3 endpoint override ability and expose S3 path style option ( #7871 )
...
* Overriding S3 endpoint - Enable specifying your own
S3 api endpoint to override the default one, under
endpoints.
* Force S3 path style - Expose this option from the aws-sdk-go
configuration to the provider.
2016-08-12 17:52:12 +01:00
7c4426b674
provier/azurerm: update Azure SDK to 3.2 Beta
...
Based on SDK: bfc5b4af08f3d3745d908af36b7ed5b9060f0258
| api | version | note |
|:----------------------------|:--------------------|:----------|
| arm/mediaservices | 2015-10-01 | new |
| arm/keyvault | 2015-06-01 | new |
| arm/iothub | 2016-02-03 | new |
| arm/datalake-store | 2015-12-01 | new |
| arm/network | 2016-06-01 | updated |
| arm/resources/resources | 2016-07-01 | updated |
| arm/resources/policy | 2016-04-01 | updated |
| arm/servicebus | 2015-08-01 | updated |
- arm: uses go-autorest version v7.1.0.
- storage: fix for operating on blobs names containing special characters.
- storage: add SetBlobProperties(), update BlobProperties response fields.
- storage: make storage client work correctly with read-only secondary account.
- storage: add Azure Storage Emulator support.
2016-08-12 11:44:23 +01:00
e251d5c7bd
Merge pull request #8114 from TimeIncOSS/f-aws-skip-options
...
aws: Change names of new skip_* fields + document those
2016-08-12 07:00:14 +01:00
7bc10c62b8
Update CHANGELOG.md
2016-08-12 13:16:59 +10:00
168d212e77
Fix. Correct how CORS rules are handled. ( #8096 )
...
This commit fixes an issue where CORS rules would not be read and thus refreshed
correctly should there be a change introduced externally e.g. CORS configuration
was edited outside of Terraform.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-12 13:14:48 +10:00
34864d33b5
Update CHANGELOG.md
2016-08-12 12:36:12 +10:00
93b2c71544
providers/google: Add google_compute_image resource ( #7960 )
...
* providers/google: Add google_compute_image resource
This change introduces the google_compute_image resource, which allows
Terraform users to create a bootable VM image from a raw disk tarball
stored in Google Cloud Storage. The google_compute_image resource
may be referenced as a boot image for a google_compute_instance.
* providers/google: Support family property in google_compute_image
* provider/google: Idiomatic checking for presence of config val
* vendor: Update Google client libraries
2016-08-12 12:35:33 +10:00
6ff3df8552
Fix invalid reference in iam_policy_document document page. ( #8151 )
2016-08-12 12:34:27 +10:00
f8e4166bee
Update CHANGELOG.md
2016-08-12 12:24:21 +10:00
c072c0dfbb
#7013 add tls config support to consul provider ( #7015 )
...
* #7013 add tls config support to consul provider
* #7013 add acceptance tests
* #7013 use GFM tables
* #7013 require one of {CONSUL_ADDRESS,CONSUL_HTTP_ADDR} when running consul acc tests
2016-08-12 12:22:41 +10:00
45219dbb4f
Update CHANGELOG.md
2016-08-11 18:07:59 -04:00
ef9591952a
Merge pull request #8115 from nwwebb/import-autoscaler
...
provider/google: Support Import of 'google_compute_autoscaler'
2016-08-11 18:07:22 -04:00
82e2bd504b
Update CHANGELOG.md
2016-08-11 18:06:07 -04:00
ad4ca17f05
Merge pull request #8121 from nwwebb/import-http-health-check
...
provider/google: Support Import of 'google_resource_http_health_check'
2016-08-11 18:05:42 -04:00
6523ebd961
Update CHANGELOG.md
2016-08-11 18:04:25 -04:00
4d631d525b
Merge pull request #8122 from nwwebb/import-forwarding-rule
...
provider/google: Support Import of 'google_compute_forwarding_rule'
2016-08-11 18:04:06 -04:00
01fb6c79a7
Update CHANGELOG.md
2016-08-11 18:03:35 -04:00
baec60459f
Merge pull request #8133 from nwwebb/import-target-pool
...
provider/google: Support Import of 'google_compute_target_pool'
2016-08-11 18:02:33 -04:00
691bcda026
Update CHANGELOG.md
2016-08-12 07:52:37 +10:00
45c5675c8e
add Aurora instance failover priority feature ( #8087 )
...
* add Aurora instance failover priority feature
* promotion_tier move to input directly
* fix format issue
2016-08-12 07:51:25 +10:00
c9468efd9a
Merge pull request #8140 from hashicorp/d-aws-sdk-1.4.1
...
deps: github.com/aws/aws-sdk-go/... to v1.4.1
2016-08-11 13:13:06 -04:00
c38884912d
deps: github.com/aws/aws-sdk-go/... to v1.4.1
2016-08-11 13:01:51 -04:00
21d1ac41fa
Merge branch 'd-update-aws-sdk'
2016-08-11 12:52:35 -04:00
57c75dba7d
Merge #8139 : Remove some errant apostrophes in the docs
2016-08-11 09:37:59 -07:00
fd055b700d
apostrophe police
2016-08-11 09:34:00 -07:00
03bc37edcb
apostrophe police
...
Sorry, my OCD kicked in.
Use `it's` when you mean `it is`.
Use `its` when you mean something belongs to `it`.
2016-08-11 09:32:54 -07:00
1ff6f8ccf4
provider/google: Support Import of 'google_compute_target_pool'
2016-08-11 10:24:03 -04:00
97fcd5f4cc
Update CHANGELOG.md
2016-08-11 12:13:35 +01:00
69f8a03ddd
aws/docs: Fix a few nitpicks after merging #7794
2016-08-11 12:11:15 +01:00
78b4923f7d
Update CHANGELOG.md
2016-08-11 20:59:31 +10:00
ee9ebe849f
Support setting datacenter when using consul remote state ( #8102 )
...
* Support setting datacenter when using consul remote state
Change-Id: I8c03f4058e9373f0de8fde7ce291ec552321cc60
* Add documentation for setting datacenter when using consul remote state
Change-Id: Ia62feea7a910a76308f0a5e7f9505c9a210e0339
2016-08-11 22:58:20 +12:00
66a14cb3b7
provider/aws: Re-implement api gateway parameter handling ( #7794 )
...
* provider/aws: Re-implement api gateway parameter handling
this PR cleans up some left overs from PR #4295 , namely the parameter handling.
now that GH-2143 is finally closed this PR does away with the ugly
`request_parameters_in_json` and `response_parameters_in_json` hack.
* Add deprecation message and conflictsWith settings
following @radeksimko s advice, keeping the old code around with a deprecation
warning.
this should be cleaned up in a few releases
* provider/aws: fix missing append operation
* provider/aws: mark old parameters clearly as deprecated
* provider/aws work around #8104
following @radeksimko s lead
* provider/aws fix cnp error
2016-08-11 11:49:58 +01:00
d7285d1b14
provider/azurerm: fix; add tests for importing traffic manager resources ( #8111 )
...
* provider/azurerm: add test for importing traffic manager profile resource
TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManagerProfile_import -timeout 120m
=== RUN TestAccAzureRMTrafficManagerProfile_importBasic
--- PASS: TestAccAzureRMTrafficManagerProfile_importBasic (84.50s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/azurerm 84.722s
* provider/azurerm: fix; add test for importing traffic_manager_endpoint resource
TF_ACC=1 go test ./builtin/providers/azurerm -v -run TestAccAzureRMTrafficManagerEndpoint -timeout 120m
=== RUN TestAccAzureRMTrafficManagerEndpoint_importBasic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_importBasic (130.66s)
=== RUN TestAccAzureRMTrafficManagerEndpoint_basic
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basic (152.87s)
=== RUN TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal
--- PASS: TestAccAzureRMTrafficManagerEndpoint_basicDisableExternal (151.55s)
=== RUN TestAccAzureRMTrafficManagerEndpoint_updateWeight
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updateWeight (199.33s)
=== RUN TestAccAzureRMTrafficManagerEndpoint_updatePriority
--- PASS: TestAccAzureRMTrafficManagerEndpoint_updatePriority (113.15s)
=== RUN TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints
--- PASS: TestAccAzureRMTrafficManagerEndpoint_nestedEndpoints (97.05s)
PASS
ok github.com/hashicorp/terraform/builtin/providers/azurerm 844.740s
2016-08-11 16:00:23 +12:00
605dfada51
Update CHANGELOG.md
2016-08-11 15:20:06 +12:00
313ec1252c
Merge branch 'master' of github.com:hashicorp/terraform
2016-08-11 15:15:51 +12:00
c95bf296d4
Merge branch 'Ticketmaster-5637-conflict-resolution'
2016-08-11 15:15:34 +12:00
ec3e442f26
provider/aws: change the test to be us-west-2a
2016-08-11 15:15:23 +12:00
cdda4d76d4
Merge branch '5637-conflict-resolution' of https://github.com/Ticketmaster/terraform into Ticketmaster-5637-conflict-resolution
2016-08-11 11:23:04 +12:00
a1a501a26a
Merge pull request #8053 from hashicorp/jbardin/atlas-retry-policy
...
don't retry the atlas requests with the wrong cert
2016-08-10 17:09:00 -04:00
ea2e875ea1
Merge pull request #8081 from hashicorp/jbardin/input-hcl
...
Allow the HCL input when prompted
2016-08-10 17:08:52 -04:00
b45650c390
provider/google: Support Import of 'google_compute_forwarding_rule'
2016-08-10 16:45:56 -04:00
c9de6a4173
provider/aws: Change a few policy test docs to use heredoc format, to prevent regressions ( #8118 )
2016-08-10 15:34:38 -05:00
James Nugent