Merge pull request #107 from KeisukeYamashita/fix-error-parse-character

Fix error parse regex char for Terraform >= 0.15
mercari · Jan 21, 2022 · 0d9fcb3 · 0d9fcb3
2 parents 8309bd1 + 1425159
commit 0d9fcb3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/terraform/parser.go b/terraform/parser.go
@@ -62,7 +62,7 @@ func NewFmtParser() *FmtParser {
 func NewPlanParser() *PlanParser {
 	return &PlanParser{
 		Pass: regexp.MustCompile(`(?m)^(Plan: \d|No changes.)`),
-		Fail: regexp.MustCompile(`(?m)^(\|\s{1})?(Error: )`),
+		Fail: regexp.MustCompile(`(?m)^(│\s{1})?(Error: )`),
 		// "0 to destroy" should be treated as "no destroy"
 		HasDestroy:   regexp.MustCompile(`(?m)([1-9][0-9]* to destroy.)`),
 		HasNoChanges: regexp.MustCompile(`(?m)^(No changes. Infrastructure is up-to-date.)`),
@@ -73,7 +73,7 @@ func NewPlanParser() *PlanParser {
 func NewApplyParser() *ApplyParser {
 	return &ApplyParser{
 		Pass: regexp.MustCompile(`(?m)^(Apply complete!)`),
-		Fail: regexp.MustCompile(`(?m)^(\|\s{1})?(Error: )`),
+		Fail: regexp.MustCompile(`(?m)^(│\s{1})?(Error: )`),
 	}
 }
 

diff --git a/terraform/parser_test.go b/terraform/parser_test.go
@@ -104,12 +104,14 @@ xxxxxxxxx
 xxxxxxxxx
 xxxxxxxxx
 
-| Error: Error refreshing state: 4 error(s) occurred:
-| 
-| * google_sql_database.main: 1 error(s) occurred:
-| 
-| * google_sql_database.main: google_sql_database.main: Error reading SQL Database "main" in instance "main-master-instance": googleapi: Error 409: The instance or operation is not in an appropriate state to handle the request., invalidState
-| * google_sql_user.proxyuser_main: 1 error(s) occurred:
+╷
+│ Error: Error refreshing state: 4 error(s) occurred:
+│
+│ * google_sql_database.main: 1 error(s) occurred:
+│ 
+│ * google_sql_database.main: google_sql_database.main: Error reading SQL Database "main" in instance "main-master-instance": googleapi: Error 409: The instance or operation is not in an appropriate state to handle the request., invalidState
+│ * google_sql_user.proxyuser_main: 1 error(s) occurred:
+╵
 `
 
 const planNoChanges = `
@@ -366,13 +368,12 @@ aws_iam_role_policy_attachment.datadog_aws_integration: Refreshing state...
 google_dns_managed_zone.tfnotifyapps_com: Refreshing state...
 google_dns_record_set.dev_tfnotifyapps_com: Refreshing state...
 
-
-| 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
-|
-|   on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
-|    6: resource "google_project_service" "gcp_api_service" {
-|
-|
+╷
+│ 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
+│
+│   on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
+│    6: resource "google_project_service" "gcp_api_service" {
+╵
 `
 
 func TestDefaultParserParse(t *testing.T) {
@@ -493,12 +494,13 @@ func TestPlanParserParse(t *testing.T) {
 			name: "plan ng pattern 0.15",
 			body: planFailureResult0_15,
 			result: ParseResult{
-				Result: `| Error: Error refreshing state: 4 error(s) occurred:
-| 
-| * google_sql_database.main: 1 error(s) occurred:
-| 
-| * google_sql_database.main: google_sql_database.main: Error reading SQL Database "main" in instance "main-master-instance": googleapi: Error 409: The instance or operation is not in an appropriate state to handle the request., invalidState
-| * google_sql_user.proxyuser_main: 1 error(s) occurred:`,
+				Result: `│ Error: Error refreshing state: 4 error(s) occurred:
+│
+│ * google_sql_database.main: 1 error(s) occurred:
+│ 
+│ * google_sql_database.main: google_sql_database.main: Error reading SQL Database "main" in instance "main-master-instance": googleapi: Error 409: The instance or operation is not in an appropriate state to handle the request., invalidState
+│ * google_sql_user.proxyuser_main: 1 error(s) occurred:
+╵`,
 				HasAddOrUpdateOnly: false,
 				HasDestroy:         false,
 				HasNoChanges:       false,
@@ -610,12 +612,11 @@ func TestApplyParserParse(t *testing.T) {
 			name: "apply ng pattern 0.15",
 			body: applyFailureResult0_15,
 			result: ParseResult{
-				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
-|
-|   on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
-|    6: resource "google_project_service" "gcp_api_service" {
-|
-|`,
+				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
+│
+│   on .terraform/modules/tfnotify-jp-tfnotify-prod/google_project_service.tf line 6, in resource "google_project_service" "gcp_api_service":
+│    6: resource "google_project_service" "gcp_api_service" {
+╵`,
 				ExitCode: 1,
 				Error:    nil,
 			},