catch if we reach the action limit on blackbaze

lucee · Sep 4, 2023 · b3ef7ee · b3ef7ee
1 parent d6bd80e
commit b3ef7ee
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/tests/functions/Util.cfc b/tests/functions/Util.cfc
@@ -34,9 +34,21 @@ component  {
 	}
 
 	public static boolean function isBackBlazeNotSupported() {
-		res= getBackBlazeCredentials();
-		return isNull(res) || len(res)==0;
+		if(!isNull(server.isBackBlazeNotSupported)) return server.isBackBlazeNotSupported;
+		var cred= getBackBlazeCredentials();
+		if(isNull(cred) || len(cred)==0) return true;
+		try {
+			S3Exists(bucketName:"test-is-supported", accessKeyId:cred.ACCESS_KEY_ID, secretAccessKey:cred.SECRET_KEY, host:(isNull(cred.HOST)?nullvalue():cred.HOST));
+		}
+		catch(e) {
+			if(findNoCase("increase your cap", e.message)) {
+				server.isBackBlazeNotSupported=true;
+				return true;
+			}
+		}
+		return false;
 	}
+
 	public static struct function getBackBlazeCredentials() {
 		var ACCESS_KEY_ID=server.system.environment.S3_BACKBLAZE_ACCESS_KEY_ID?:nullValue();
 		if(isNull(ACCESS_KEY_ID) || isEmpty(ACCESS_KEY_ID)) return {};

diff --git a/tests/tickets/Util.cfc b/tests/tickets/Util.cfc
@@ -31,9 +31,21 @@ component  {
 	}
 
 	public static boolean function isBackBlazeNotSupported() {
-		res= getBackBlazeCredentials();
-		return isNull(res) || len(res)==0;
+		if(!isNull(server.isBackBlazeNotSupported)) return server.isBackBlazeNotSupported;
+		var cred= getBackBlazeCredentials();
+		if(isNull(cred) || len(cred)==0) return true;
+		try {
+			S3Exists(bucketName:"test-is-supported", accessKeyId:cred.ACCESS_KEY_ID, secretAccessKey:cred.SECRET_KEY, host:(isNull(cred.HOST)?nullvalue():cred.HOST));
+		}
+		catch(e) {
+			if(findNoCase("increase your cap", e.message)) {
+				server.isBackBlazeNotSupported=true;
+				return true;
+			}
+		}
+		return false;
 	}
+
 	public static struct function getBackBlazeCredentials() {
 		var ACCESS_KEY_ID=server.system.environment.S3_BACKBLAZE_ACCESS_KEY_ID?:nullValue();
 		if(isNull(ACCESS_KEY_ID) || isEmpty(ACCESS_KEY_ID)) return {};