Merge branch 'stable' into release-2.0.0

pixl8 · Jul 13, 2023 · b8c52eb · b8c52eb
2 parents df1bd78 + 828e9e7
commit b8c52eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.5
+
+* Use non-legacy URLs and endpoints for assets. i.e. s3.regioncode.amazonaws.com and NOT s3-regioncode.amazonaws.com
+
 ## 1.0.4
 
 * [#10](https://github.com/pixl8/preside-ext-s3-storage-provider/issues/10) fix for bad `$raiseError()` function call that was not wanted in the first place

diff --git a/services/S3StorageProvider.cfc b/services/S3StorageProvider.cfc
@@ -28,7 +28,7 @@ component implements="preside.system.services.fileStorage.StorageProvider" displ
 		_setTrashDirectory( arguments.s3subpath & arguments.s3trashRootPath );
 
 		if ( !StructKeyExists( arguments, "s3rootUrl" ) ) {
-			arguments.s3RootUrl = "https://s3-#arguments.s3region#.amazonaws.com/#arguments.s3Bucket##_getPublicDirectory()#";
+			arguments.s3RootUrl = "https://s3.#arguments.s3region#.amazonaws.com/#arguments.s3Bucket##_getPublicDirectory()#";
 		}
 
 		_setRootUrl( arguments.s3rootUrl );