Commit Graph

595 Commits

Author SHA1 Message Date
Sander van Harmelen 6be4b2e807 A really small update fixing a cosmetic inconsistentie
For the OCD types among us, this inconsistentie (only location where
droplet is spelled with a capital) drives me mad
😝
2014-11-20 15:09:22 +01:00
Sander van Harmelen 36ed95c86d Fixing the acc tests
I do wonder when these tests where last run successfully… Must be quite
some time ago considering what I needed to fix in here 😉
2014-11-20 14:30:02 +01:00
Sander van Harmelen bed36cc86a Refactoring the resourceInstanceTags func just a little
My eye caught this somewhat un-logic mixed use of ‘vs’ and
‘v.(*schema.Set)’, so thought to make it a little cleaner…
2014-11-20 11:32:15 +01:00
Sander van Harmelen 144ceb8003 providers/google: update schema to use a DefaultFunc
This makes testing easier and gives you a way to configure the provider
using env variables. It also makes the provider more inline following
the TF 0.2 approach.
2014-11-20 11:25:23 +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
Armon Dadgar fc5a13a1c1 Merge pull request #570 from svanharmelen/f-refactor-digitalocean-provider
Refactor to use the schema.Provider approach
2014-11-19 14:15:48 -08:00
Armon Dadgar 12cde243a8 Merge pull request #568 from svanharmelen/f-refactor-cloudflare-provider
Refactor to use the schema.Provider approach
2014-11-19 14:07:40 -08:00
Armon Dadgar 6afae237e5 Merge pull request #569 from svanharmelen/f-refactor-dnsimple-provider
Refactor to use the schema.Provider approach
2014-11-19 14:04:17 -08:00
Armon Dadgar 5b8efd1ba8 Merge pull request #576 from svanharmelen/f-update-mailgun-provider
providers/mailgun: updated the provider schema to use a DefaultFunc
2014-11-19 13:58:53 -08:00
Sander van Harmelen 1b6f37b6eb Fixed tests and updated the provider schema to use a DefaultFunc
The default stack changed from ‘cedar’ to ‘cedar-14’, so updated the
acceptance tests to reflect this.

Updating the schema makes testing easier and gives you a way to
configure the provider using env variables. It also makes the provider
more inline following the TF 0.2 approach.
2014-11-19 14:25:18 +01:00
Sander van Harmelen 2cb1fd8987 Updated the provider to make testing a little easier
Also makes the provider more inline with the others following the TF
0.2 approach.
2014-11-18 15:21:32 +01:00
Sander van Harmelen 12f6ccb731 Refactor the DigitalOcean provider
With this refactor the DigitalOcean provider is updated to use the
schema.Provider approach released with TF 0.2.
2014-11-18 11:26:59 +01:00
Sander van Harmelen 4e94af3644 Removing obsolete struct tags 2014-11-17 18:58:41 +01:00
Sander van Harmelen 11f024a8e7 Removing obsolete struct tags 2014-11-17 18:57:41 +01:00
Sander van Harmelen a270bc9771 Refactoring the CloudFlare provider
With this refactor the CloudFlare provider is updated to use the
schema.Provider approach released with TF 0.2.
2014-11-17 14:03:57 +01:00
Sander van Harmelen cdee8c70ec Refactoring the DNSimple provider
With this refactor the DNSimple provider is updated to use the
schema.Provider approach released with TF 0.2.
2014-11-17 14:01:00 +01: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
Madhu 5ed2ee8f37 Merge branch 'master' of https://github.com/hashicorp/terraform 2014-11-10 18:44:23 -08: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
Jack Pearkes ecf66ad7b5 providers/digitalocean: compat for changes to API for droplet size
Upstream in the digitalocean API, the size slug became a size
string, breaking pearkes/digitalocean.

https://github.com/pearkes/digitalocean/pull/1

This fixes compatibility for changes to that library.

closes #510
2014-11-02 14:50:59 -08:00
Jack Pearkes def922551e providers/digitalocean: fix acceptance test suite for running 2014-11-02 14:44:32 -08:00
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
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 1792334ec4 fmt 2014-10-21 11:00:12 -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 98f104dde6 Merge pull request #406 from catsby/heroku-orgs-maps
Proposal to change Heroku organization TypeString to a TypeList
2014-10-20 23:15:50 -07:00
Mitchell Hashimoto 4822419414 Merge pull request #454 from stuntgoat/goog-external
providers/google: add external_address; needed for connection
2014-10-20 23:10:48 -07:00
Mitchell Hashimoto 590a635b70 providers/aws: ELB should treat subest as a set 2014-10-20 16:32:38 -07:00
Mitchell Hashimoto 8f166458d2 Merge pull request #480 from hashicorp/f-fix-consul
Consul param should be "key"
2014-10-20 15:35:31 -07:00
Mitchell Hashimoto 903aa0250c providers/consul: fix delete diff 2014-10-20 14:09:57 -07:00
Mitchell Hashimoto 7e2a421d87 providers/aws: ELB treats subnets as a set 2014-10-20 13:34:26 -07:00
Armon Dadgar f4d5d648c9 provider/consul: Disambiguate between set/get 2014-10-20 12:06:27 -07:00
Armon Dadgar 00eaabf5b8 provider/consul: Fixing test DC 2014-10-20 12:06:16 -07:00
Armon Dadgar 3fcc016e48 provider/consul: Change keyword to key from keys 2014-10-20 12:02:48 -07:00
Armon Dadgar 3e43eb5497 provider/consul: Fixing test harness 2014-10-20 12:02:37 -07:00
stungtoat afa1666cad set default host on connection info 2014-10-19 00:04:17 -07:00
stungtoat fe4e89bef7 consistent spacing 2014-10-18 23:17:14 -07:00
stungtoat 6cc10998ec go fmt 2014-10-18 23:15:43 -07:00
stungtoat fd979d0a8e providers/google: add external_address; needed for connection 2014-10-18 23:03:37 -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
Clint Shryock 98667d1b12 update error message 2014-10-14 17:28:25 -05:00
Clint Shryock b850f8bc65 proposal for making orgs a structure with fields instead of just a name field 2014-10-14 17:28:24 -05:00
Long Nguyen eef3197ba0 Added security group tagging 2014-10-14 17:11:09 -04:00
Mitchell Hashimoto 6fea336c09 Merge pull request #396 from hashicorp/f-consul-schema
Port Consul provider to new helper.Schema, add Token support
2014-10-14 12:21:23 -07:00
Mitchell Hashimoto e59e4a6bd9 providers/aws: fix compile error 2014-10-14 12:20:39 -07:00
Mitchell Hashimoto 3e6263332d providers/heroku: set all the things 2014-10-14 12:18:18 -07:00
Mitchell Hashimoto e4a2cb216c Merge pull request #389 from catsby/heroku-go-orgs
Starting point for adding Organization app support for Heroku Provider
2014-10-14 12:16:48 -07:00
Armon Dadgar 1cc95b7a72 provider/consul: Change to GetOk with schema.Helper 2014-10-14 12:16:42 -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
Armon Dadgar 269c5be738 provider/Consul: Support Token. Fixes #378 2014-10-13 11:42:40 -07:00
Armon Dadgar 3e249a4e4e provider/consul: Port to helper.Schema framework 2014-10-13 11:35:45 -07:00
Clint Shryock 764b0259dd Document the organization name field 2014-10-12 12:21:32 -05:00
Clint Shryock 8ab3ebbfb2 clean up the conditional check for Heroku organization 2014-10-12 11:58:18 -05:00
Clint Shryock 5fe2593c16 Add to Organization schema ref. Also gofmt the file 2014-10-12 11:49:57 -05: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
Clint Shryock 95a815deda Starting point for adding Organization app support for Heroku Provider 2014-10-10 14:07:27 -05:00