fix pattern

bendrucker · bendrucker · commit ff4c09b10142 · 2025-06-25T10:37:58.000-07:00
diff --git a/rules/models/aws_amplify_app_invalid_basic_auth_credentials.go b/rules/models/aws_amplify_app_invalid_basic_auth_credentials.go
@@ -26,7 +26,7 @@ func NewAwsAmplifyAppInvalidBasicAuthCredentialsRule() *AwsAmplifyAppInvalidBasi
 		resourceType:  "aws_amplify_app",
 		attributeName: "basic_auth_credentials",
 		max:           2000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -80,7 +80,7 @@ func (r *AwsAmplifyAppInvalidBasicAuthCredentialsRule) Check(runner tflint.Runne
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					`basic_auth_credentials does not match valid pattern ^(?s)`,
+					`basic_auth_credentials does not match valid pattern ^(?s).*$`,
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_app_invalid_description.go b/rules/models/aws_amplify_app_invalid_description.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyAppInvalidDescriptionRule() *AwsAmplifyAppInvalidDescriptionRu
 		resourceType:  "aws_amplify_app",
 		attributeName: "description",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyAppInvalidDescriptionRule) Check(runner tflint.Runner) error
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_app_invalid_iam_service_role_arn.go b/rules/models/aws_amplify_app_invalid_iam_service_role_arn.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyAppInvalidIAMServiceRoleArnRule() *AwsAmplifyAppInvalidIAMServ
 		resourceType:  "aws_amplify_app",
 		attributeName: "iam_service_role_arn",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyAppInvalidIAMServiceRoleArnRule) Check(runner tflint.Runner)
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_app_invalid_oauth_token.go b/rules/models/aws_amplify_app_invalid_oauth_token.go
@@ -26,7 +26,7 @@ func NewAwsAmplifyAppInvalidOAuthTokenRule() *AwsAmplifyAppInvalidOAuthTokenRule
 		resourceType:  "aws_amplify_app",
 		attributeName: "oauth_token",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -80,7 +80,7 @@ func (r *AwsAmplifyAppInvalidOAuthTokenRule) Check(runner tflint.Runner) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					`oauth_token does not match valid pattern ^(?s)`,
+					`oauth_token does not match valid pattern ^(?s).*$`,
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_app_invalid_repository.go b/rules/models/aws_amplify_app_invalid_repository.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyAppInvalidRepositoryRule() *AwsAmplifyAppInvalidRepositoryRule
 		resourceType:  "aws_amplify_app",
 		attributeName: "repository",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyAppInvalidRepositoryRule) Check(runner tflint.Runner) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_backend_environment_arn.go b/rules/models/aws_amplify_branch_invalid_backend_environment_arn.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidBackendEnvironmentArnRule() *AwsAmplifyBranchInva
 		resourceType:  "aws_amplify_branch",
 		attributeName: "backend_environment_arn",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidBackendEnvironmentArnRule) Check(runner tflint.R
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_basic_auth_credentials.go b/rules/models/aws_amplify_branch_invalid_basic_auth_credentials.go
@@ -26,7 +26,7 @@ func NewAwsAmplifyBranchInvalidBasicAuthCredentialsRule() *AwsAmplifyBranchInval
 		resourceType:  "aws_amplify_branch",
 		attributeName: "basic_auth_credentials",
 		max:           2000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -80,7 +80,7 @@ func (r *AwsAmplifyBranchInvalidBasicAuthCredentialsRule) Check(runner tflint.Ru
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					`basic_auth_credentials does not match valid pattern ^(?s)`,
+					`basic_auth_credentials does not match valid pattern ^(?s).*$`,
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_description.go b/rules/models/aws_amplify_branch_invalid_description.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidDescriptionRule() *AwsAmplifyBranchInvalidDescrip
 		resourceType:  "aws_amplify_branch",
 		attributeName: "description",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidDescriptionRule) Check(runner tflint.Runner) err
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_display_name.go b/rules/models/aws_amplify_branch_invalid_display_name.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidDisplayNameRule() *AwsAmplifyBranchInvalidDisplay
 		resourceType:  "aws_amplify_branch",
 		attributeName: "display_name",
 		max:           255,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidDisplayNameRule) Check(runner tflint.Runner) err
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_framework.go b/rules/models/aws_amplify_branch_invalid_framework.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidFrameworkRule() *AwsAmplifyBranchInvalidFramework
 		resourceType:  "aws_amplify_branch",
 		attributeName: "framework",
 		max:           255,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidFrameworkRule) Check(runner tflint.Runner) error
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_branch_invalid_pull_request_environment_name.go b/rules/models/aws_amplify_branch_invalid_pull_request_environment_name.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidPullRequestEnvironmentNameRule() *AwsAmplifyBranc
 		resourceType:  "aws_amplify_branch",
 		attributeName: "pull_request_environment_name",
 		max:           20,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidPullRequestEnvironmentNameRule) Check(runner tfl
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/aws_amplify_webhook_invalid_description.go b/rules/models/aws_amplify_webhook_invalid_description.go
@@ -27,7 +27,7 @@ func NewAwsAmplifyWebhookInvalidDescriptionRule() *AwsAmplifyWebhookInvalidDescr
 		resourceType:  "aws_amplify_webhook",
 		attributeName: "description",
 		max:           1000,
-		pattern:       regexp.MustCompile(`^(?s)`),
+		pattern:       regexp.MustCompile(`^(?s).*$`),
 	}
 }
 
@@ -81,7 +81,7 @@ func (r *AwsAmplifyWebhookInvalidDescriptionRule) Check(runner tflint.Runner) er
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
-					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
+					fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
 					attribute.Expr.Range(),
 				)
 			}
diff --git a/rules/models/generator/rule.go b/rules/models/generator/rule.go
@@ -117,6 +117,11 @@ func replacePattern(pattern string) string {
 	reg := regexp.MustCompile(`\\u([0-9A-F]{4})`)
 	replaced := reg.ReplaceAllString(pattern, `\x{$1}`)
 
+	// Handle incomplete patterns like "^(?s)" which should be "^(?s).*$"
+	if replaced == "^(?s)" {
+		return "^(?s).*$"
+	}
+
 	if !strings.HasPrefix(replaced, "^") && !strings.HasSuffix(replaced, "$") {
 		return fmt.Sprintf("^%s$", replaced)
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewAwsAmplifyAppInvalidBasicAuthCredentialsRule() *AwsAmplifyAppInvalidBasi`
`26`	`26`	`resourceType: "aws_amplify_app",`
`27`	`27`	`attributeName: "basic_auth_credentials",`
`28`	`28`	`max: 2000,`
`29`		- pattern: regexp.MustCompile(`^(?s)`),
	`29`	+ pattern: regexp.MustCompile(`^(?s).*$`),
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -80,7 +80,7 @@ func (r *AwsAmplifyAppInvalidBasicAuthCredentialsRule) Check(runner tflint.Runne`
`80`	`80`	`if !r.pattern.MatchString(val) {`
`81`	`81`	`runner.EmitIssue(`
`82`	`82`	`r,`
`83`		- `basic_auth_credentials does not match valid pattern ^(?s)`,
	`83`	+ `basic_auth_credentials does not match valid pattern ^(?s).*$`,
`84`	`84`	`attribute.Expr.Range(),`
`85`	`85`	`)`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func NewAwsAmplifyAppInvalidDescriptionRule() *AwsAmplifyAppInvalidDescriptionRu`
`27`	`27`	`resourceType: "aws_amplify_app",`
`28`	`28`	`attributeName: "description",`
`29`	`29`	`max: 1000,`
`30`		- pattern: regexp.MustCompile(`^(?s)`),
	`30`	+ pattern: regexp.MustCompile(`^(?s).*$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsAmplifyAppInvalidDescriptionRule) Check(runner tflint.Runner) error`
`81`	`81`	`if !r.pattern.MatchString(val) {`
`82`	`82`	`runner.EmitIssue(`
`83`	`83`	`r,`
`84`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func NewAwsAmplifyBranchInvalidBackendEnvironmentArnRule() *AwsAmplifyBranchInva`
`27`	`27`	`resourceType: "aws_amplify_branch",`
`28`	`28`	`attributeName: "backend_environment_arn",`
`29`	`29`	`max: 1000,`
`30`		- pattern: regexp.MustCompile(`^(?s)`),
	`30`	+ pattern: regexp.MustCompile(`^(?s).*$`),
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -81,7 +81,7 @@ func (r *AwsAmplifyBranchInvalidBackendEnvironmentArnRule) Check(runner tflint.R`
`81`	`81`	`if !r.pattern.MatchString(val) {`
`82`	`82`	`runner.EmitIssue(`
`83`	`83`	`r,`
`84`		- fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s)`),
	`84`	+ fmt.Sprintf(`"%s" does not match valid pattern %s`, truncateLongMessage(val), `^(?s).*$`),
`85`	`85`	`attribute.Expr.Range(),`
`86`	`86`	`)`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewAwsAmplifyBranchInvalidBasicAuthCredentialsRule() *AwsAmplifyBranchInval`
`26`	`26`	`resourceType: "aws_amplify_branch",`
`27`	`27`	`attributeName: "basic_auth_credentials",`
`28`	`28`	`max: 2000,`
`29`		- pattern: regexp.MustCompile(`^(?s)`),
	`29`	+ pattern: regexp.MustCompile(`^(?s).*$`),
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -80,7 +80,7 @@ func (r *AwsAmplifyBranchInvalidBasicAuthCredentialsRule) Check(runner tflint.Ru`
`80`	`80`	`if !r.pattern.MatchString(val) {`
`81`	`81`	`runner.EmitIssue(`
`82`	`82`	`r,`
`83`		- `basic_auth_credentials does not match valid pattern ^(?s)`,
	`83`	+ `basic_auth_credentials does not match valid pattern ^(?s).*$`,
`84`	`84`	`attribute.Expr.Range(),`
`85`	`85`	`)`
`86`	`86`	`}`