Commit Graph

798 Commits

Author SHA1 Message Date
Clint Shryock 0c5011bea4 provider/aws: Fix issue with empty IPRanges 2015-04-21 10:57:50 -05:00
Mitchell Hashimoto c8a8f05935 Merge pull request #1601 from bitglue/sts_token
provider/aws: support session token in AWS credentials
2015-04-20 15:01:29 -07:00
Matt Good 21b0a03d70 Support for multiple providers of the same type
Adds an "alias" field to the provider which allows creating multiple instances
of a provider under different names. This provides support for configurations
such as multiple AWS providers for different regions. In each resource, the
provider can be set with the "provider" field.

(thanks to Cisco Cloud for their support)
2015-04-20 14:14:34 -07:00
Phil Frost d4c8c528e0 Support session token in AWS credentials
Session tokens are necessary to utilize temporary credentials.
http://docs.aws.amazon.com/STS/latest/UsingSTS/Welcome.html
2015-04-20 15:09:04 -04:00
Mitchell Hashimoto 1c0f2f136c provider/aws: fix vet error, missing fmt param 2015-04-19 18:13:04 -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 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
Radek Simko 009514f0d3 Allow using deprecated security_groups in NI spec 2015-04-17 21:26:17 +01: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
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
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 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 Shryock a5b2437dcf provider/aws: Convert Instance to use upstream library 2015-04-16 12:01:10 -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
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 Shryock 1ed2219493 don't capitalize IAM 2015-04-15 15:05:44 -05:00
Clint Shryock df45b2cda8 go fmt db things 2015-04-15 15:02:52 -05: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 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
Clint Shryock dc54d6a852 refactor out a refresh fun that wasn't really used 2015-04-15 10:26:39 -05:00
Clint Shryock a3ffb6ea6e fix test failure 2015-04-15 09:43:43 -05:00
Clint Shryock 4186ec18c6 providers/aws: Conver AWS ELB to upstream 2015-04-14 16:41:36 -05:00
Clint Shryock 900dd4e151 provider/aws: Convert VPN Gateway to upstream 2015-04-14 15:45:48 -05:00
Clint Shryock 95026b6266 provider/aws: Convert AWS VPC Peering to upstream 2015-04-14 11:23:26 -05:00
Clint Shryock d4e7c2dedc provider/aws: Conver AWS S3 to upstream sdk 2015-04-14 11:07:05 -05:00
Mitchell Hashimoto 0eb69bcd37 Merge pull request #1518 from hashicorp/b-lc-id
providers/aws: set LC ID after creation
2015-04-14 08:23:31 -07:00
Mitchell Hashimoto 783d912b7c providers/aws: set id outside if/esle 2015-04-14 08:23:16 -07:00
Clint 0eecf070d9 Merge pull request #1489 from hashicorp/f-aws-upstream-route-table
provider/aws: Convert Route table and Route table association to upstream aws-sdk-go
2015-04-14 10:15:24 -05:00
Clint 85c4a134ad Merge pull request #1486 from hashicorp/f-aws-upstream-vpc
provider/aws: Convert AWS VPC to upstream aws-sdk-go
2015-04-14 10:14:56 -05:00
Mitchell Hashimoto f7a2f2a2e7 providers/aws: set ID after creation 2015-04-13 17:03:13 -07:00
Clint Shryock 5394d91657 provider/aws: Convert Network ACL and helper library to upstream aws-sdk-go 2015-04-13 11:14:21 -05:00
Clint Shryock 53478c96de provider/aws: Convert AWS Main Route Table Association to upstream 2015-04-13 10:01:56 -05:00
Clint Shryock c89470a754 provider/aws: Convert Route table and Route table association to upstream aws-sdk-go 2015-04-10 17:09:36 -05:00
Clint Shryock 74bab7b89d provider/aws: Convert AWS VPC to upstream aws-sdk-go 2015-04-10 16:09:12 -05:00
Clint 9f56addf0c Merge pull request #1446 from hashicorp/f-aws-upstream-security-group
providers/aws: Convert AWS Security Group to upstream aws-sdk-go
2015-04-10 11:06:55 -05:00