Commit Graph

4456 Commits

Author SHA1 Message Date
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
Guillaume Giamarchi
d855047af3 Floating IP support for LBaaS Virtual IP 2015-04-16 02:51:05 +02:00
Dave Cunningham
e0905d89f8 Add a UserAgent with version temporarily set to 0.0.0 2015-04-15 18:17:21 -04:00
Luke Amdor
f8b05fa05e using a set for route53 name_servers 2015-04-15 16:10:02 -05:00
Luke Amdor
46d3ab5ccd rename delegation_set_name_servers to name_servers 2015-04-15 16:07:50 -05: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
Clint Shryock
723be13f96 go fmt asg things 2015-04-15 15:30:35 -05:00
Clint Shryock
1f7d0944f1 provider/aws: Convert AWS ASG to upstream aws-sdk-go 2015-04-15 15:29:59 -05:00
Clint
e97fd27b14 Merge pull request #1539 from hashicorp/f-aws-instance-vpc-sec-ids
provider/aws: Add support for separate VPC Security Group IDs attribute
2015-04-15 15:25:03 -05:00
Clint
334b157a5c Merge pull request #1510 from hashicorp/f-aws-upstream-rds-instance
provider/aws: Convert AWS RDS to use upstream aws-sdk-go
2015-04-15 15:23:52 -05:00
Clint Shryock
1ed2219493 don't capitalize IAM 2015-04-15 15:05:44 -05:00
Paul Hinze
9053cc3d18 Merge pull request #1537 from ggiamarchi/openstack/insecure_https
OpenStack - Allow to disable HTTPS certificate check
2015-04-15 15:03:26 -05:00
Clint Shryock
df45b2cda8 go fmt db things 2015-04-15 15:02:52 -05:00
Guillaume Giamarchi
b87c05e5a8 Allow to disable HTTPS certificate check 2015-04-15 21:54:44 +02:00
Clint Shryock
470379e7ed connection naming cleanups 2015-04-15 14:36:08 -05:00
Clint Shryock
9187cab6ac provider/aws: Convert remaining RDS resources to use upstream library 2015-04-15 14:31:53 -05:00
Clint Shryock
d579b4b75c provider/aws: Convert AWS RDS to use upstream aws-sdk-go 2015-04-15 14:28:02 -05:00
Clint
220f62eb72 Merge pull request #1532 from hashicorp/f-aws-upstream-elb
providers/aws: Conver AWS ELB to upstream
2015-04-15 14:16:24 -05:00
Clint
5a815efdbb Merge pull request #1531 from hashicorp/f-aws-upstream-vpn-gateway
provider/aws: Convert VPN Gateway to upstream
2015-04-15 14:15:03 -05:00
Clint
f948b6205a Merge pull request #1522 from hashicorp/f-aws-upstream-vpc-peering
provider/aws: Convert AWS VPC Peering to upstream
2015-04-15 14:14:02 -05:00
Radek Simko
2078c593a2 conf: docs added for length func 2015-04-15 18:55:49 +01:00
Clint Shryock
3337503eda update test and documentation for vpc ids in instances 2015-04-15 12:17:21 -05:00
Clint Shryock
97b98b1da6 Merge branch 'master' into f-aws-instance-vpc-sec-ids
* master: (511 commits)
  Update CHANGELOG.md
  core: avoid diff mismatch on NewRemoved fields during -/+
  Update CHANGELOG.md
  update CHANGELOG
  Fix minor error in index/count docs
  terraform: remove debug
  terraform: when pruning destroy, only match exact nodes, or exact counts
  up version for dev
  update CHANGELOG
  terraform: prune tainted destroys if no tainted in state [GH-1475]
  update CHANGELOG
  config/lang: support math on variables through implicits
  update CHANGELOG
  update cHANGELOG
  update cHANGELOG
  providers/aws: set id outside if/esle
  providers/aws: set ID after creation
  core: remove dead code from pre-deposed refactor
  website: update LC docs to note name is optional
  security_groups field expects a list of Security Group Group Names, not IDs
  ...
2015-04-15 12:12:17 -05:00
Paul Hinze
4ef208d81b Update CHANGELOG.md 2015-04-15 12:05:39 -05:00
Paul Hinze
5874fa06ff Merge pull request #1495 from TimeIncOSS/length-func
config: Add length to built-in functions
2015-04-15 11:54:46 -05:00
Paul Hinze
11280a09b3 Merge pull request #1538 from fatih/build-script-fix
scripts/build.sh: fix GOPATH/bin folder breaking build
2015-04-15 11:50:55 -05:00
Paul Hinze
e0dee1a3aa Merge pull request #1536 from shvar/patch-1
get dependencies without installing them
2015-04-15 11:49:22 -05:00
Paul Hinze
76701884cd Merge pull request #1517 from hashicorp/f-simplify-google-instance
google: simplify instance metadata schema
2015-04-15 11:48:37 -05:00
Fatih Arslan
0c80207bff scripts/build.sh: fix GOPATH/bin folder breaking build
If GOPATH/bin doesn't exists the build scripts just exists, leaving the
`terraform/bin` folder with only one single binary called `terraform`.
Discovered while setting up a new GOPATH just for terraform.
2015-04-15 19:36:44 +03:00
Paul Hinze
43231b56d2 Merge pull request #1534 from hashicorp/b-crash-on-output-interpolate
core: don't crash when count.index is used in the wrong context
2015-04-15 11:03:37 -05:00
Paul Hinze
01e75e0fc3 google: simplify instance metadata schema
It doesn't need to be a List of Maps, it can just be a Map.

We're also safe to remove a previous workaround I stuck in there.

The config parsing is equivalent between a list of maps and a plain map,
so we just need a state migration to make this backwards compatible.
2015-04-15 11:01:35 -05:00