Commit Graph

11721 Commits

Author SHA1 Message Date
James Bardin a51a2c1426 Merge pull request #8008 from hashicorp/jbardin/access_token
Don't send access_token in request params
2016-08-05 12:52:28 -04:00
James Bardin 0a3714eaac Don't send access_token in request params
Always send the access_token in the X-Atlas-Token header.
2016-08-05 11:44:14 -04:00
Martin Atkins 00effbe57b Merge pull request #8004 from swestcott/master
Corrected AWS env variable in docs
2016-08-05 07:58:41 -07:00
Simon Westcott 16f2ec2915 Merge branch 'master' of github.com:hashicorp/terraform 2016-08-05 14:02:21 +01:00
Simon Westcott c990e38601 Correct AWS secret key variable name 2016-08-05 14:01:28 +01:00
James Bardin 1322aaf473 Merge pull request #7989 from hashicorp/jbardin/tf_push
Override atlas variables even if they aren't local
2016-08-05 08:43:51 -04:00
Radek Simko 4c6e0d94f9 Update CHANGELOG.md 2016-08-05 09:46:44 +01:00
Paul Stack 6899246b98 provider/aws: Updates `aws_cloudformation_stack` Update timeout (#7997)
Fixes #7996

The Create func was using the timeout that we were passing to the
resource. Update func was not.

```
% make testacc TEST=./builtin/providers/aws
% TESTARGS='-run=TestAccAWSCloudFormation_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v
-run=TestAccAWSCloudFormation_ -timeout 120m
=== RUN   TestAccAWSCloudFormation_basic
--- PASS: TestAccAWSCloudFormation_basic (120.61s)
=== RUN   TestAccAWSCloudFormation_defaultParams
--- PASS: TestAccAWSCloudFormation_defaultParams (121.40s)
=== RUN   TestAccAWSCloudFormation_allAttributes
--- PASS: TestAccAWSCloudFormation_allAttributes (263.29s)
=== RUN   TestAccAWSCloudFormation_withParams
--- PASS: TestAccAWSCloudFormation_withParams (205.52s)
=== RUN   TestAccAWSCloudFormation_withUrl_withParams
--- PASS: TestAccAWSCloudFormation_withUrl_withParams (402.71s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws
1113.552s
```
2016-08-05 09:44:10 +01:00
Radek Simko fa2d6e35a7 Update CHANGELOG.md 2016-08-05 09:01:41 +01:00
Paul Stack 744b266995 provider/aws: Support `aws_elasticsearch_domain` upgrades to (#7860)
`elasticsearch_version` 2.3

Fixes #7836
This will allow ElasticSearch domains to be deployed with version 2.3 of
ElasticSearch

The other slight modifications are to stop dereferencing values before
passing to d.Set in the Read func. It is safer to pass the pointer to
d.Set and allow that to dereference if there is a value

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSElasticSearchDomain_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSElasticSearchDomain_ -timeout 120m
=== RUN   TestAccAWSElasticSearchDomain_basic
--- PASS: TestAccAWSElasticSearchDomain_basic (1611.74s)
=== RUN   TestAccAWSElasticSearchDomain_v23
--- PASS: TestAccAWSElasticSearchDomain_v23 (1898.80s)
=== RUN   TestAccAWSElasticSearchDomain_complex
--- PASS: TestAccAWSElasticSearchDomain_complex (1802.44s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	5313.006s
```

Update resource_aws_elasticsearch_domain.go
2016-08-05 08:59:15 +01:00
Raphael Randschau 7630a585a2 Improve influxdb provider (#7333)
* Improve influxdb provider

- reduce public funcs. We should not make things public that don't need to be public
- improve tests by verifying remote state
- add influxdb_user resource

    allows you to manage influxdb users:

    ```
    resource "influxdb_user" "admin" {
      name = "administrator"
      password = "super-secret"
      admin = true
    }
    ```

    and also database specific grants:

    ```
    resource "influxdb_user" "ro" {
      name = "read-only"
      password = "read-only"

      grant {
        database = "a"
        privilege = "read"
      }
    }
    ```

* Grant/ revoke admin access properly

* Add continuous_query resource

see
https://docs.influxdata.com/influxdb/v0.13/query_language/continuous_queries/
for the details about continuous queries:

```
resource "influxdb_database" "test" {
    name = "terraform-test"
}

resource "influxdb_continuous_query" "minnie" {
    name = "minnie"
    database = "${influxdb_database.test.name}"
    query = "SELECT min(mouse) INTO min_mouse FROM zoo GROUP BY time(30m)"
}
```
2016-08-05 16:27:03 +10:00
Paul Stack 6c057c8c11 Update CHANGELOG.md 2016-08-05 16:13:22 +10:00
Radek Simko ebf6e51b32 provider/aws: Retry association of IAM Role & instance profile (#7938) 2016-08-05 16:12:27 +10:00
Paul Stack 3982495723 Update CHANGELOG.md 2016-08-05 13:06:24 +10:00
Krzysztof Wilczynski 99d8c2a3b3 Fix. Handle lack of snapshot ID for a volume. (#7995)
This commit resolves the issue where lack of snapshot ID in the device mapping
section of the API response to DescribeImagesResponse would cause Terraform to
crash due to a nil pointer dereference. Usually, the snapshot ID is included,
but in some unique cases (e.g. ECS-enabled AMI from Amazon available on the
Market Place) a volume that is attached might not have it.

The API documentation does not clearly define whether the snapshot ID either
should be or must be included for any volume in the response.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-05 13:04:57 +10:00
Evan Brown 701cd2032e Merge pull request #7991 from evandbrown/google-instance-custom-service-account
providers/google: Allow custom Compute Engine service account
2016-08-04 19:32:24 -07:00
Evan Brown 0e565e5973 providers/google: Allow custom Compute Engine service account
This commit allows an operator to specify the e-mail address of a service
account to use with a Google Compute Engine instance. If no service account
e-mail is provided, the default service account is used.

Closes #7985
2016-08-04 19:25:28 -07:00
Paul Stack e7f31ebfd8 docs/aws: Add and as docs to the AWS resource (#7988) 2016-08-05 10:38:00 +10:00
stack72 25a860e990
docs/aws: Adding to the docs side bar 2016-08-05 10:36:10 +10:00
Paul Stack e8dbd0e1ae Update CHANGELOG.md 2016-08-05 10:15:29 +10:00
Krzysztof Wilczynski 19800b8e26 Add state filter to aws_availability_zones data source. (#7965)
* Add state filter to aws_availability_zones data source.

This commit adds an ability to filter Availability Zones based on state, where
by default it would only list available zones.

Be advised that this does not always works reliably for an older accounts which
have been created in the pre-VPC era of EC2. These accounts tends to retrieve
availability zones that are not VPC-enabled, thus creation of a custom subnet
within such Availability Zone would result in a failure.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

* Update documentation for aws_availability_zones data source.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

* Do not filter on state by default.

This commit makes the state filter applicable only when set.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-05 10:14:05 +10:00
James Bardin 256190a84c Merge pull request #7977 from hashicorp/jbardin/ZD-1438
numeric variables aren't always interpreted as str
2016-08-04 17:28:29 -04:00
James Bardin 67bd4f29e0 Override atlas variables even if they aren't local
Some Atlas usage patterns expect to be able to override a variable set
in Atlas, even if it's not seen in the local context. This allows
overwriting a variable that is returned from atlas, and sends it back.

Also use a unique sential value in the context where we have variables
from atlas. This way atals variables aren't combined with the local
variables, and we don't do something like inadvertantly change the type,
double encode/escape, etc.
2016-08-04 17:26:41 -04:00
James Bardin d5fbb5f5c0 Modify the tfvars test to also use a cli var
Modify the test to demonstrate where cli vars were being lost because
they weren't interpreted as strings.
2016-08-04 17:19:02 -04:00
James Bardin 9d0faa2cae Strip off extra \n in hcl encoded variables
They don't change the value, but they do currently end up in the UI
2016-08-04 17:18:43 -04:00
Lars Wander f75c3a9459 Update CHANGELOG.md 2016-08-04 16:56:18 -04:00
Lars Wander 953e2ec565 Merge pull request #7029 from igorwwwwwwwwwwwwwwwwwwww/google-instance-wait-project
provider/google: Use resource-specific project when waiting for creation, instead of global
2016-08-04 16:54:30 -04:00
James Bardin 9b4a6ee71d Merge pull request #7979 from hashicorp/jbardin/copystructure
update github.com/mitchellh/copystructure
2016-08-04 16:33:05 -04:00
Paul Stack 2b743915fd Update CHANGELOG.md 2016-08-05 05:29:57 +10:00
Dan Allegood ed77105822 Improved SCSI controller handling (#7908)
Govmomi tries to use the 7th slot in a scsi controller, which is not
allowed. This patch will appropriately select the slot to attach a disk
to as well as determine if a scsi controller is full.
2016-08-05 05:29:02 +10:00
Paul Stack f140724ee6 Update CHANGELOG.md 2016-08-05 05:27:53 +10:00
Raphael Randschau 582e3bd883 provider/aws: guard against missing digestSha 7956 (#7966) 2016-08-05 05:26:43 +10:00
James Bardin 403d97183e update github.com/mitchellh/copystructure
Patched a panic where copystructure tries to set an unexported struct
field.
2016-08-04 11:23:59 -04:00
James Bardin bf83b435e1 numeric variables aren't always interpreted as str
If we have a number value in our config variables, format it as a
string, and send it with the HCL=true flag just in case.

Also use %g for for float encoding, as the output is a generally a
little friendlier.
2016-08-04 11:19:26 -04:00
Radek Simko 98d8440711 docs/aws: Fix ordering of data sources (#7970) 2016-08-04 09:40:45 +01:00
Sam Stavinoha a0fc4276ba remove duplicate 'recipients' argument (#7968) 2016-08-04 07:47:12 +01:00
Evan Brown 89df636163 Merge pull request #7852 from gaker/google-provider-backend-cdn
google_compute_backend_service "enable_cdn"
2016-08-03 20:11:54 -07:00
James Nugent 4b6eea8593 Merge pull request #7945 from kylewest/patch-1
fix awkward wording of atlas token generation
2016-08-03 14:26:22 -07:00
James Nugent b33871d966 Merge pull request #7954 from ehmo/patch-1
typo
2016-08-03 14:25:37 -07:00
Rasty Turek 96d88f1714 typo 2016-08-03 13:44:52 -07:00
Krzysztof Wilczynski ec7ff802b6 Fix link to the remote state link post 0.7.x. (#7946)
* Fix link to the remote state link post 0.7.x.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

* Correct "resource" to "data source".

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-08-03 19:45:14 +01:00
Cecchi MacNaughton 8d9a9ddebe Correct typo in `length()` documentation (#7947) 2016-08-03 18:48:00 +01:00
Kyle West c584287cf9 fix awkward wording of atlas token generation
Too many "to"s (and other prepositions) made this hard to skim.
2016-08-03 10:54:25 -04:00
James Nugent 5320a54831 Merge pull request #7944 from grayaii/master
Increase timeout yet again for aws elasticsearch resource
2016-08-03 07:49:31 -07:00
grayaii cb5062d237 Increase timeout yet again for aws elasticsearch resource
We create hundreds of AWS Elasticsearch resources over the last few months and we get occasional timeout failures from AWS.  This will PR is to increase the timeout once again. I did it before:
https://github.com/hashicorp/terraform/pull/5910/files
But we've seen enough timeouts from AWS on this resource that increasing the timeout seems like the only solution.
2016-08-03 16:39:28 +02:00
James Nugent c34cfec14a Merge pull request #7933 from hashicorp/resource-import-list
website/docs: Adding a list of resources that are available to import now
2016-08-03 07:16:56 -07:00
James Nugent 581f23dfa0 docs: Tidy up importabable resources list 2016-08-03 07:15:26 -07:00
James Nugent 7fa0f24c9d Merge pull request #7940 from jasonamyers/patch-1
Update ecs_task_definition.html.markdown
2016-08-03 07:11:10 -07:00
Martin Atkins 5f85d3f4c4 Merge #7941: Fix terraform_remote_state documentation 2016-08-03 06:52:50 -07:00
Dan Webb 8e6dd97eba Fix terraform_remote_state documentation
Fixing minor typo to match documentation on https://www.terraform.io/docs/providers/terraform/d/remote_state.html
2016-08-03 14:07:57 +01:00