From 67bc88e8e19ceede967d55055702af892617fd68 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Tue, 25 Feb 2025 12:50:52 -0500 Subject: [PATCH 1/3] bump patch [ci skip] --- box.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/box.json b/box.json index 617b3bf..fdd3826 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"Amazon S3 SDK", - "version":"5.8.0", + "version":"5.8.1", "slug":"s3sdk", "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/s3sdk/@build.version@/s3sdk-@build.version@.zip", "author":"Ortus Solutions, Corp", From 48e6be8bed32ddd734bf1049faeaa6ffd00e28bc Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Tue, 7 Oct 2025 12:53:30 -0400 Subject: [PATCH 2/3] Add better debugging error output for XML responses --- models/AmazonS3.cfc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/AmazonS3.cfc b/models/AmazonS3.cfc index 026a48a..41f4b66 100644 --- a/models/AmazonS3.cfc +++ b/models/AmazonS3.cfc @@ -1776,7 +1776,7 @@ component accessors="true" singleton { throw( type = "S3SDKError", message = "Error making Amazon REST Call: #results.message#", - detail = serializeJSON( results.response ) + detail = isXML( results.response ) ? toString( results.response ) : serializeJSON( results.response ) ); } From c43bc3fe12d76429c1ee4d7813496127eaed4996 Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Mon, 27 Oct 2025 18:00:17 -0400 Subject: [PATCH 3/3] Update for AWS Deprecation of Display name --- models/AmazonS3.cfc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/models/AmazonS3.cfc b/models/AmazonS3.cfc index 41f4b66..25e11e6 100644 --- a/models/AmazonS3.cfc +++ b/models/AmazonS3.cfc @@ -430,7 +430,8 @@ component accessors="true" singleton { "type" : node.grantee.XMLAttributes[ "xsi:type" ], "displayName" : "", "permission" : node.permission.XMLText, - "uri" : node.grantee.XMLAttributes[ "xsi:type" ] == "Group" ? node.grantee.uri.xmlText : node.grantee.displayName.xmlText + // TODO: + "uri" : node.grantee.XMLAttributes[ "xsi:type" ] == "Group" ? node.grantee.uri.xmlText : ( node.grantee.displayName.xmlText ?: node.grantee.ID.xmlText ) }; } ); }