Skip to content

Commit 823ebf5

Browse files
Update regex for fail parser
Signed-off-by: KeisukeYamashita <[email protected]>
1 parent b364d7a commit 823ebf5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

terraform/parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewFmtParser() *FmtParser {
6262
func NewPlanParser() *PlanParser {
6363
return &PlanParser{
6464
Pass: regexp.MustCompile(`(?m)^(Plan: \d|No changes.)`),
65-
Fail: regexp.MustCompile(`(?m)^(Error: )`),
65+
Fail: regexp.MustCompile(`(?m)^(\|\s{1})?(Error: )`),
6666
// "0 to destroy" should be treated as "no destroy"
6767
HasDestroy: regexp.MustCompile(`(?m)([1-9][0-9]* to destroy.)`),
6868
HasNoChanges: regexp.MustCompile(`(?m)^(No changes. Infrastructure is up-to-date.)`),
@@ -73,7 +73,7 @@ func NewPlanParser() *PlanParser {
7373
func NewApplyParser() *ApplyParser {
7474
return &ApplyParser{
7575
Pass: regexp.MustCompile(`(?m)^(Apply complete!)`),
76-
Fail: regexp.MustCompile(`(?m)^(Error: )`),
76+
Fail: regexp.MustCompile(`(?m)^(\|\s{1})?(Error: )`),
7777
}
7878
}
7979

terraform/parser_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ google_dns_record_set.dev_tfnotifyapps_com: Refreshing state...
368368
369369
370370
| Error: Batch "project/tfnotify-jp-tfnotify-prod/services:batchEnable" for request "Enable Project Services tfnotify-jp-tfnotify-prod: map[logging.googleapis.com:{}]" returned error: failed to send enable services request: googleapi: Error 403: The caller does not have permission, forbidden
371-
|
371+
|
372372
| on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
373373
| 6: resource "google_project_service" "gcp_api_service" {
374374
|
@@ -612,10 +612,10 @@ func TestApplyParserParse(t *testing.T) {
612612
result: ParseResult{
613613
Result: `| Error: Batch "project/tfnotify-jp-tfnotify-prod/services:batchEnable" for request "Enable Project Services tfnotify-jp-tfnotify-prod: map[logging.googleapis.com:{}]" returned error: failed to send enable services request: googleapi: Error 403: The caller does not have permission, forbidden
614614
|
615-
| on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
616-
| 6: resource "google_project_service" "gcp_api_service" {
615+
| on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
616+
| 6: resource "google_project_service" "gcp_api_service" {
617617
|
618-
`,
618+
|`,
619619
ExitCode: 1,
620620
Error: nil,
621621
},

0 commit comments

Comments
 (0)