Commit Graph

12110 Commits

Author SHA1 Message Date
stack72
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
James Bardin
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
James Bardin
ea2e875ea1 Merge pull request #8081 from hashicorp/jbardin/input-hcl
Allow the HCL input when prompted
2016-08-10 17:08:52 -04:00
Noah Webb
b45650c390 provider/google: Support Import of 'google_compute_forwarding_rule' 2016-08-10 16:45:56 -04:00
Clint
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 Bardin
c48a1423a1 Collapse nested if with an && 2016-08-10 16:34:21 -04:00
Kraig Amador
742089f10c Fixing the certs, test now passes 2016-08-10 13:31:36 -07:00
Noah Webb
3fb6287027 provider/google: Support Import of 'google_resource_http_health_check' 2016-08-10 16:30:41 -04:00
Noah Webb
f55532b018 provider/google: Support Import of 'google_compute_autoscaler' 2016-08-10 16:19:31 -04:00
ldanz
8bba3d4e6e Documentation: explain the role of to_port in a security group rule when protocol is "icmp" (#8093) 2016-08-10 14:32:18 -05:00
Aaron Welch
c5b15da76d gofmt! 2016-08-10 12:11:04 -07:00
Aaron Welch
58103a0df9 remove ip stuff for now 2016-08-10 11:55:49 -07:00
Aaron Welch
3430afb8a5 remove IP stuff for now 2016-08-10 11:51:09 -07:00
Aaron Welch
d60cf4d777 update acceptance tests for packet volume, update packngo api client 2016-08-10 11:37:17 -07:00
James Bardin
df0c795b39 Don't retry the atlas requests with the wrong cert
This probably won't recover, so abort immediately.
Requires retryablehttp CheckRetry patch.
2016-08-10 13:45:30 -04:00
James Bardin
ee6159cd9d update github.com/hashicorp/go-retryablehttp 2016-08-10 13:45:29 -04:00
Radek Simko
d1272808d8
aws/docs: Document new skip_* fields 2016-08-10 17:30:49 +01:00
Radek Simko
0e1bccafed
aws: Let acc ID validation fail when we have no ID
- we could've had ConflictsWith between affected fields, but that would make it fail even if skip_requesting_account_id=false and ConflictsWhen is not a thing (yet)
2016-08-10 17:30:49 +01:00
Clint
3fc119923e Revert "provider/aws: Added the ability to import aws_iam_role's" (#8112) 2016-08-10 11:18:03 -05:00
Radek Simko
0ab3bc4105
aws: Change field names + desc according to reality
- skip_iam_creds_validation => skip_credentials_validation
 - skip_iam_account_id => skip_requesting_account_id
2016-08-10 16:46:05 +01:00
James Bardin
d6c8b40201 unify some of the test code
Have all the values in the testDiffFn go through the same code path
2016-08-10 11:37:55 -04:00
James Bardin
2e5791ab2b Allow the HCL input when prompted
We already accept HCL encoded input for -vars, and this expands that to
accept HCL when prompted for a value on the command line as well.
2016-08-10 11:14:31 -04:00
Joe Topjian
5d9fa90005 Update CHANGELOG.md 2016-08-10 09:04:40 -06:00
Joe Topjian
38f0e62430 Merge pull request #8070 from fatmcgav/openstack_router_update_external_gw
provider/openstack: Add support for updating the External GW assigned to a Neutron router
2016-08-10 09:03:52 -06:00
Joe Topjian
59cab2f198 Merge pull request #8101 from GiovanniPaoloGibilisco/master
provider/openstack: add acceptance test for Issue #8040
2016-08-10 08:55:58 -06:00
Joe Topjian
1c09918191 provider/openstack: Fixing acc test for external gw update 2016-08-10 15:54:31 +01:00
Gavin Williams
b9eaa23f60 Add support for updating the External Gateway assigned to a Neutron router.
Added a simple acceptance test, but doesn't work.
2016-08-10 15:54:31 +01:00
Radek Simko
2073e80c66
aws/config: Shortened conditions [cleanup] 2016-08-10 15:25:16 +01:00
Radek Simko
b98e5f2073 Update CHANGELOG.md 2016-08-10 15:12:47 +01:00
Renier Morales
c2bcb5fbe5 Skip IAM/STS validation and metadata check (#7874)
* Skip IAM/STS validation and metadata check

* Skip IAM/STS identity validation - For environments or other api
  implementations where there are no IAM/STS endpoints available, this
  option lets you opt out from that provider initialization step.
* Skip metdata api check - For environments in which you know ahead of
  time there isn't going to be a metadta api endpoint, this option lets
  you opt out from that check to save time.

* Allow iam/sts initialization even if skipping account/cred validation

(#7874)

* Split out skip of IAM validation into credentials and account id

(#7874)
2016-08-10 15:10:34 +01:00
Giovanni Paolo Gibilisco
7bb7508c86 Merge branch 'master' of https://github.com/GiovanniPaoloGibilisco/terraform 2016-08-10 14:10:29 +02:00
Giovanni Paolo Gibilisco
ba42737e26 add acceptance test for issue #8040 2016-08-10 12:35:53 +02:00
Paul Stack
6b477e888a Update CHANGELOG.md 2016-08-10 16:07:32 +12:00
Krzysztof Wilczynski
f5b46b80e7 Add ability to set canned ACL in aws_s3_bucket_object. (#8091)
An S3 Bucket owner may wish to set a canned ACL (as opposite to explicitly set
grantees, etc.) for an object. This commit adds an optional "acl" attribute to
the aws_s3_bucket_object resource so that the owner of the S3 bucket can
specify an appropriate pre-defined ACL to use when creating an object.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-10 16:05:39 +12:00
f440
a82f96f939 Fix invalid markdown syntax (#8089) 2016-08-10 13:16:31 +12:00
Kraig Amador
6c2949fdac Added aws_iam_role import. Now that we read the assume_role_policy it highlights all of the tests that change this, so I've fixed a bunch of those while i'm in here. (#7617) 2016-08-10 12:16:59 +12:00
Paul Stack
25f1c6dc02 Update CHANGELOG.md 2016-08-10 12:07:46 +12:00
Chris Marchesi
41c23b2f04 provider/aws: Various IAM policy normalizations for IAM data source (#6956)
* Various string slices are sorted and truncated to strings if they
   only contain one element.
 * Sids are now included if they are empty.

This is to ensure what is sent to AWS matches what comes back, to
prevent recurring diffs even when the policy has changed.
2016-08-10 12:06:38 +12:00
Paul Stack
8925235ef1 Update CHANGELOG.md 2016-08-10 11:06:01 +12:00
Krzysztof Wilczynski
92d75b263c Add ability to set Requests Payer in aws_s3_bucket. (#8065)
Any S3 Bucket owner may wish to share data but not incur charges associated
with others accessing the data. This commit adds an optional "request_payer"
attribute to the aws_s3_bucket resource so that the owner of the S3 bucket can
specify who should bear the cost of Amazon S3 data transfer.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-10 11:01:17 +12:00
Mosley, Franklin
4d55b8e9ea Corrected printf verb of wrong type
Corrected printf verb by changing it from a string type to an int type.
2016-08-09 15:29:50 -07:00
Mosley, Franklin
6d7933b41a Added tests for expandPolicyAttributes/flattenPolicyAttributes 2016-08-09 15:29:50 -07:00
Mosley, Franklin
eb0cd14f41 Changed attribute argument to be optional.
Changed the `attribute` argument of the resource to be optional vs.
required.
2016-08-09 15:29:50 -07:00
Mosley, Franklin
8a24dd8efe Added resource documentation.
Updated the Terraform documentation to add a new page, and a link in
the sidebar, for the aws_lb_ssl_negotiation_policy resource.
2016-08-09 15:29:50 -07:00
Mosley, Franklin
a6de088375 Add new resource aws_lb_ssl_negotiation_policy
Added new resource to create an AWS ELB SSL negotiation policy, and an
acceptance test.
2016-08-09 15:29:13 -07:00
James Nugent
f18e2546b3 Merge pull request #8080 from hashicorp/docs-mapkeys
docs: Fix map key interpolation documentation
2016-08-09 16:12:05 -04:00
James Nugent
9fa978a45f docs: Fix map key interpolation documentation
Previously was recommending the now-invalid dot syntax for map keys,
change to using HIL indexing.
2016-08-09 16:03:05 -04:00
Clint
e4f1d879d9 Update CHANGELOG.md 2016-08-09 14:19:58 -05:00
Clint
22684200b5 provider/aws: Fix line ending errors/diffs with IAM Server Certs (#8074)
* provider/aws: Failing IAM Server Cert test with windows line endings

* provider/aws: Fix IAM Server Cert issue with line encodings
2016-08-09 14:19:12 -05:00
James Nugent
e181d753fe build: Fix ordering of plugin list 2016-08-09 15:03:24 -04:00