fix counting for modifications

mantil-io · Nov 11, 2021 · 7ba6035 · 7ba6035
1 parent 907cc2f
commit 7ba6035
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cli/ui/progress/terraform.go b/cli/ui/progress/terraform.go
@@ -23,8 +23,8 @@ func (p *Terraform) Parse(line string) {
 	if ok := p.parser.Parse(line); !ok {
 		return
 	}
-	p.checkState(oldState)
 	p.updateCounter()
+	p.checkState(oldState)
 }
 
 func (p *Terraform) checkState(oldState terraform.ParserState) {

diff --git a/node/terraform/log_parser.go b/node/terraform/log_parser.go
@@ -18,6 +18,7 @@ var (
 	destroyedRegExp          = regexp.MustCompile(`TF: \w*\.\w*\.(\w*)\.(\w*)\[*\"*([\$\w/]*)"*\]*: Destruction complete after (\w*)`)
 	destroyedRegExpSubModule = regexp.MustCompile(`TF: \w*\.\w*\.\w*\..*\.(\w*)\.(\w*)\[*\"*([\$\w/]*)"*\]*: Destruction complete after (\w*)`)
 	modifiedRegExp           = regexp.MustCompile(`TF: \w*\.\w*\.(\w*)\.(\w*)\[*\"*([\$\w/]*)"*\]*: Modifications complete after (\w*)`)
+	modifiedRegExpSubModule  = regexp.MustCompile(`TF: \w*\.\w*\.\w*\..*\.(\w*)\.(\w*)\[*\"*([\$\w/]*)"*\]*: Modifications complete after (\w*)`)
 	completeRegExp           = regexp.MustCompile(`TF: Apply complete! Resources: (\w*) added, (\w*) changed, (\w*) destroyed.`)
 	planRegExp               = regexp.MustCompile(`TF: Plan: (\w*) to add, (\w*) to change, (\w*) to destroy.`)
 	outputRegExp             = regexp.MustCompile(`TFO: (\w*) = "(.*)"`)
@@ -112,7 +113,8 @@ func (p *Parser) Parse(line string) bool {
 				createdRegExpSubModule.MatchString(line) ||
 				destroyedRegExp.MatchString(line) ||
 				destroyedRegExpSubModule.MatchString(line) ||
-				modifiedRegExp.MatchString(line) {
+				modifiedRegExp.MatchString(line) ||
+				modifiedRegExpSubModule.MatchString(line) {
 				p.counter.inc()
 				return true
 			}