Skip to content

fix: support paring warnings without -no-color #911

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

Merged
suzuki-shunsuke merged 1 commit into from
Sep 10, 2023
Merged

fix: support paring warnings without -no-color #911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkg/terraform/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type ParseResult struct {
type PlanParser struct {
Pass *regexp.Regexp
Fail *regexp.Regexp
Warning *regexp.Regexp
OutputsChanges *regexp.Regexp
HasDestroy *regexp.Regexp
HasNoChanges *regexp.Regexp
Expand All @@ -58,6 +59,7 @@ func NewPlanParser() *PlanParser {
return &PlanParser{
Pass: regexp.MustCompile(`(?m)^(Plan: \d|No changes.)`),
Fail: regexp.MustCompile(`(?m)^([│|] )?(Error: )`),
Warning: regexp.MustCompile(`(?m)^([│|] )?(Warning: )`),
OutputsChanges: regexp.MustCompile(`(?m)^Changes to Outputs:`),
// "0 to destroy" should be treated as "no destroy"
HasDestroy: regexp.MustCompile(`(?m)([1-9][0-9]* to destroy.)`),
Expand Down Expand Up @@ -136,7 +138,7 @@ func (p *PlanParser) Parse(body string) ParseResult { //nolint:cyclop
if line == "Changes to Outputs:" && startChangeOutput == -1 {
startChangeOutput = i
}
if strings.HasPrefix(line, "Warning:") && startWarning == -1 {
if p.Warning.MatchString(line) && startWarning == -1 {
startWarning = i
}
// Terraform uses two types of rules.
Expand Down Expand Up @@ -210,17 +212,17 @@ func (p *PlanParser) Parse(body string) ParseResult { //nolint:cyclop
warnings := ""
if startWarning != -1 {
if endWarning == -1 {
warnings = strings.Join(lines[startWarning:], "\n")
warnings = strings.Join(trimBars(lines[startWarning:]), "\n")
} else {
warnings = strings.Join(lines[startWarning:endWarning], "\n")
warnings = strings.Join(trimBars(lines[startWarning:endWarning]), "\n")
}
}

return ParseResult{
Result: strings.TrimSpace(result),
ChangedResult: changeResult,
OutsideTerraform: outsideTerraform,
Warning: warnings,
Warning: strings.TrimSpace(warnings),
HasAddOrUpdateOnly: HasAddOrUpdateOnly,
HasDestroy: hasDestroy,
HasNoChanges: hasNoChanges,
Expand Down