Commit Graph

4271 Commits

Author SHA1 Message Date
Paul Hinze ff224dec13 Merge pull request #1599 from hashicorp/1554-docker-network-settings
[repack] "Add docker container network settings to output attribute #1554"
2015-04-20 15:29:45 -05:00
Paul Hinze d55c8d8404 provider/docker: fmt on container resource 2015-04-20 14:18:46 -05:00
Paul Hinze aada41aa55 docs: provider/docker - network settings attrs 2015-04-20 12:45:58 -05:00
Paul Hinze 3ded884d95 provider/docker: guard against nil NetworkSettings 2015-04-20 12:42:36 -05:00
Stephan Epping c2319da1aa Add docker container network settings to output attribute 2015-04-20 12:41:35 -05:00
Mitchell Hashimoto 97482f8b0c update CHANGELOG 2015-04-20 10:25:55 -07:00
Mitchell Hashimoto 15c190787d Merge pull request #1590 from hashicorp/b-bad-var-default
terraform: don't panic on input for bad default type [GH-1344]
2015-04-20 10:24:49 -07:00
Mitchell Hashimoto ccd14a6fcc Merge pull request #1588 from hashicorp/b-par-prov
helper/ssh: add random number to upload path for script [GH-1545]
2015-04-20 10:22:33 -07:00
Mitchell Hashimoto 1c0f2f136c provider/aws: fix vet error, missing fmt param 2015-04-19 18:13:04 -07:00
Mitchell Hashimoto 9f5fd24b85 update CHANGELOG 2015-04-19 18:10:52 -07:00
Mitchell Hashimoto dda4ae6d12 Merge pull request #1555 from fatih/fix-eip-panic
providers/aws: check allocationId only if it's vpc, fixes #1345
2015-04-19 18:10:31 -07:00
Mitchell Hashimoto 20155d0318 update CHANGELOG 2015-04-18 16:41:44 -07:00
Mitchell Hashimoto 2acc9b2e44 Merge pull request #1564 from nickryand/docker_links
Added Docker links support to the docker_container resource.
2015-04-18 16:41:17 -07:00
Mitchell Hashimoto ff22e514ca update CHANGELOG 2015-04-18 16:40:37 -07:00
Mitchell Hashimoto 283a3af693 Merge pull request #1576 from bitglue/s3_refresh
provider/aws: refresh state for deleted s3 bucket correctly
2015-04-18 16:40:12 -07:00
Mitchell Hashimoto 7a1592ff1e terraform: don't panic on input for bad default type [GH-1344] 2015-04-18 16:31:21 -07:00
Mitchell Hashimoto de8666a5fa helper/ssh: add random number to script [GH-1545] 2015-04-18 16:09:08 -07:00
Clint 897e0f1e45 Merge pull request #1583 from TimeIncOSS/fix_deprecated_sg_assoc
Bugfix: Allow using deprecated security_groups in NI spec
2015-04-17 15:40:42 -05:00
Radek Simko 009514f0d3 Allow using deprecated security_groups in NI spec 2015-04-17 21:26:17 +01:00
Clint d9e8c112ae Merge pull request #1580 from hashicorp/b-aws-elb-fix-tags
provider/aws: Fix issue when creating ELB with no tags
2015-04-17 14:18:45 -05:00
Clint Shryock eda987dcfb provider/aws: Fix issue when creating ELB with no tags 2015-04-17 14:00:27 -05:00
Phil Frost 47e1ec85f1 Refresh state for deleted s3 bucket correctly
If reading an S3 bucket's state, and that bucket has been deleted, don't
fail with a 404 error. Instead, update the state to reflect that the
bucket does not exist. Fixes #1574.
2015-04-17 13:30:31 -04:00
Paul Hinze e3a6fab501 Merge pull request #1566 from hashicorp/f-prevent-destroy
core: add prevent_destroy lifecycle flag
2015-04-17 11:01:19 -05:00
Paul Hinze afe4abb637 core: add prevent_destroy lifecycle flag
When the `prevent_destroy` flag is set on a resource, any plan that
would destroy that resource instead returns an error. This has the
effect of preventing the resource from being unexpectedly destroyed by
Terraform until the flag is removed from the config.
2015-04-17 10:40:04 -05:00
Mitchell Hashimoto 8f8e93e657 Merge pull request #1572 from jschneiderhan/patch-1
Escape $GOPATH in Vagrantfile
2015-04-17 08:04:11 -07:00
Clint 0d1540d448 Merge pull request #1565 from hashicorp/f-aws-upstream-cleanup
F aws upstream cleanup
2015-04-17 08:55:11 -05:00
Jon-Erik Schneiderhan 2515f44717 Update GOPATH usage in Vagrantfile
I think there is a missing escape in the Vagrantfile. Inside the VM I had to fix the /etc/profile.d/gopath.sh because it's contents were:

```
export GOPATH="/opt/gopath"
export PATH="/opt/go/bin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
```

BTW having a way to spin up a dev VM so easily made it a breeze to get hacking on Terraform! Great idea!
2015-04-17 09:39:31 -04:00
Paul Hinze 66edd78e64 Update CHANGELOG.md 2015-04-17 08:36:52 -05:00
Paul Hinze 851f34b2fb Merge pull request #1569 from hashicorp/f-tilde-file-provisioner
provisioner/file: expand ~ in source
2015-04-17 08:22:02 -05:00
Paul Hinze 3f66e480cc provisioner/file: expand ~ in source
closes #1559

tested manually, since a unit test would be sort of annoying to write.
:)
2015-04-16 18:53:04 -05:00
Paul Hinze a6325ad18c Merge pull request #1547 from sparkprime/user-agent
Add a UserAgent with version temporarily set to 0.0.0
2015-04-16 16:57:10 -05:00
Clint Shryock d27a41746c clean up tags sdk lib 2015-04-16 15:31:40 -05:00
Clint Shryock 3e6822ce08 more cleans ups of SDK reference 2015-04-16 15:28:18 -05:00
Clint Shryock 79fc8223bb consolidate structure.go 2015-04-16 15:18:01 -05:00
Clint Shryock ba43b7c963 mass search-replace of ec2SDKconn 2015-04-16 15:05:55 -05:00
Clint Shryock 331f6705b8 providers/aws: cleanup of connections, upgrades network acl test 2015-04-16 15:02:04 -05:00
Nick Downs f74405d5e7 Added Docker links support to the docker_container resource. 2015-04-16 12:42:21 -07:00
Paul Hinze 2566975c8e Merge pull request #1542 from TimeIncOSS/length-func-docs
Add docs for length func
2015-04-16 13:57:26 -05:00
Clint Shryock c59bfd0ca5 Merge branch 'f-aws-upstream-s3'
* f-aws-upstream-s3:
  provider/aws: Conver AWS S3 to upstream sdk
2015-04-16 13:51:12 -05:00
Clint 94d9f696b7 Merge pull request #1519 from hashicorp/f-aws-upstream-route53
provider/aws: Convert Route 53 Zone, Record to upstream
2015-04-16 13:47:01 -05:00
Clint Shryock 1da9bc8f4c fix go formatting after rebase 2015-04-16 13:42:16 -05:00
Clint Shryock 1545dbb803 provider/aws: Convert Route 53 Zone, Record to upstream 2015-04-16 13:41:38 -05:00
Clint 7bb8019ce9 Merge pull request #1558 from hashicorp/f-aws-upstream-instance
provider/aws: Convert Instance to use upstream library
2015-04-16 12:37:35 -05:00
Clint Shryock a5b2437dcf provider/aws: Convert Instance to use upstream library 2015-04-16 12:01:10 -05:00
Clint 1bc2aff4bb Merge pull request #1553 from hashicorp/f-aws-upstream-lc
provider/aws: Convert Launch Configuration over to upstream
2015-04-16 09:09:09 -05:00
Fatih Arslan 86810789c2 providers/aws: check allocationId only if it's vpc, fixes #1345
EIP with VPC only returns an allocationID. However, for standard we need
to lookup for PublicIP. When we use an example for standard EC2 instance
(here `t1.micro`):

```
resource "aws_instance" "example" {
    ami = "ami-25773a24"
    instance_type = "t1.micro"
}

resource "aws_eip" "ip" {
    instance = "${aws_instance.example.id}"
}

```

then in this case, allocationID will be nil, but publicIP will be non
nil (which is used later for association the IP).  So check for
allocationId only if it's of domain `VPC`.
2015-04-16 16:08:52 +03:00
Clint Shryock 7a99dd48b2 provider/aws: Convert Launch Configuration over to upstream
- removes extra ASG connection
2015-04-16 07:10:17 -05:00
Dave Cunningham e0905d89f8 Add a UserAgent with version temporarily set to 0.0.0 2015-04-15 18:17:21 -04:00
Clint c4de508293 Merge pull request #1513 from hashicorp/f-aws-upstream-asg
provider/aws: Convert AWS ASG to upstream aws-sdk-go
2015-04-15 15:39:10 -05:00
Clint Shryock 210b380d01 go vet updates 2015-04-15 15:32:20 -05:00