Commit Graph

3056 Commits

Author SHA1 Message Date
Clint 5f4e2cb72e Update CHANGELOG.md 2015-02-11 13:12:52 -08:00
Clint Shryock 5602348695 formatting, cleanups 2015-02-11 11:40:49 -08:00
Clint Shryock a5040ecc03 Update hashcode to always generate a positive 2015-02-11 10:59:21 -08:00
Radek Simko 3366f1924f Add docs for AWS IG tags 2015-02-11 13:33:59 +00:00
Dave Cunningham 106a1c62f5 Revert to upstream oauth2 2015-02-11 01:46:40 -05:00
Dave Cunningham 66ad26f19a Merge branch 'master' into oauth2 2015-02-11 00:37:13 -05:00
Clint 9d53689f11 Merge pull request #965 from catsby/readme-acc-update
Update README on running acceptance tests
2015-02-10 14:47:52 -08:00
Clint Shryock f8e6edb8c3 update README on running acceptance tests. Mostly formatting/typo fix 2015-02-10 14:41:39 -08:00
jba 3b0b41c9a1 allow vpc_peering_connection_id in aws_route_table 2015-02-10 17:50:29 +01:00
Paul Hinze 2e091bb210 Merge pull request #961 from bitglue/elb_doc
Clarify usage of `aws_elb`
2015-02-10 10:24:11 -06:00
Phil Frost 81b5c238ef Clarify usage of `aws_elb`
Address confusion regarding ELB in VPC or EC2-classic. See #958.
2015-02-10 11:13:54 -05:00
Paul Hinze 3b5ee93f73 Merge pull request #954 from julienba/master
fix the GOPATH/bin for vagrant
2015-02-10 08:58:40 -06:00
Paul Hinze 448edd1a83 Merge pull request #959 from BashtonLtd/gce_instance_template
GCE instance template support
2015-02-10 08:57:45 -06:00
David Watson 418bf2a692 Remove leftover todo comment. 2015-02-10 14:31:43 +00:00
Paul Hinze 24a9559365 Merge pull request #960 from BashtonLtd/gce_self_links
Add SelfLink fields to all GCE resources
2015-02-10 08:10:20 -06:00
Paul Hinze a880368d8e Merge pull request #892 from sparkprime/gcp_image
Allow specifying project or full URL when specifying image
2015-02-10 08:01:52 -06:00
David Watson a3ca34ac88 Add SelfLink field to GCE route resource. 2015-02-10 11:15:07 +00:00
David Watson 91b000fd31 Add SelfLink field to GCE network resource. 2015-02-10 11:14:37 +00:00
David Watson 4e1a421652 Add SelfLink field to GCE firewall resource. 2015-02-10 11:14:15 +00:00
David Watson 2b26177903 Add SelfLink field to GCE disk resource. 2015-02-10 11:13:55 +00:00
David Watson 006b98cdae Add optional to disk_name field. 2015-02-10 10:49:20 +00:00
David Watson 7df536345c Add docs for google Instance Template. 2015-02-10 10:41:21 +00:00
David Watson ec1f874bdc Add tests for Instance Template support to google provider. 2015-02-10 10:29:49 +00:00
David Watson dfa97dfc17 Add Instance Template support to google provider. 2015-02-10 10:29:27 +00:00
Dave Cunningham 26b90c10a0 Merge branch 'master' into gcp_image 2015-02-10 03:25:45 -05:00
Dave Cunningham e898daf573 Merge branch 'master' into oauth2 2015-02-09 20:07:36 -05:00
Paul Hinze e81c995301 Merge pull request #951 from sparkprime/fix_health_check
Fix a number of healthcheck bugs
2015-02-09 18:50:14 -06:00
Paul Hinze 6e27da8c47 Merge pull request #937 from sparkprime/pr_network_interface
Deprecated 'network', introduce 'network_interface'
2015-02-09 18:49:56 -06:00
jba 2552590e22 fix the GOPATH/bin 2015-02-09 11:27:00 +01:00
Dave Cunningham fbe99605e6 Fix whitespace 2015-02-07 19:05:19 -05:00
Dave Cunningham 4e4dcac276 Fix a number of healthcheck bugs 2015-02-07 19:03:18 -05:00
Mitchell Hashimoto 05078bce47 Merge pull request #949 from lalyos/fix-version-number
fixing version numbers: RCs should be labeled x.x.x-rcx
2015-02-07 08:21:25 -08:00
lalyos 92540d3d88 fixing version numbers RCs should be labeled x.x.x-rcx
see conversation with ryanuber: https://github.com/hashicorp/go-checkpoint/issues/2#issuecomment-73199209
2015-02-07 16:56:56 +01:00
Jack Pearkes db9f98a752 Merge pull request #947 from hashicorp/fix-chainable-timer
Attach Chainable timers to Engine render loop
2015-02-06 15:47:20 -08:00
Amadeus Demarzi 61536cb1f8 Attach Chainable timers to Engine render loop
Previous to this commit, the Chainable class which is responsible for
iterating on the sequence of events in the intro Terraform animation,
was using setTimeout and thus could result in very messed up race
conditions when triggering physics changes.

This commit attaches the .wait timers to the Engine.render loop which
should enable everything to stay in sync.
2015-02-06 15:28:26 -08:00
Paul Hinze 6f5234c52f Merge pull request #916 from gosuri/aws-elb-update-issue
fix for #915 - aws_elb.health_check attributes does not update during update
2015-02-06 17:14:44 -06:00
Greg Osuri 481b3c7e3b provider/aws: fix for #915, disabling ForceNew while updating elb healthchecks 2015-02-06 15:03:52 -08:00
Paul Hinze 5afed7e52b Merge pull request #931 from julienvey/desc_firewall
provider/gce: Add description in firewall resource
2015-02-06 16:31:53 -06:00
Julien Vey 33eebbed51 provider/gce: Add description in firewall resource 2015-02-06 13:33:02 +01:00
Dave Cunningham b385093502 Deprecated 'network', introduce 'network_interface' 2015-02-06 03:21:22 -05:00
Enrique Garbi 2b3015f66a Added missing line for aws_launch_configuration resource on AWS provider docs 2015-02-05 17:05:14 +00:00
Emil Hessman e7bbbfb098 helper/url: add Windows 'safe' URL Parse wrapper
Pull out the urlParse function, which was introduced in config/module,
into a helper package.
2015-02-05 11:16:54 +01:00
Emil Hessman 6d9c4ea78f terraform: fix ContextPlan test failure on Windows
The attributes in the diff are %#v-formatted. This means that all `\`
characters in the Windows paths are escaped with a `\`. We need to
escape the `\` characters in cwd, module, and root before doing any
comparison work.

Fixes the following test failure on Windows:

--- FAIL: TestContextPlan_pathVar (0.00s)
        context_test.go:3833: bad:
                DIFF:

                CREATE: aws_instance.foo
                  cwd:    "" => "C:\\Users\\ceh\\src\\github.com\\hashicorp\\terraform\\terraform/barpath"
                  module: "" => "C:\\Users\\ceh\\src\\github.com\\hashicorp\\terraform\\terraform\\test-fixtures\\plan-path-var/foopath"
                  root:   "" => "C:\\Users\\ceh\\src\\github.com\\hashicorp\\terraform\\terraform\\test-fixtures\\plan-path-var/barpath"
                  type:   "" => "aws_instance"

                STATE:

                <no state>

                expected:

                DIFF:

                CREATE: aws_instance.foo
                  cwd:    "" => "C:\Users\ceh\src\github.com\hashicorp\terraform\terraform/barpath"
                  module: "" => "C:\Users\ceh\src\github.com\hashicorp\terraform\terraform\test-fixtures\plan-path-var/foopath"
                  root:   "" => "C:\Users\ceh\src\github.com\hashicorp\terraform\terraform\test-fixtures\plan-path-var/barpath"
                  type:   "" => "aws_instance"

                STATE:

                <no state>
FAIL
exit status 1
FAIL    github.com/hashicorp/terraform/terraform        0.050s
2015-02-04 18:26:42 +01:00
Paul Hinze 26156981d7 Merge pull request #917 from methane/fix-stringer
Fix stringer error on helper/schema/schema.go
2015-02-04 10:09:53 -06:00
Paul Hinze c21907850d Merge pull request #921 from hashicorp/fix-diffreader-map-handling
helper/schema: fix DiffFieldReader map handling
2015-02-04 10:06:13 -06:00
Paul Hinze 926effb800 providers/aws: read ASG termination policies
Right now we yield a perpetual diff on ASGs because we're not reading
termination policies back out in the provider.

This depends on https://github.com/mitchellh/goamz/pull/218 and fixes
it.
2015-02-04 10:00:03 -06:00
Paul Hinze 4e8e3dad86 DiffFieldReader: filter all '#' fields from sets
Now that readMap filters out '#' fields, when maps are nested in sets,
we exposed a related bug where a set was iterating over nested maps and
expected the '#' key to be present in those nested maps.

By skipping _all_ count fields when iterating over set keys, all is
right with the world again.
2015-02-04 09:25:45 -06:00
Emil Hessman 9fc6b2ee5b make.bat: Makefile-like test functionality for Windows
Add make.bat which has the same test functionality as the Makefile.

Makes it easier to run tests from the command prompt on Windows
platforms.
2015-02-04 16:25:20 +01:00
Paul Hinze 219aa3e788 helper/schema: fix DiffFieldReader map handling
An `InstanceDiff` will include `ResourceAttrDiff` entries for the
"length" / `#` field of maps. This makes sense, since for something like
`terraform plan` it's useful to see when counts are changing.

The `DiffFieldReader` was not taking these entries into account when
reading maps out, and was therefore incorrectly returning maps that
included an extra `'#'` field, which was causing all sorts of havoc
for providers (extra tags on AWS instances, broken google compute
instance launch, possibly others).

 * fixes #914 - extra tags on AWS instances
 * fixes #883 - general core issue sprouted from #757
 * removes the hack+TODO from #757
2015-02-03 20:17:57 -06:00
Paul Hinze 680fa3c0d8 Update CHANGELOG.md 2015-02-03 16:45:01 -06:00