Merge branch 'hotfix-1.0.7' into stable

pixl8 · Jul 13, 2023 · 828e9e7 · 828e9e7
2 parents 92d7a65 + a9d0fd8
commit 828e9e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
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
@@ -32,7 +32,7 @@ component implements="preside.system.services.fileStorage.StorageProvider" displ
 		_setCliPath( arguments.cliPath );
 
 		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()#";
 		}
 
 
@@ -357,7 +357,7 @@ component implements="preside.system.services.fileStorage.StorageProvider" displ
 		var credentials = CreateObject( "java", "org.jets3t.service.security.AWSCredentials" ).init( arguments.accessKey, arguments.secretKey );
 		var props       = CreateObject( "java", "org.jets3t.service.Jets3tProperties" ).init();
 
-		props.setProperty( "s3service.s3-endpoint", "s3-#arguments.region#.amazonaws.com" );
+		props.setProperty( "s3service.s3-endpoint", "s3.#arguments.region#.amazonaws.com" );
 
 		return CreateObject( "java", "org.jets3t.service.impl.rest.httpclient.RestS3Service" ).init( credentials, NullValue(), NullValue(), props );
 	}