Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(athena): 🐛 align GetWorkGroup with AWS behavior (#1301)

Lorenzo Galassiceb4d8443159
diff --git a/docs/services/athena.md b/docs/services/athena.md
index f96827a50b..e80df78322 100644
--- a/docs/services/athena.md
+++ b/docs/services/athena.md
@@ -16,6 +16,7 @@ Floci emulates Amazon Athena with **real SQL execution** powered by a [floci-duc
| `StopQueryExecution` | Cancels a running query |
| `CreateWorkGroup` | Creates a new workgroup |
| `GetWorkGroup` | Returns information about a workgroup |
+| `DeleteWorkGroup` | Deletes a workgroup |
| `ListWorkGroups` | Lists all workgroups |
## How it works
diff --git a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaJsonHandler.java
index 4823d5dcee..e1b360fcac 100644
--- a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaJsonHandler.java
@@ -66,7 +66,7 @@ public class AthenaJsonHandler {
}
case "GetWorkGroup" -> {
String name = request.has("WorkGroup") ? request.get("WorkGroup").asText() : "primary";
- yield Response.ok(Map.of("WorkGroup", athenaService.getWorkGroup(name))).build();
+ yield Response.ok(Map.of("WorkGroup", athenaService.getWorkGroup(name, region))).build();
}
case "ListWorkGroups" -> Response.ok(Map.of("WorkGroups", athenaService.listWorkGroups(region))).build();
case "CreateWorkGroup" -> {
@@ -102,6 +102,7 @@ public class AthenaJsonHandler {
if ("primary".equals(wg)) {
throw new AwsException("InvalidRequestException", "The primary workgroup cannot be deleted.", 400);
}
+ athenaService.deleteWorkGroup(wg, region);
yield Response.ok(Map.of()).build();
}
default -> throw new AwsException("InvalidAction", "Action " + action + " is not supported", 400);
diff --git a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java
index c2b1e46f7b..6bdd231436 100644
--- a/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/athena/AthenaService.java
@@ -149,21 +149,19 @@ public class AthenaService {
return workGroup;
}
- public Map<String, Object> getWorkGroup(String name) {
- return Map.of(
- "Name", name == null || name.isBlank() ? DEFAULT_WORKGROUP : name,
- "State", "ENABLED",
- "Configuration", Map.of(
- "EngineVersion", Map.of(
- "SelectedEngineVersion", DEFAULT_ENGINE_VERSION,
- "EffectiveEngineVersion", DEFAULT_ENGINE_VERSION
- ),
- "ResultConfiguration", Map.of("OutputLocation", "s3://" + DEFAULT_OUTPUT_BUCKET + "/results/"),
- "EnforceWorkGroupConfiguration", false,
- "PublishCloudWatchMetricsEnabled", false,
- "RequesterPaysEnabled", false
- )
- );
+ public Map<String, Object> getWorkGroup(String name, String region) {
+ String resolved = name == null || name.isBlank() ? DEFAULT_WORKGROUP : name;
+ if (DEFAULT_WORKGROUP.equals(resolved)) {
+ return primaryWorkGroupSummary();
+ }
+ WorkGroup workGroup = workGroupStore.get(workGroupKey(region, resolved))
+ .orElseThrow(() -> new AwsException("InvalidRequestException",
+ "WorkGroup " + resolved + " is not found.", 400));
+ return toWorkGroupDetail(workGroup);
+ }
+
+ public void deleteWorkGroup(String name, String region) {
+ workGroupStore.delete(workGroupKey(region, name));
}
public List<Map<String, Object>> listWorkGroups(String region) {
@@ -363,6 +361,22 @@ public class AthenaService {
);
}
+ private Map<String, Object> toWorkGroupDetail(WorkGroup workGroup) {
+ Map<String, Object> detail = new LinkedHashMap<>();
+ detail.put("Name", workGroup.getName());
+ detail.put("State", workGroup.getState());
+ if (workGroup.getDescription() != null) {
+ detail.put("Description", workGroup.getDescription());
+ }
+ if (workGroup.getCreationTime() != null) {
+ detail.put("CreationTime", workGroup.getCreationTime());
+ }
+ if (workGroup.getConfiguration() != null) {
+ detail.put("Configuration", workGroup.getConfiguration());
+ }
+ return detail;
+ }
+
private Map<String, Object> toWorkGroupSummary(WorkGroup workGroup) {
Map<String, Object> result = new LinkedHashMap<>();
result.put("Name", workGroup.getName());
diff --git a/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java
new file mode 100644
index 0000000000..59a6b0eeeb
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/athena/AthenaGetWorkGroupIntegrationTest.java
@@ -0,0 +1,136 @@
+package io.github.hectorvent.floci.services.athena;
+
+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+@QuarkusTest
+class AthenaGetWorkGroupIntegrationTest {
+
+ private static final String CONTENT_TYPE = "application/x-amz-json-1.1";
+
+ @BeforeAll
+ static void configureRestAssured() {
+ RestAssuredJsonUtils.configureAwsContentTypes();
+ }
+
+ @Test
+ void getWorkGroupReturnsPrimaryDefaults() {
+ given()
+ .header("X-Amz-Target", "AmazonAthena.GetWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("{ \"WorkGroup\": \"primary\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("WorkGroup.Name", equalTo("primary"))
+ .body("WorkGroup.State", equalTo("ENABLED"))
+ .body("WorkGroup.Configuration.EngineVersion.EffectiveEngineVersion",
+ equalTo("Athena engine version 3"));
+ }
+
+ @Test
+ void getWorkGroupReturnsCreatedWorkGroupDetails() {
+ given()
+ .header("X-Amz-Target", "AmazonAthena.CreateWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("""
+ {
+ "Name": "analytics-get",
+ "Description": "analytics workgroup for reporting queries",
+ "Configuration": {
+ "ResultConfiguration": {
+ "OutputLocation": "s3://test-bucket/athena-results/"
+ }
+ }
+ }
+ """)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("X-Amz-Target", "AmazonAthena.GetWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("{ \"WorkGroup\": \"analytics-get\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("WorkGroup.Name", equalTo("analytics-get"))
+ .body("WorkGroup.State", equalTo("ENABLED"))
+ .body("WorkGroup.Description", equalTo("analytics workgroup for reporting queries"))
+ .body("WorkGroup.CreationTime", notNullValue())
+ .body("WorkGroup.Configuration.ResultConfiguration.OutputLocation",
+ equalTo("s3://test-bucket/athena-results/"))
+ .body("WorkGroup.Configuration.EngineVersion.EffectiveEngineVersion",
+ equalTo("Athena engine version 3"));
+ }
+
+ @Test
+ void getWorkGroupNotFoundReturnsInvalidRequestException() {
+ given()
+ .header("X-Amz-Target", "AmazonAthena.GetWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("{ \"WorkGroup\": \"athena-workgroup-missing\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(400)
+ .body("__type", equalTo("InvalidRequestException"))
+ .body("message", equalTo("WorkGroup athena-workgroup-missing is not found."));
+ }
+
+ @Test
+ void deletedWorkGroupIsNoLongerReturnedAndNameCanBeReused() {
+ String createRequest = """
+ {
+ "Name": "analytics-delete-get"
+ }
+ """;
+
+ given()
+ .header("X-Amz-Target", "AmazonAthena.CreateWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body(createRequest)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("X-Amz-Target", "AmazonAthena.DeleteWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("{ \"WorkGroup\": \"analytics-delete-get\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+
+ given()
+ .header("X-Amz-Target", "AmazonAthena.GetWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body("{ \"WorkGroup\": \"analytics-delete-get\" }")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(400)
+ .body("__type", equalTo("InvalidRequestException"));
+
+ given()
+ .header("X-Amz-Target", "AmazonAthena.CreateWorkGroup")
+ .contentType(CONTENT_TYPE)
+ .body(createRequest)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+ }
+}