Commit Graph

18359 Commits

Author SHA1 Message Date
Scott Nowicki f635bbd031 updated build dir 2017-04-26 20:48:45 -05:00
Scott Nowicki 1ce99f6929 added deployment script for mac; ensured managed disks are being used 2017-04-26 14:53:15 -05:00
Scott Nowicki 3a77aafe49 merge upstream 2017-04-24 19:40:17 -05:00
Scott Nowicki 5d4e0490ae Merge branch 'master' of github.com:harijayms/terraform 2017-04-24 18:33:27 -05:00
Jay Wang 537d3333ff Merge remote-tracking branch 'upstream/master' 2017-04-24 14:28:58 -07:00
Seth Vargo 6daef74e9b Merge pull request #13917 from hashicorp/sethvargo-patch-1
Document that random_pet is referenced by id
2017-04-24 16:40:30 -04:00
Paul Stack 6e6c5368d2 Update CHANGELOG.md 2017-04-24 23:40:12 +03:00
Paul Stack 1eeb3c41e3 provider/aws: Allow AWS Subnet to change IPv6 CIDR Block without ForceNew (#13909)
Fixes: #13588

It was pointed out in #13588 that we don't need to ForceNew on a change
of IPv6 CIDR block. The logic I decided to implement here was to
disassociate then associate. We should only be able to be associated to
1 IPv6 CIDR block at once. This feels like a risky move. We can
disassociate and then error on the associate. This would leave us in a
situation where we have no IPv6 CIDR block associated

The alternative here would be that the failure of association, triggers
a reassociation with the old IPv6 CIDR block

I added a test to make sure that the subnet Ids don't change as the ipv6
block changes. Before removing the ForceNew from the ipv6_cidr_block,
the test results in the following:

```
=== RUN   TestAccAWSSubnet_ipv6
--- FAIL: TestAccAWSSubnet_ipv6 (92.09s)
	resource_aws_subnet_test.go:105: Expected SubnetIDs not to change, but both got before: subnet-0d2b6a6a and after: subnet-742c6d13
```

After the removal of ForceNew, the test result looks as follows:

```
=== RUN   TestAccAWSSubnet_ipv6
--- PASS: TestAccAWSSubnet_ipv6 (188.34s)
```

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSubnet_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/24 21:26:36 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSubnet_ -timeout 120m
=== RUN   TestAccAWSSubnet_importBasic
--- PASS: TestAccAWSSubnet_importBasic (85.63s)
=== RUN   TestAccAWSSubnet_basic
--- PASS: TestAccAWSSubnet_basic (80.28s)
=== RUN   TestAccAWSSubnet_ipv6
--- PASS: TestAccAWSSubnet_ipv6 (188.34s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	354.283s
```
2017-04-24 23:39:28 +03:00
Seth Vargo b64c9a73cc Document that random_pet is referenced by id 2017-04-24 16:38:23 -04:00
Scott Nowicki f2ba2a3088 Merge branch 'master' of github.com:harijayms/terraform 2017-04-24 15:31:33 -05:00
Radek Simko e079e5fa28 Update CHANGELOG.md 2017-04-24 21:22:55 +01:00
Radek Simko d4dafbe0da Merge pull request #13766 from hashicorp/b-aws-waf-ipset-fix
provider/aws: Fix WAF IPSet descriptors removal on update
2017-04-24 22:21:57 +02:00
Scott Nowicki 2362bd7e8f merge upstream 2017-04-24 15:02:59 -05:00
Scott Nowicki afb164b79a Topic 101 vm simple linux (#1)
* added .travis.yml and deploy.sh
* added deploy script, updated travis.yml to build topic- branches
* generate random string for hostname
* plan now produces output plan, apply now consumes outputted plan
* cleanup; sane defaults
* explicit build dirs
2017-04-24 14:57:28 -05:00
Radek Simko f33afb7e4e
provider/aws: Support IPSets with 0 descriptors 2017-04-24 21:53:25 +02:00
Radek Simko 01aa3fd76a
provider/aws: Fix WAF IPSet descriptors removal on update 2017-04-24 21:53:25 +02:00
anniehedgpeth e4b1cf7f91 Merge branch 'topic-101-vm-simple-linux' of https://github.com/10thmagnitude/terraform into topic-101-vm-simple-linux 2017-04-24 14:39:47 -05:00
anniehedgpeth 5850bc8cf9 azuredeploy.tf to main.tf in README 2017-04-24 14:38:14 -05:00
Scott Nowicki 942c23a554 Merge branch 'master' into topic-101-vm-simple-linux 2017-04-24 14:35:48 -05:00
Radek Simko 2db0e12e63 Update CHANGELOG.md 2017-04-24 20:47:57 +02:00
Radek Simko cda84b1674 provider/aws: Expose invoke ARN from Lambda function (for APIG) (#13890) 2017-04-24 20:47:11 +02:00
Radek Simko 28851ef5d9 Update CHANGELOG.md 2017-04-24 20:46:39 +02:00
Radek Simko 3c2a40a192 provider/aws: Expose execution ARN + invoke URL for APIG deployment (#13889) 2017-04-24 20:43:56 +02:00
Scott Nowicki 938402edba bad syntax 2017-04-24 13:43:38 -05:00
Julien Pivotto 61d183eded provider/digitaocean: Test that droplets are indempotent (#13883)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2017-04-24 21:43:27 +03:00
Scott Nowicki 441b86ac86 explicit build dirs 2017-04-24 13:40:07 -05:00
Scott Nowicki 679aa2e014 run script in wrong dir 2017-04-24 13:30:03 -05:00
Scott Nowicki fcffe2d82b easier to export in before_deploy block 2017-04-24 13:27:00 -05:00
Scott Nowicki d4ea91a029 removal of extra cd 2017-04-24 13:14:02 -05:00
Scott Nowicki d0e8c2816c fixed travis cfg 2017-04-24 13:09:53 -05:00
Radek Simko b7bdd550ac Update CHANGELOG.md 2017-04-24 20:06:55 +02:00
Radek Simko 5681a47260 Merge pull request #13878 from hashicorp/f-core-computed-fields-validation
helper/schema: Disallow validation+diff suppression on computed fields
2017-04-24 20:04:28 +02:00
Scott Nowicki 986b0682ea travis syntax changes 2017-04-24 12:50:47 -05:00
Scott Nowicki 9232165e20 rename; and execute perms 2017-04-24 12:22:54 -05:00
Paul Stack 7d6d524945 Update CHANGELOG.md 2017-04-24 20:21:02 +03:00
Paul Stack 1d350ed5ef provider/aws: Adding support for ipv6 to aws_subnets needs migration (#13876)
Fixes: #13829

When IPv6 support was added to subnets, we added a new parameter that
had a default value. This means that users are experiencing unexpected
changes in their configuration

We need a schema migration in place to make sure this isn't the case for
the users who have not upgraded yet

```
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/04/23 10:36:43 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAWSSubnetMigrateState -timeout 120m
=== RUN   TestAWSSubnetMigrateState
2017/04/23 10:37:27 [INFO] Found AWS Subnet State v0; migrating to v1
2017/04/23 10:37:27 [DEBUG] Attributes before migration: map[string]string{}
2017/04/23 10:37:27 [DEBUG] Attributes after migration: map[string]string{"assign_ipv6_address_on_creation":"false"}
--- PASS: TestAWSSubnetMigrateState (0.00s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	0.021s
```
2017-04-24 18:20:32 +01:00
Andy Lindeman 46fd77bbed Clears branch protection from state only if error is an HTTP 404 (#13887) 2017-04-24 18:19:27 +01:00
Scott Nowicki ccfdc3c6c3 branch restrictions 2017-04-24 12:17:22 -05:00
Scott Nowicki 02952cac6f cleanup/reorg 2017-04-24 12:14:07 -05:00
Scott Nowicki 3e498199e9 fixed broken syntax for travis 2017-04-24 12:02:06 -05:00
Scott Nowicki 9a7e42459b cleanup; sane defaults 2017-04-24 11:45:24 -05:00
clint shryock fe15c68aa9 provider/aws: Fix-up TestAccAWSIAMInstanceProfile_missingRoleThrowsError
A change in the error produced by the resource was causing the regex to
fail
2017-04-24 10:24:34 -05:00
Tom Harvey 1206ab9865 Updating to include #13899 2017-04-24 16:19:02 +01:00
Tom Harvey a7401ad354 Merge pull request #13899 from hashicorp/azurerm-redis-bug
provider/azurerm: fixing a bug refreshing the `azurerm_redis_cache`
2017-04-24 16:17:00 +01:00
tombuildsstuff 04bf00f0c6 Comment explaning why we can have deleted resources in the state 2017-04-24 15:35:59 +01:00
Scott Nowicki 277683833e cleanup 2017-04-24 09:23:15 -05:00
Tom Harvey 9b5055112a provider/azurerm: Updating the Redis Documentation (#13893)
* Updating the Redis documentation to better match the Azure docs

* Updating the docs to use a C2 instance, to make it clearer
2017-04-24 15:22:51 +01:00
Jake Champlin 4239c6a441 Update CHANGELOG.md 2017-04-24 09:13:39 -04:00
Jake Champlin 78bc9ed09d Merge pull request #13861 from hashicorp/pr-10594
provider/aws: Adds aws_network_interface_attachment resource
2017-04-24 09:12:38 -04:00
tombuildsstuff 8e58be37c7 Ensuring the Redis instance exists. Fixes #13896 2017-04-24 11:38:47 +01:00