add a random appendix to bundle names created

lucee · Jun 21, 2024 · 4071289 · 4071289
1 parent 7780ad5
commit 4071289
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/tests/functions/S3ClearBucket.cfc b/tests/functions/S3ClearBucket.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-clear-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-clear-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
 
 

diff --git a/tests/functions/S3Copy.cfc b/tests/functions/S3Copy.cfc
@@ -24,8 +24,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred,region) {
  try {
  // create variables
- var srcBucketName=cred.PREFIX&"src-filecopy"&listFirst(replace(server.lucee.version,".","","all"),"-");
- var trgBucketName=cred.PREFIX&"trg-filecopy"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var srcBucketName=cred.PREFIX&"src-filecopy"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
+ var trgBucketName=cred.PREFIX&"trg-filecopy"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var srcObjectName="src/test.txt";
  var trgObjectName="trg/test.txt";
 

diff --git a/tests/functions/S3CreateBucket.cfc b/tests/functions/S3CreateBucket.cfc
@@ -25,7 +25,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
 
  try {
  // create variables
- var bucketName=cred.PREFIX&"-create-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-create-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
 
  Util::deleteIfExists(cred,bucketName);
 

diff --git a/tests/functions/S3DeleteBucket.cfc b/tests/functions/S3DeleteBucket.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-delete-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-delete-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
 
  Util::deleteIfExists(cred,bucketName,objectName);

diff --git a/tests/functions/S3Download.cfc b/tests/functions/S3Download.cfc
@@ -3,7 +3,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  describe( title="Test suite for S3Download()",skip=Util::isAWSNotSupported(), body=function() {
 
  var cred=Util::getAWSCredentials();
- var bucketName=cred.PREFIX&"-download"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-download"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
  var content="Susi
 Sorglos";

diff --git a/tests/functions/S3Exists.cfc b/tests/functions/S3Exists.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-exists"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-exists"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
 
  Util::deleteIfExists(cred,bucketName,objectName);

diff --git a/tests/functions/S3GetMetadata.cfc b/tests/functions/S3GetMetadata.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-get-metadata"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-get-metadata"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
  var path="s3:///#bucketName#/#objectName#";
  var pathWithCred="s3://#cred.ACCESS_KEY_ID#:#cred.SECRET_KEY#@#(isNull(cred.HOST)?nullvalue():cred.HOST)#/#bucketName#/#objectName#";

diff --git a/tests/functions/S3ListBucket.cfc b/tests/functions/S3ListBucket.cfc
@@ -62,7 +62,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testCFC(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-list-bucket-"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-list-bucket-"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectNames=["sub/test1.txt","sub/test2.txt","sub/test3.txt","sub/test4.txt","sub/test5.txt"];
 
  // create empty bucket
@@ -106,7 +106,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testUDF(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-list-bucket-"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-list-bucket-"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectNames=["sub/test1.txt","sub/test2.txt","sub/test3.txt","sub/test4.txt","sub/test5.txt"];
 
  // create empty bucket

diff --git a/tests/functions/S3ListBuckets.cfc b/tests/functions/S3ListBuckets.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-list-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-list-bucket"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
 
  Util::deleteIfExists(cred,bucketName,objectName);

diff --git a/tests/functions/S3MetaData.cfc b/tests/functions/S3MetaData.cfc
@@ -50,7 +50,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
 
  private function testit(cred) localMode=true {
  setUp(cred);
- var bucketName="#server.getTestService("s3").bucket_prefix#metadata-#listFirst(replace(server.lucee.version,".","","all"),"-")#";
+ var bucketName="#server.getTestService("s3").bucket_prefix#metadata-#listFirst(replace(server.lucee.version,".","","all"),"-")#"&"-"&createUniqueId();
  var objectName="object";
  var dir="s3://#bucketName#/#objectName#/";
  if(DirectoryExists(dir)) directoryDelete(dir,true);

diff --git a/tests/functions/S3Move.cfc b/tests/functions/S3Move.cfc
@@ -25,8 +25,8 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  try {
  // create variables
  var id=createUniqueID();
- var srcBucketName=cred.PREFIX&"src-move"&listFirst(replace(server.lucee.version,".","","all"),"-");
- var trgBucketName=cred.PREFIX&"trg-move"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var srcBucketName=cred.PREFIX&"src-move"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
+ var trgBucketName=cred.PREFIX&"trg-move"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var srcObjectName="src/test#id#.txt";
  var trgObjectName="trg/test#id#.txt";
 

diff --git a/tests/functions/S3Read.cfc b/tests/functions/S3Read.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-read"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-read"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
 
  Util::deleteIfExists(cred,bucketName,objectName);

diff --git a/tests/functions/S3ReadBinary.cfc b/tests/functions/S3ReadBinary.cfc
@@ -24,7 +24,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
  private function testit(cred) {
  try {
  // create variables
- var bucketName=cred.PREFIX&"-read"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-read"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectName="sub/test.txt";
  var source="Susi Sorglos".getBytes();
 

diff --git a/tests/functions/S3Upload.cfc b/tests/functions/S3Upload.cfc
@@ -31,7 +31,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
 
  try {
  // create variables
- var bucketName=cred.PREFIX&"-upload"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-upload"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectNameFile1="sub/file1.txt";
  var objectNameFile2="sub/file2.txt";
 

diff --git a/tests/functions/S3Write.cfc b/tests/functions/S3Write.cfc
@@ -29,7 +29,7 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="s3" {
 
  try {
  // create variables
- var bucketName=cred.PREFIX&"-write"&listFirst(replace(server.lucee.version,".","","all"),"-");
+ var bucketName=cred.PREFIX&"-write"&listFirst(replace(server.lucee.version,".","","all"),"-")&"-"&createUniqueId();
  var objectNameString="sub/string.txt";
  var objectNameFile="sub/file.txt";