Skip to content

Regression tests for new S3 bucket configuration properties #2822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 3 commits into from
Dec 20, 2025
Merged

Regression tests for new S3 bucket configuration properties #2822

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e64de9e
Test configuration of cloud storage region
labkey-tchad Dec 18, 2025
02f9ba8
Merge remote-tracking branch 'origin/develop' into fb_s3RegionTest
labkey-tchad Dec 18, 2025
a5b7716
Merge remote-tracking branch 'origin/develop' into fb_s3RegionTest
labkey-tchad Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/org/labkey/test/TestProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.labkey.serverapi.reader.Readers;
import org.labkey.test.util.CachingSupplier;
import org.labkey.test.util.CspLogUtil;
import org.labkey.test.util.TestDataGenerator;
import org.labkey.test.util.TestLogger;
import org.labkey.test.util.Version;
import org.openqa.selenium.Dimension;
Expand All @@ -37,8 +39,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.Random;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -245,11 +249,29 @@ public static boolean isCloudPipelineEnabled()
return getBooleanProperty("use.cloud.pipeline", false);
}

private static final CachingSupplier<String> defaultBucketName = new CachingSupplier<>(() ->
TestDataGenerator.randomChoice(Stream.of(getCloudPipelineBucketNameWithSqs(), getCloudPipelineBucketNameWithoutSqs())
.filter(Objects::nonNull).toList()));
/**
* Get a pipeline bucket name for use with S3 testing. There are two buckets in different regions. This will
* randomly select one of them (and cache the result). If SQS is required, use
* {@link #getCloudPipelineBucketNameWithSqs()}
*/
public static String getCloudPipelineBucketName()
{
return defaultBucketName.get();
}

public static String getCloudPipelineBucketNameWithSqs()
{
return System.getProperty("cloud.pipeline.bucket");
}

public static String getCloudPipelineBucketNameWithoutSqs()
{
return System.getProperty("cloud.pipeline.bucket.nosqs");
}

public static Optional<Dimension> getWindowSize()
{
String dimensionStr = System.getProperty("webtest.window.size", "1280x1024");
Expand Down