Commit Graph

477 Commits

Author SHA1 Message Date
Armon Dadgar 7a3b4fa7ce Merge pull request #648 from yahyapo/master
Adding tag support to AWS EC2 route table resource.
2014-12-10 19:24:38 -08:00
Armon Dadgar 0ff62016ee provider/aws: Fixing ASG handling of not found 2014-12-10 13:27:11 -08:00
Armon Dadgar 633a08230e Merge pull request #638 from snehaso/tag_for_acl
[AWS] added tags for aws_network_acl
2014-12-10 12:59:22 -08:00
Armon Dadgar 9668c8292f Merge pull request #637 from snehaso/vpc_tenanct
[AWS] added vpc instance_tenancy
2014-12-10 12:58:50 -08:00
Armon Dadgar 8e32076d55 Merge pull request #635 from snehaso/cross_zone_lb
[AWS]  enabled cross zone load balancing
2014-12-10 10:55:54 -08:00
Yahya Poonawala b595c73d42 Adding tag support to AWS EC2 route table resource. 2014-12-11 00:03:13 +05:30
Sneha Somwanshi 5e3e8562fc added tags for aws_network_acl 2014-12-10 16:29:00 +05:30
Sneha Somwanshi 89f1a38f5b added vpc tenancy argument 2014-12-10 16:10:00 +05:30
Sneha Somwanshi 1d3e30b353 enabled cross zone load balancing 2014-12-10 12:49:43 +05:30
Armon Dadgar 82e60bb3cd Merge pull request #631 from snehaso/network_acl
aws_network_acl: return error if rule protocol is invalid
2014-12-09 09:07:44 -08:00
Sneha Somwanshi aad594aed3 aws_network_acl: return error if protocol is invalid 2014-12-08 16:53:05 +05:30
Armon Dadgar 38697d6b4c aws: Making security group ingress rules optional 2014-12-07 23:52:04 -08:00
Armon Dadgar fae29f4685 Merge pull request #506 from muralimadhu/master
Support termination policies in aws auto scaling group
2014-12-07 23:35:33 -08:00
Armon Dadgar 03d4a425b6 Merge pull request #623 from snehaso/network_acl
[AWS] added new resource aws_network_acl
2014-12-07 23:09:51 -08:00
Sneha Somwanshi 4b154b8fe7 Fixed update of ingress/egress rules 2014-12-08 11:00:55 +05:30
Armon Dadgar 7182e5618e Merge pull request #612 from MerlinDMC/feature/aws_block_device_virtual_name
allow setting the block device virtual_name
2014-12-03 12:08:07 -08:00
Armon Dadgar a2c8859f04 Merge pull request #615 from Banno/fix-aws-instance-block-devices-index-range
fixing array length for aws instance volumes
2014-12-03 12:00:31 -08:00
Sneha Somwanshi c79e6ba08b handled subnet and network acl association 2014-12-03 16:37:50 +05:30
Sneha Somwanshi 86aafdb839 test for tenancy schema 2014-12-03 15:58:51 +05:30
Sneha Somwanshi cd0f9761da rearranged the tests 2014-12-01 14:19:39 +05:30
Luke Amdor f3ff4bece8 fixing array length for aws instance volumes 2014-11-30 08:24:23 -06:00
Sneha Somwanshi 5eec8a531c Added CRUD operations for network acl 2014-11-30 17:10:54 +05:30
Sneha Somwanshi d4a887278e flatten/expand operations for network_acl 2014-11-30 17:09:37 +05:30
Sneha Somwanshi bd9e9ec0c4 Add support for network acls 2014-11-26 19:14:02 +05:30
Sneha Somwanshi dca2d9aa4c acceptance test for creating network acl 2014-11-26 19:12:59 +05:30
Sneha Somwanshi cebea04cce added provider for aws_network_acl 2014-11-26 19:12:39 +05:30
Sneha Somwanshi f63e032c23 Merge remote-tracking branch 'upstream/master' 2014-11-26 17:06:42 +05:30
Armon Dadgar ccf7f40711 Merge pull request #596 from svanharmelen/f-refactor-aws-provider
provider/aws: refactor to use the schema.Provider approach
2014-11-24 16:30:41 -08:00
Sander van Harmelen d3e1a6678d Making some last tweaks and fixing some acc tests 2014-11-24 21:22:18 +01:00
Seth Vargo eb729d17c7 Merge pull request #546 from tmtk75/dev/enable-associate-public-ip
support associate_public_ip_address for aws_launch_configuration
2014-11-24 09:58:26 -05:00
Sander van Harmelen 0725486e89 Refactored the last two resources 2014-11-24 14:04:48 +01:00
Tomotaka Sakuma db8256a4a7 add associate_public_ip_address attr to the acceptance test of aws_launch_configuration 2014-11-24 13:27:41 +09:00
Daniel Malon 1e3065ae11 allow setting the block device virtual_name 2014-11-22 09:50:22 +00:00
Sander van Harmelen eccd5ad308 Refactored about 90%
Still need to update 2 resources and check the acceptance tests, but
overall we’re nearly there 😃
2014-11-21 17:58:34 +01:00
Daniel Farina 67b03247ec Make Routes in RouteTable optional
Otherwise it is impossible to get simple configurations with the
"default" routing table, which is only the "local" route.

The following contents of main.tf expose the bug, and boots an instance
fine after this patch is applied:

    variable aws_access_key {}
    variable aws_secret_key {}
    variable aws_ubuntu_ami {}

    provider "aws" {
        access_key = "${var.aws_access_key}"
        secret_key = "${var.aws_secret_key}"
        region = "us-east-1"
    }

    resource "aws_vpc" "default" {
        cidr_block = "10.0.0.0/20"
    }

    resource "aws_route_table" "private" {
        vpc_id = "${aws_vpc.default.id}"
        # Note the lack of "route" sub-key here.
    }

    resource "aws_subnet" "private" {
        vpc_id = "${aws_vpc.default.id}"
        cidr_block = "10.0.1.0/24"
    }

    resource "aws_route_table_association" "private" {
        subnet_id = "${aws_subnet.private.id}"
        route_table_id = "${aws_route_table.private.id}"
    }

    # Demonstrate an instance can be booted fine in this fashion.
    resource "aws_instance" "sample" {
        ami = "${var.aws_ubuntu_ami}"
        instance_type = "t2.micro"
        subnet_id = "${aws_subnet.private.id}"
    }

terraform.tfvars for completeness:

    aws_access_key = "..."
    aws_secret_key = "..."

    # A public Trusty AMI
    aws_ubuntu_ami = "ami-9aaa1cf2"
2014-11-19 22:04:44 -08:00
Armon Dadgar e53bf23c0c provider/aws: Fixing merge conflict 2014-11-19 17:17:18 -08:00
Armon Dadgar 735e83a146 Merge branch 'master' of https://github.com/serenitus/terraform into serenitus-master 2014-11-19 17:15:15 -08:00
Armon Dadgar 41f2e7f98e Merge pull request #545 from rcostanzo/f-parameter-group
Added new parameter_group_name parameter for creating an RDS DB instance
2014-11-19 16:01:11 -08:00
Armon Dadgar 4303232533 Merge pull request #440 from buth/awsblockdevices
AWS Instance `block_device` Attribute
2014-11-19 15:52:00 -08:00
Armon Dadgar 8446b036d7 Merge pull request #535 from ceh/vet-fixes
argument and verb formatting fixes reported by go vet
2014-11-19 15:46:01 -08:00
Panagiotis Moustafellos 56defa346f providers/aws: Route53 decrease MinTimeout interval
It get's a bit annoying when handling dozens of records to have the MinInterval for retries so high.
2014-11-13 17:52:10 +02:00
Tomotaka Sakuma 1170111c7e support associate_public_ip_address for aws_launch_configuration 2014-11-06 21:00:48 +09:00
Rob Costanzo 16b4dd44c1 Upped the RDS instance creation/destroy timeout to 20 minutes as it regularly takes 12+ minutes to create 2014-11-05 11:03:06 -08:00
Rob Costanzo a14da63a39 Fixed bug with final_snapshot_identifier and skip_final_snapshot and removed apply_method as an option for now and am only supporting immediate mode 2014-11-05 11:03:06 -08:00
Rob Costanzo 0e3afa6d3d Fixed incorrect ForcesNew settings for parameters and added better acceptance tests to ensure updates are working as expected 2014-11-05 11:03:06 -08:00
Rob Costanzo 3b54001a1b Added missing update support for new aws_db_parameter_group resource 2014-11-05 11:03:06 -08:00
Rob Costanzo de16b10555 Added new aws_db_parameter_group resource for creating RDS DB Parameter Groups.
Added plumbing to allow an optional DBParameterGroupName to be passed when creating an RDS DB instance.
2014-11-05 11:03:06 -08:00
sneha somwanshi 750a36c51e AWS instance resource now supports tenancy 2014-11-04 16:38:30 +05:30
Simon Turvey 31132f1ded Add tag support to AWS subnets 2014-11-02 12:30:33 -08:00
Emil Hessman 4bfe18b40d argument and verb formatting fixes reported by go vet
builtin/providers/aws/tags_test.go:56: unrecognized printf verb 'i'
builtin/providers/aws/tags_test.go:59: unrecognized printf verb 'i'

config/config_test.go:101: possible formatting directive in Fatal call
config/config_test.go:157: possible formatting directive in Fatal call

config/module/get_file_test.go:91: missing argument for Fatalf(%s): format reads arg 1, have only 0 args

helper/schema/schema.go:341: arg v.Type for printf verb %s of wrong type: schema.ValueType
helper/schema/schema.go:656: missing argument for Errorf(%s): format reads arg 2, have only 1 args
helper/schema/schema.go:912: arg schema.Type for printf verb %s of wrong type: schema.ValueType

terraform/context.go:178: arg v.Type() for printf verb %s of wrong type: github.com/hashicorp/terraform/config.VariableType
terraform/context.go:486: arg c.Operation for printf verb %s of wrong type: terraform.walkOperation

terraform/diff_test.go💯 arg actual for printf verb %s of wrong type: terraform.DiffChangeType
terraform/diff_test.go:235: arg actual for printf verb %s of wrong type: terraform.DiffChangeType
2014-11-02 13:56:44 +01:00
Eric Buth 9fa25c40b2 tests for aws instance block_device 2014-10-31 16:25:16 -04:00
Eric Buth fc58d0a977 Merge branch 'master' of github.com:hashicorp/terraform into awsblockdevices 2014-10-31 15:41:30 -04:00
Panagiotis Moustafellos 5bef93042b Update to support more regions
Relates https://github.com/hashicorp/terraform/issues/524
Added `eu-central-1`, `cn-north-1` and `us-gove-west-1`(hi NSA)
I checked `goamz`, @mitchellh already has added support for those regions
2014-10-30 16:07:12 +02:00
Madhu 5085e75f4a Remove debug logs 2014-10-23 15:50:17 -07:00
Madhu 7d4064ca03 Termination Policy Support 2014-10-23 14:58:54 -07:00
Mitchell Hashimoto 81913c58fb providers/aws: fixing faililng test 2014-10-21 10:57:55 -07:00
Mitchell Hashimoto f63a5d24e9 helper/schema: diffs for sets should include the full set [GH-457]
Prior to this, the diff only contained changed set elements. The issue
with this is that `getSet`, the internal function that reads a set from
the ResourceData, expects that each level (state, config, diff, etc.)
has the _full set_ information. This change was done to fix merging
issues.

Because of this, we need to make sure the full set is visible in the
diff.
2014-10-21 10:49:53 -07:00
Mitchell Hashimoto d5b418d82b Merge pull request #402 from longnguyen11288/add-sg-tags
Added security group tagging
2014-10-20 23:18:22 -07:00
Mitchell Hashimoto 590a635b70 providers/aws: ELB should treat subest as a set 2014-10-20 16:32:38 -07:00
Mitchell Hashimoto 7e2a421d87 providers/aws: ELB treats subnets as a set 2014-10-20 13:34:26 -07:00
Mitchell Hashimoto b25a536299 providers/aws: disassociate EIP before destroying 2014-10-18 15:32:33 -07:00
Mitchell Hashimoto 895d978065 fmt 2014-10-18 10:59:23 -07:00
Mitchell Hashimoto 6eb409c00e Merge pull request #449 from pmoust/subnet-destroy-retry
providers/aws: retry destroying subnet for some time [GH-449]
2014-10-18 10:56:21 -07:00
Panagiotis Moustafellos c459421892 providers/aws: retry destroying subnet for some time [GH-449] 2014-10-18 18:24:57 +03:00
Panagiotis Moustafellos f240c27e16 providers/aws: retry destroying internet gateway for some time [GH-447] 2014-10-18 11:47:33 +03:00
Mitchell Hashimoto 1912e9655d providers/aws: if LC not found, delete it [GH-421] 2014-10-17 20:21:18 -07:00
Mitchell Hashimoto f5c2aba215 providers/aws: drain autoscale groups before deleting [GH-435] 2014-10-17 20:11:00 -07:00
Mitchell Hashimoto 7c89fb06cc providers/aws: only retry dependency violation for security groups
[GH-436]
2014-10-17 18:29:48 -07:00
Mitchell Hashimoto 10ce2b690c providers/aws: retry deleting security group for some time [GH-436] 2014-10-17 18:21:18 -07:00
Eric Buth f10e84aa16 added block_device attribute 2014-10-17 12:12:45 -04:00
John Eckhart 22fa84ebcb Fix build breaks from latest goamz 2014-10-17 00:53:54 -04:00
Mitchell Hashimoto 05bfe85f9f providers/aws: instances can be computed on an ELB 2014-10-16 18:24:58 -07:00
Mitchell Hashimoto 152d5b0c69 providers/aws: elb properly hashes listeners 2014-10-16 18:02:03 -07:00
Mitchell Hashimoto 1a2afdaa37 providers/aws: launch config and autoscale group load is correct
[GH-423]
2014-10-16 16:39:58 -07:00
Long Nguyen eef3197ba0 Added security group tagging 2014-10-14 17:11:09 -04:00
Mitchell Hashimoto e59e4a6bd9 providers/aws: fix compile error 2014-10-14 12:20:39 -07:00
Mitchell Hashimoto ce997a9a33 providers/aws: fix test 2014-10-14 12:15:46 -07:00
Sean Herron 3e16190e69 Expands AWS tagging to cover EC2 instances 2014-10-13 16:55:59 -04:00
Mitchell Hashimoto d7786473df fmt 2014-10-11 12:57:06 -07:00
Mitchell Hashimoto 6ddcc2ebf8 Merge pull request #309 from alekstorm/aws-db-instance-password
Store aws_db_instance.password in tfstate, change to AttrTypeCreate
2014-10-11 12:34:52 -07:00
Mitchell Hashimoto d8c1ee655c Merge pull request #308 from alekstorm/aws-db-instance-db-subnet-group-name
Rename aws_db_instance.subnet_group_name to db_subnet_group_name
2014-10-11 12:33:58 -07:00
Mitchell Hashimoto bd0cf94e89 providers/aws: wait for LC to exist [GH-302] 2014-10-11 12:27:23 -07:00
Mitchell Hashimoto 35065fc8c8 providers/aws: properly report errors if DB instance destroy fails
[GH-310]
2014-10-11 11:02:11 -07:00
Mitchell Hashimoto a362a97979 providers/aws: forcenew on SGs for now [GH-299] 2014-10-10 17:14:35 -07:00
Mitchell Hashimoto e4ec2eb0cf providers/aws: security group VPC ID can be computed in a default VPC 2014-10-10 17:12:03 -07:00
Mitchell Hashimoto e827180887 providers/aws: main_route_table_id attribute for VPC [GH-193] 2014-10-10 16:57:32 -07:00
Mitchell Hashimoto 51d66b678d providers/aws: resource ELB listeners [GH-314] 2014-10-10 16:35:52 -07:00
Mitchell Hashimoto 5eccbba606 providers/aws: support non-destructive update of desired_capacity for
ASG
2014-10-10 16:25:23 -07:00
Mitchell Hashimoto 36f225dea0 fmt 2014-10-10 14:50:35 -07:00
Mitchell Hashimoto b43cfa3bb0 providers/aws: launch configuration in helper/schema 2014-10-10 14:50:23 -07:00
Mitchell Hashimoto caaa9d145a providers/aws: convert autoscaling group to helper/schema 2014-10-10 14:34:40 -07:00
Mitchell Hashimoto 281ba93d39 providers/aws: set the dns_name on create [GH-393] 2014-10-10 13:50:08 -07:00
Mitchell Hashimoto b43ca0aa52 providers/aws: handle case where ELB is deleted manually [GH-304] 2014-10-10 10:35:34 -07:00
Mitchell Hashimoto c5c72b1ce1 providers/aws: fix failing test 2014-10-10 10:26:48 -07:00
Mitchell Hashimoto 7dcb386e29 providers/aws: fix some computed attributes on ELB 2014-10-10 00:17:35 -07:00
Mitchell Hashimoto dd2b1fe442 providers/aws: make health checks work 2014-10-10 00:07:08 -07:00
Mitchell Hashimoto 12ff354749 providers/aws: convert most of ELB to schema 2014-10-09 23:58:48 -07:00
Mitchell Hashimoto 539eca5ee6 Fix failing tests 2014-10-09 21:29:21 -07:00
Mitchell Hashimoto 3aa655ad3b helper/schema: test schema diffs with the interpolation splits 2014-10-09 16:31:24 -07:00
Mitchell Hashimoto 6591e63138 providers/aws: should delete tags that are changing in-place 2014-10-09 10:47:33 -07:00
Mitchell Hashimoto 00bdef3093 providers/aws: test tag removal 2014-10-08 18:21:21 -07:00
Mitchell Hashimoto 6eafac8a34 providers/aws: aws_vpc supports tags 2014-10-08 17:54:00 -07:00
Mitchell Hashimoto 699b2efa1c providers/aws: convert aws_vpc to helper/schema 2014-10-08 16:43:13 -07:00
Mitchell Hashimoto 9912ca70c6 Merge pull request #371 from xuwang/master
providers/aws: Add iam_instance_profile to resource_aws_launch_configuration
2014-10-08 10:53:26 -07:00
Mitchell Hashimoto 014bde64c4 providers/aws: not an error if route53 record is already destroy
[GH-342]
2014-10-07 21:55:40 -07:00
Mitchell Hashimoto ca99811357 providers/aws: subnet retry destroy [GH-357] 2014-10-07 21:52:08 -07:00
Xu Wang df37e82f5b Add optional param iam_instance_profile to resource_aws_launch_configuration to support role based AC 2014-10-06 20:46:25 -07:00
Panagiotis Moustafellos d01418270a Add listener.ssl_certificate_id support to AWS ELB (@jpadvo [GH-176]) 2014-10-02 05:19:36 +03:00
Mitchell Hashimoto 3b2272c69f providers/aws: read properly finds the Self 2014-09-30 14:26:01 -07:00
Mitchell Hashimoto dbc890e401 providers/aws: add `self` to ingress [GH-219] 2014-09-30 14:19:16 -07:00
Mitchell Hashimoto 6e02465be7 providers/aws: read internal for ELB 2014-09-30 13:37:04 -07:00
Mitchell Hashimoto 09ce13d040 Merge pull request #303 from buth/internalelbs
provider/aws: added missing internal ELB option
2014-09-30 13:29:35 -07:00
Mitchell Hashimoto 452cc07ce8 Merge pull request #307 from alekstorm/aws-db-instance-gone
providers/aws: don't error out when RDS DB instance disappears
2014-09-30 13:28:24 -07:00
Mitchell Hashimoto a7c321a028 helper/scheam: support UI defaults 2014-09-29 14:00:35 -07:00
Mitchell Hashimoto 99044a1f14 Add descriptions for AWS inputs 2014-09-29 13:30:28 -07:00
Mitchell Hashimoto 459ffe9d2a providers/*: fix compilation for input 2014-09-29 10:28:08 -07:00
Mitchell Hashimoto 3941dbac5d fmt 2014-09-28 11:51:49 -07:00
Ian Delahorne 9f91c4e8c3 Add IAM Instance profile support to AWS instance provider 2014-09-23 13:06:30 -05:00
Mitchell Hashimoto bea81d7710 providers/aws: fix some broken tests 2014-09-22 08:57:17 -07:00
Mitchell Hashimoto 166847d5dc Merge branch 'f-state'
Conflicts:
	builtin/providers/aws/resource_aws_subnet.go
2014-09-22 08:55:44 -07:00
Alek Storm c7f219a781 Store aws_db_instance.password in tfstate, change to AttrTypeCreate 2014-09-18 13:55:43 -07:00
Alek Storm ba0591c85d Force recreation when aws_instance.private_ip changes 2014-09-18 13:26:49 -07:00
Alek Storm f928829a1c Don't error out when RDS DB instance disappears 2014-09-18 13:25:30 -07:00
Alek Storm 5b806f0737 Rename aws_db_instance.subnet_group_name to db_subnet_group_name 2014-09-18 13:19:24 -07:00
Mitchell Hashimoto 9b2b3a963f ResourceDiff => InstanceDiff 2014-09-17 16:33:24 -07:00
Eric Buth 90b75b86c4 added missing internal ELB option 2014-09-17 17:56:27 -04:00
Mitchell Hashimoto c5d6df692d providers/aws: tests passing, compiles 2014-09-16 17:49:24 -07:00
Jack Pearkes 002e640d0b Merge pull request #259 from hden/vpc_zone_identifier
allow vpc_zone_identifier in aws_autoscaling_group
2014-09-16 10:44:32 -04:00
Jack Pearkes 9fc775e41c providers/aws: fix tests for subnet map_public_ip, add docs
This working depends on merging mitchellh/goamz#109

Related: #285

cc/ @hden
2014-09-16 10:37:22 -04:00
Jack Pearkes ee24fce321 Merge pull request #285 from hden/263
add MapPublicIpOnLaunch
2014-09-16 09:56:40 -04:00
Jack Pearkes dd434fb71b providers/aws: add description to test
cc/ @buth

Looks like the schema was correctly defining description as required,
added it to the tests and it's passing now.
2014-09-16 09:44:32 -04:00
Eric Buth 4cd11e4091 AWS DB Subnet Group resource and testing 2014-09-15 14:58:04 -04:00
Hao-kang Den d9665bad4e add MapPublicIpOnLaunch 2014-09-10 13:13:16 +08:00
Mitchell Hashimoto 2317f7ea9b providers/aws: proper DefaultFunc to return nil if no env 2014-09-09 21:46:50 -07:00
Mitchell Hashimoto 6a275d7bd0 providers/aws: convert validation to helper/schema 2014-09-09 21:44:31 -07:00
Mitchell Hashimoto 62e2743dcc providers/aws: retry delete of eip [GH-276] 2014-09-09 14:18:53 -07:00
Mitchell Hashimoto 57f287c06d providers/aws: check for non-exist on refresh 2014-09-09 14:15:33 -07:00
Mitchell Hashimoto a5b85dd788 providers/aws: check if instance is set on eip 2014-09-09 14:15:08 -07:00
Mitchell Hashimoto a5c884f5aa fmt 2014-09-09 13:43:03 -07:00
Mitchell Hashimoto ab5e07a1f9 providers/aws: use GetOk to check for value [GH-258] 2014-09-08 20:24:43 -07:00
Mitchell Hashimoto 634dd7e4a3 Merge pull request #260 from jkinred/master
providers/amazon: Allow building of EC2 instances with ebs_optimized flag
2014-09-07 16:01:59 -07:00
shin1x1 781e512dde fix associate_public_ip_address parameter name 2014-09-03 20:54:36 +09:00
Jonathan Kinred 2b764de383 Allow building of EC2 instances with ebs_optimized flag 2014-09-03 20:18:40 +10:00
Hao-kang Den 125977e075 allow vpc_zone_identifier in aws_autoscaling_group 2014-09-03 09:38:07 +08:00
Mitchell Hashimoto 3a3e3346d5 providers/aws: route53 record destroy in parallel works 2014-08-31 09:12:05 -07:00
Mitchell Hashimoto c9a541d95b helper/schema: generate a full diff in destroy/create cycle 2014-08-27 15:45:52 -07:00
Mitchell Hashimoto b7e16c6b53 providers/aws: source_dest_check applies [GH-229] 2014-08-26 15:05:36 -07:00
Mitchell Hashimoto 56cf1e6faa Fix go vet complaints 2014-08-24 21:50:35 -07:00
Ryan Uber e530eea226 provider/aws: fix panic when user_data receives nil from StateFunc 2014-08-23 00:20:41 -07:00
Mitchell Hashimoto 623c635fb1 providers/aws: can create records with multiple values [GH-221] 2014-08-22 17:19:39 -07:00