Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

test(compat): derive the availability zone from the run's region (#5592)

Hector Ventura8058535709b4
diff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
index ad3d485c53..ae159a70c3 100644
--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
@@ -245,6 +245,15 @@ public final class TestFixtures {
return REGION;
}
+ /**
+ * The first availability zone of {@link #region()} ({@code us-east-1a}, {@code cn-north-1a}, ...),
+ * for tests that must place a resource in a zone. A zone literal only exists in one region, so a
+ * hardcoded one fails as soon as the suite runs anywhere else.
+ */
+ public static String availabilityZone() {
+ return REGION.id() + "a";
+ }
+
/**
* The partition of {@link #region()} ({@code aws}, {@code aws-cn}, {@code aws-us-gov}, ...), from
* the SDK's own region metadata, so a test pins the partition its clients actually sign in. A region
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingCapacitySuspensionTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingCapacitySuspensionTest.java
index 99829d7303..19045315d3 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingCapacitySuspensionTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingCapacitySuspensionTest.java
@@ -21,7 +21,7 @@ class AutoScalingCapacitySuspensionTest {
.imageId("ami-amazonlinux2023").instanceType("t3.micro"));
try {
asg.createAutoScalingGroup(r -> r.autoScalingGroupName(name).launchConfigurationName(name)
- .minSize(0).maxSize(1).desiredCapacity(0).availabilityZones("us-east-1a"));
+ .minSize(0).maxSize(1).desiredCapacity(0).availabilityZones(TestFixtures.availabilityZone()));
try {
for (String process : List.of("Launch", "Terminate")) {
asg.suspendProcesses(r -> r.autoScalingGroupName(name).scalingProcesses(process));
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingTest.java
index 8b294a0a6c..cf0a91701f 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AutoScalingTest.java
@@ -86,7 +86,7 @@ class AutoScalingTest {
.minSize(0)
.maxSize(1)
.desiredCapacity(1)
- .availabilityZones("us-east-1a")
+ .availabilityZones(TestFixtures.availabilityZone())
.build()))
.isInstanceOfSatisfying(AutoScalingException.class, error -> {
assertThat(error.statusCode()).isEqualTo(400);
@@ -179,7 +179,7 @@ class AutoScalingTest {
.minSize(0)
.maxSize(1)
.desiredCapacity(1)
- .availabilityZones("us-east-1a")
+ .availabilityZones(TestFixtures.availabilityZone())
.build());
autoScaling.attachInstances(AttachInstancesRequest.builder()
.autoScalingGroupName(autoScalingGroupName)
@@ -251,7 +251,7 @@ class AutoScalingTest {
.minSize(0)
.maxSize(4)
.desiredCapacity(0)
- .availabilityZones("us-east-1a")
+ .availabilityZones(TestFixtures.availabilityZone())
.serviceLinkedRoleARN(roleArn)
.instanceMaintenancePolicy(InstanceMaintenancePolicy.builder()
.minHealthyPercentage(90)
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2Tests.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2Tests.java
index facb3e1577..cf8af7ac50 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2Tests.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2Tests.java
@@ -476,7 +476,7 @@ class Ec2Tests {
CreateSubnetResponse resp = ec2.createSubnet(CreateSubnetRequest.builder()
.vpcId(vpcId)
.cidrBlock("10.0.1.0/24")
- .availabilityZone("us-east-1a")
+ .availabilityZone(TestFixtures.availabilityZone())
.tagSpecifications(
TagSpecification.builder()
.resourceType(ResourceType.SUBNET)
@@ -1038,7 +1038,7 @@ class Ec2Tests {
String endpointId = null;
try {
ownSubnetId = ec2.createSubnet(CreateSubnetRequest.builder()
- .vpcId(vpcId).cidrBlock("10.0.90.0/24").availabilityZone("us-east-1a")
+ .vpcId(vpcId).cidrBlock("10.0.90.0/24").availabilityZone(TestFixtures.availabilityZone())
.build()).subnet().subnetId();
ownGroupId = ec2.createSecurityGroup(CreateSecurityGroupRequest.builder()
.groupName("vpce-eni-sdk-test").description("endpoint interface ids")
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java
index 18b90dfb84..18bea341e2 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/LightsailTest.java
@@ -56,7 +56,7 @@ class LightsailTest {
CreateInstancesResponse createInstances = lightsail.createInstances(CreateInstancesRequest.builder()
.instanceNames(instanceName)
- .availabilityZone("us-east-1a")
+ .availabilityZone(TestFixtures.availabilityZone())
.blueprintId("ubuntu_22_04")
.bundleId("nano_3_0")
.keyPairName(keyPairName)
@@ -68,8 +68,8 @@ class LightsailTest {
Instance instance = lightsail.getInstance(r -> r.instanceName(instanceName)).instance();
assertThat(instance.name()).isEqualTo(instanceName);
assertThat(instance.arn()).startsWith("arn:aws:lightsail:");
- assertThat(instance.location().regionNameAsString()).isEqualTo("us-east-1");
- assertThat(instance.location().availabilityZone()).isEqualTo("us-east-1a");
+ assertThat(instance.location().regionNameAsString()).isEqualTo(TestFixtures.region().id());
+ assertThat(instance.location().availabilityZone()).isEqualTo(TestFixtures.availabilityZone());
assertThat(instance.state().name()).isEqualTo("running");
assertThat(instance.tags()).extracting(Tag::key).contains("component");
@@ -96,7 +96,7 @@ class LightsailTest {
assertThat(port.stateAsString()).isEqualTo("open");
});
- lightsail.createDisk(r -> r.diskName(diskName).availabilityZone("us-east-1a").sizeInGb(8));
+ lightsail.createDisk(r -> r.diskName(diskName).availabilityZone(TestFixtures.availabilityZone()).sizeInGb(8));
lightsail.attachDisk(r -> r.diskName(diskName).instanceName(instanceName).diskPath("/dev/xvdf"));
Disk disk = lightsail.getDisk(r -> r.diskName(diskName)).disk();
assertThat(disk.name()).isEqualTo(diskName);