Merge pull request #24278 from disconnect3d/patch-1

Fix a subtle bug with beanstalkCnamePrefixRegexp
hashicorp · Apr 18, 2022 · 2b21054 · 2b21054
2 parents 267aca0 + 4f8a43b
commit 2b21054
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/24278.txt b/.changelog/24278.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_elastic_beanstalk_environment: Correctly set `cname_prefix` attribute
+```
diff --git a/internal/service/elasticbeanstalk/environment.go b/internal/service/elasticbeanstalk/environment.go
@@ -571,7 +571,7 @@ func resourceEnvironmentRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	if env.CNAME != nil {
-		beanstalkCnamePrefixRegexp := regexp.MustCompile(`(^[^.]+)(.\w{2}-\w{4,9}-\d)?.(elasticbeanstalk.com|eb.amazonaws.com.cn)$`)
+		beanstalkCnamePrefixRegexp := regexp.MustCompile(`(^[^.]+)(.\w{2}-\w{4,9}-\d)?\.(elasticbeanstalk\.com|eb\.amazonaws\.com\.cn)$`)
 		var cnamePrefix string
 		cnamePrefixMatch := beanstalkCnamePrefixRegexp.FindStringSubmatch(*env.CNAME)