Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: terramate.config.git block with unrecognized blocks #359

Merged
merged 20 commits into from
May 30, 2022
Merged

fix: terramate.config.git block with unrecognized blocks #359

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c6e6bb9
feat: add support for multiple file errors
i4ki May 24, 2022
67df070
make parser deterministic
i4ki May 24, 2022
d94eeab
add more list errors
i4ki May 24, 2022
15dd806
improve errors to support tree of errors
i4ki May 25, 2022
26e2a10
fix linting
i4ki May 25, 2022
5231944
fix err flatten tests
i4ki May 25, 2022
33be6db
improve docs
i4ki May 25, 2022
670f02f
fix docs
i4ki May 25, 2022
742466c
improve docs
i4ki May 25, 2022
3999f49
improve docs even more
i4ki May 25, 2022
e6923d9
change erlist.Errors() to not ignore some errors
i4ki May 25, 2022
34b064c
create helper method
i4ki May 25, 2022
9c2e9bc
fix: stack block with unrecognized blocks
i4ki May 25, 2022
317e382
add file range
i4ki May 25, 2022
ce8019e
fix: unrecognized git blocks
i4ki May 25, 2022
bd5370f
change arg order to make clear
i4ki May 25, 2022
48474aa
add tests
i4ki May 25, 2022
26e8018
fix tests
i4ki May 25, 2022
9fb4c25
Merge branch 'i4k-fix-stack-parser' into i4k-fix-git-parser
i4ki May 25, 2022
7e8db2d
merge with main
i4ki May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions hcl/hcl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,15 +760,20 @@ func parseRootConfig(cfg *RootConfig, block *hclsyntax.Block) error {
return errs.AsError()
}

func parseGitConfig(git *GitConfig, block *hclsyntax.Block) error {
func parseGitConfig(git *GitConfig, gitBlock *hclsyntax.Block) error {
logger := log.With().
Str("action", "parseGitConfig()").
Logger()

logger.Trace().Msg("Range over block attributes.")

errs := errors.L()
for _, attr := range sortedAttributes(block.Body.Attributes) {

for _, block := range gitBlock.Body.Blocks {
errs.Append(errors.E(block.TypeRange, "unrecognized block %q", block.Type))
}

for _, attr := range sortedAttributes(gitBlock.Body.Attributes) {
attrVal, diags := attr.Expr.Value(nil)
if diags.HasErrors() {
errs.Append(errors.E(diags,
Expand Down