coveooss / terragrunt

59%

master: 60%

LAST BUILD ON BRANCH v1.4.0

branch: SELECT

CHANGE BRANCH

x

• No branch selected
• add-env_vars
• block-redefined-in-same-file-should-override
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.20.10
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.20.12
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.20.15
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.20.20
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.21.1
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.21.6
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.21.9
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.23.3
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.23.8
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.24.5
• dependabot/go_modules/github.com/aws/aws-sdk-go-1.25.6
• dependabot/go_modules/github.com/hashicorp/terraform-0.12.3
• dependabot/go_modules/github.com/urfave/cli-1.22.1
• dependabot/go_modules/gopkg.in/yaml.v2-2.2.4
• feature/dt-1503-warning-on-invalid-config
• features/stop-looking-after-match-in-import-variables
• jg-old/fix-import-variables
• master
• move-gotemplate
• v1.4.0

Build # 711

Build Type

push

travis-ci

Committed by web-flow

Commit Message

Properly handle multiple blocks with same name in a single file (#87)

* Properly handle multiple blocks with same name in a single file

If we declare a block with the same name, the normal behavior is to overwrite the previous definition with the latest one. That works if blocks are defined in separated files. But it did not work properly when blocks were declared in the same file.

I fixed this in the generic merge function, but that only worked if multiple blocks were declared in an included file but not for the main configuration file. So, I forced the main file to also go through the merge process (starting with an empty structure).

I also discovered a test `no-tf-variable` that was working even if it used the same block many times in the configuration. Fixing this problem caused that specific test to fail.

To ensure that we don't break existing configuration without being noticed, I added a warning when a block is overridden by another block with the same name in a file.

* Changes following review comments

Run Details

3588 of 6031 relevant lines covered (59.49%)

80.56 hits per line