Merge pull request #27704 from Ken-Sumi1019/s3-object-can-read-applic…

…ation-xml s3 datasource aws_s3_object can read application/xml
hashicorp · Feb 10, 2023 · 3c8bd5a · 3c8bd5a
2 parents be4adb8 + 8a91481
commit 3c8bd5a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.changelog/27704.txt b/.changelog/27704.txt
@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_s3_object: Expand content types that can be read from S3 to include some human-readable application types (e.g., `application/xml`, `application/atom+xml`)
+```
+
+```release-note:enhancement
+data-source/aws_s3_bucket_object: Expand content types that can be read from S3 to include some human-readable application types (e.g., `application/xml`, `application/atom+xml`)
+```
diff --git a/internal/service/s3/object_data_source.go b/internal/service/s3/object_data_source.go
@@ -256,8 +256,15 @@ func isContentTypeAllowed(contentType *string) bool {
 	}
 
 	allowedContentTypes := []*regexp.Regexp{
-		regexp.MustCompile("^text/.+"),
-		regexp.MustCompile("^application/json$"),
+		regexp.MustCompile(`^application/atom\+xml$`),
+		regexp.MustCompile(`^application/json$`),
+		regexp.MustCompile(`^application/ld\+json$`),
+		regexp.MustCompile(`^application/x-csh$`),
+		regexp.MustCompile(`^application/x-httpd-php$`),
+		regexp.MustCompile(`^application/x-sh$`),
+		regexp.MustCompile(`^application/xhtml\+xml$`),
+		regexp.MustCompile(`^application/xml$`),
+		regexp.MustCompile(`^text/.+`),
 	}
 
 	for _, r := range allowedContentTypes {