Commit Graph

2800 Commits

Author SHA1 Message Date
Mitchell Hashimoto
045e23e55f Update CHANGELOG.md 2015-01-28 08:33:10 -08:00
Mitchell Hashimoto
36b7f08850 Merge pull request #877 from hashicorp/i-859-ignore-ec2-root-volume
providers/aws: ignore ec2 root devices
2015-01-28 08:32:27 -08:00
Mitchell Hashimoto
f742ccb606 Merge pull request #876 from ceh/command-win-tests
command: fix test failures on OpenBSD, Windows
2015-01-28 08:24:17 -08:00
Paul Hinze
3cb5ba01a7 whitespace: fix mixed case indent 2015-01-28 05:16:04 -06:00
Paul Hinze
c88c4a33e1 providers/aws: ignore ec2 root devices
fixes #859

EC2 root block devices are attached automatically at launch [1] and show
up in DescribeInstances responses from then on. By skipping these when
recording state, Terraform can avoid thinking there should be block
device changes when there are none.

Note this requires that https://github.com/mitchellh/goamz/pull/214 land
first so the proper field is exposed.

[1] http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/RootDeviceStorage.html
2015-01-28 05:14:21 -06:00
Emil Hessman
97227a5c70 config/module: fix detection of file paths on Windows
Absolute file paths were not correctly detected by module.Detect
when using url.Parse to parse the source URL. Wrap the detection
with urlParse to properly handle file path detections on Windows.

Fixes command test failures on Windows.
2015-01-28 10:40:32 +01:00
Emil Hessman
65177edd1e config/module: fix test failures on Windows
When parsing URLs on Windows, assume it is a drive letter path
if the second element is a ':' character. Format the drive letter
path as a "file:///"-path prior to parsing the URL.

Fixes test failures of the following form in command on Windows:

=== RUN TestApply_plan
--- FAIL: TestApply_plan (0.00s)
        apply_test.go:379: bad: 1

		module download not supported for scheme 'c'
2015-01-28 08:19:04 +01:00
Emil Hessman
b40c2fe997 command: fix test failure on Windows
URLs are `/`-based. Windows path Separator is `\`.
Convert `\` in test fixture path to `/` with filepath.ToSlash
such that proper URLs are constructed even on Windows.

Fixes a test failure on Windows.
2015-01-28 08:13:44 +01:00
Emil Hessman
92e68c1ee6 command: fix test failure on Windows
Adjust the laddr argument to net.Listen to the form host:port,
as documented for net.Dial.

Fixes a test failure on Windows.
2015-01-28 08:10:52 +01:00
Paul Hinze
c01f1a5ef0 Merge pull request #864 from paystee/doc_boolean_syntax
docs: update available boolean values
2015-01-27 19:40:13 -06:00
Paul Hinze
6e9c69b437 Merge pull request #871 from hashicorp/i-824-schema-field-reader-config-defaults
helper/schema: apply schema defaults at the field level when readi...
2015-01-27 19:35:56 -06:00
Paul Hinze
5d4e69cc80 helper/schema: apply schema defaults at the field level when reading from config
We were waiting until the higher-level (m schemaMap) diffString method
to apply defaults, which was messing with set hashcode evaluation for
cases when a field with a default is included in the hash function.

fixes #824
2015-01-27 18:18:57 -06:00
Mitchell Hashimoto
e147d2d475 Merge pull request #872 from ceh/config-module-win-tests
config/module: fix test failures on Windows
2015-01-27 14:22:59 -08:00
Emil Hessman
d5a49363d7 config/module: handle absolute file paths on Windows
Using url.Parse to parse an absolute file path on Windows yields
a URL type where the Path element is prefixed by a slash.

For example, parsing "file:///C:/Users/user" gives a URL type
with Path:"/C:/Users/user".

According to golang.org/issue/6027, the parsing is correct as is.

The leading slash on the Path must be eliminated before any file
operations.

This commit introduces a urlParse function which wraps the url.Parse
functionality and removes the leading slash in Path for absolute file
paths on Windows.

Fixes config/module test failures on Windows.
2015-01-27 23:18:47 +01:00
Emil Hessman
78d1fc742f config/module: adjust HttpGetter test to fix Windows test failure
Specify laddr on the form host:port in the call to net.Listen as
documented for net.Dial, see godoc.org/net#Dial

Fixes the following test failures on Windows:

> go test -run=TestHttpGetter
--- FAIL: TestHttpGetter_header (0.00s)
        get_http_test.go:31: err: Get http://[::]:52101/header?terraform-get=1: dial tcp [::]:52101: ConnectEx tcp: The requested address is not valid in its context.
--- FAIL: TestHttpGetter_meta (0.00s)
        get_http_test.go:55: err: Get http://[::]:52103/meta?terraform-get=1: dial tcp [::]:52103: ConnectEx tcp: The requested address is not valid in its context.
--- FAIL: TestHttpGetter_metaSubdir (0.00s)
        get_http_test.go:79: err: Get http://[::]:52105/meta-subdir?terraform-get=1: dial tcp [::]:52105: ConnectEx tcp: The requested address is not valid in its context.
FAIL
exit status 1
FAIL github.com/hashicorp/terraform/config/module    0.054s
2015-01-27 23:18:46 +01:00
Emil Hessman
74cf8fcabd config/module: adjust FileDetector tests for Windows
"/foo" is not an absolute path on Windows. Adjust the FileDetector
tests to take that into account when verifying the results.

Fixes FileDetector test failures on Windows.
2015-01-27 23:18:46 +01:00
Emil Hessman
160e4f926e config/module: fix panic on Windows when running tests
On Windows, Go returns paths with the `\` path separator.
Make sure we are using `/` even on Windows since URLs are `/`-based.
2015-01-27 07:52:51 +01:00
Mitchell Hashimoto
c49ae2baa0 Update CHANGELOG 2015-01-26 18:20:42 -08:00
Mitchell Hashimoto
703a11ed7e Comment Makefile 2015-01-26 18:19:32 -08:00
Seth Vargo
918ba4c3be Merge pull request #851 from hashicorp/sethvargo/aws_envvars
Use standard AWS environment variables
2015-01-25 13:29:32 -05:00
Anton Tereshchenkov
819bc2b032 docs: update available boolean values 2015-01-25 12:38:15 +08:00
Mitchell Hashimoto
3b27258abe Merge pull request #862 from hashicorp/count-and-variables-docs
docs: add example of using variables with count
2015-01-24 18:14:22 -08:00
Paul Hinze
dec0c467e1 docs: add example of using variables with count
closes #861
2015-01-24 18:29:36 -06:00
Mitchell Hashimoto
5dce9a9041 Merge pull request #860 from hashicorp/test-timeout
Makefile: bump test timeout from 10s to 30s
2015-01-24 08:29:36 -08:00
Paul Hinze
bba3890f32 Makefile: bump test timeout from 10s to 30s
on a slow internet connection, the BitBucket tests were taking over 10s
and panicing the test run
2015-01-24 07:57:15 -08:00
Sander van Harmelen
a3ef8bed68 Merge pull request #849 from gfloyd/spot-price
Add spot_price parameter to aws_launch_configuration resource
2015-01-23 23:48:09 +01:00
Graham Floyd
91378ce0af Add test for launch configuration with spot price 2015-01-23 15:51:25 -06:00
Seth Vargo
5713b7abcc Remove extra newline 2015-01-22 16:09:26 -05:00
Seth Vargo
91ed8ae916 Update eventmachine to a version that compiles 2015-01-22 16:09:25 -05:00
Seth Vargo
0a7dea5532 Improve readability and purpose of multi-env default test 2015-01-22 16:09:25 -05:00
Seth Vargo
038d241043 Update the documentation to read the new AWS environment variables 2015-01-22 16:09:25 -05:00
Seth Vargo
072a1cf353 Read the "standard" AWS environment variables
This is 100% backwards-compatible
2015-01-22 16:09:25 -05:00
Seth Vargo
4980838802 Merge pull request #854 from hashicorp/sethvargo/travis_docker
Run on the new Travis Docker infrastructure
2015-01-22 16:08:42 -05:00
Seth Vargo
b901f31645 Post to IRC 2015-01-22 16:02:03 -05:00
Seth Vargo
a61c409fd2 Only test the master branch (and PRs) 2015-01-22 15:57:01 -05:00
Seth Vargo
100270378b Run on the new Travis Docker infrastructure 2015-01-22 15:56:32 -05:00
Seth Vargo
265599f5ff Merge pull request #852 from EvanKrall/patch-1
Fix comment in consul provider to not mention DigitalOcean
2015-01-22 15:51:01 -05:00
Evan Krall
090a30e988 Fix comment in consul provider to not mention digitalocean 2015-01-22 12:45:55 -08:00
Graham Floyd
c9a0627f13 Add spot_price parameter to aws_launch_configuration resource 2015-01-21 22:48:04 -06:00
Mitchell Hashimoto
a3faad4f0d Merge pull request #844 from atlassian/remove-outdated-comment
No longer needed after merging of PR 804.
2015-01-21 09:55:01 -08:00
Otto Jongerius
7759a28e9c No longer needed after merging of PR 804. 2015-01-21 18:48:28 +11:00
Paul Hinze
ffe5fb03b7 Merge pull request #842 from hashicorp/updatedeps-gox
Makefile: roll gox into updatedeps
2015-01-20 17:46:39 -08:00
Paul Hinze
f69bdb608c Makefile: roll gox into updatedeps
No need to have an extra dev bootstrapping step when we can automate it!
2015-01-20 17:38:19 -08:00
Armon Dadgar
df71834ff7 Merge pull request #831 from gulyasm/log-typo
Fixed wrong cross zone balancing error log.
2015-01-20 13:20:25 -08:00
Armon Dadgar
4a6c74a779 Merge pull request #833 from philk/minor_refresh_fix
Fix typo in refresh command error output
2015-01-20 13:19:48 -08:00
Phil Kates
b211d69dde Fix typo in refresh command error
Noticed this while I was digging around to see how the commands work.
2015-01-17 15:43:04 -08:00
gulyasm
0486dd0624 Fixed wrong cross zone balancing error log.
If updating the cross zone balancing in the aws elb resource fails, the
error log claimed that the health check configuration failed. Fixed.
2015-01-17 16:20:35 +01:00
Mitchell Hashimoto
ef1f2d5e71 Merge pull request #828 from ceh/go-vet
Makefile: add vet target
2015-01-16 13:30:13 -08:00
Emil Hessman
65878791c0 Makefile: add vet target
Add a vet target in order to catch suspicious constructs
reported by go vet.

Vet has successfully detected problems in the past,
for example, see

  482460c4c8
  fc36b1cd94
  68a41035a9
  7b704fb77d
  4f3f85b165
  95fa353ee9
  4bfe18b40d

Some vet flags are noisy. In particular, the following flags
reports a large amount of generally unharmful constructs:

  -assign: check for useless assignments
  -composites: check that composite literals used field-keyed
               elements
  -shadow: check for shadowed variables
  -shadowstrict: whether to be strict about shadowing
  -unreachable: check for unreachable code

In order to skip running the flags mentioned above, vet is
invoked on a directory basis with 'go tool vet .' since package-
level type-checking with 'go vet' doesn't accept flags.

Hence, each file is vetted in isolation, which is weaker than
package-level type-checking. But nevertheless, it might catch
suspicious constructs that pose a real problem.

The vet target runs the following flags on the entire repo:

  -asmdecl: check assembly against Go declarations
  -atomic: check for common mistaken usages of the
           sync/atomic package
  -bool: check for mistakes involving boolean operators
  -buildtags: check that +build tags are valid
  -copylocks: check that locks are not passed by value
  -methods: check that canonically named methods are canonically
            defined
  -nilfunc: check for comparisons between functions and nil
  -printf: check printf-like invocations
  -rangeloops: check that range loop variables are used correctly
  -shift: check for useless shifts
  -structtags: check that struct field tags have canonical format
               and apply to exported fields as needed
  -unsafeptr: check for misuse of unsafe.Pointer

Now and then, it might make sense to check the output of

VETARGS=-unreachable make vet

manually, just in case it detects several lines of dead code etc.
2015-01-16 22:20:32 +01:00
Mitchell Hashimoto
514f6e7b22 update CHANGELOG 2015-01-16 10:57:21 -08:00