Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(accessanalyzer): route GetAnalyzer through GET /analyzer/<name> (#5534)

Matheus Oliveira988991033fa6
diff --git a/docs/services/access-analyzer.md b/docs/services/access-analyzer.md
index 91d893b1ca..1c10bf40e0 100644
--- a/docs/services/access-analyzer.md
+++ b/docs/services/access-analyzer.md
@@ -14,6 +14,7 @@ Floci supports the analyzer lifecycle used by local governance workflows.
| `ListAnalyzers` | - |
| `CreateAnalyzer` | - |
| `DeleteAnalyzer` | - |
+| `GetAnalyzer` | - |
<!-- floci:actions:end -->
Analyzer state is account and Region scoped and persisted through `StorageFactory`.
diff --git a/docs/services/index.md b/docs/services/index.md
index 20861bc403..3de8c26b1b 100644
--- a/docs/services/index.md
+++ b/docs/services/index.md
@@ -47,7 +47,7 @@ Operation counts are exact. For dispatch-table services (Query and JSON 1.1) eac
| [CloudWatch RUM](rum.md) | `/appmonitor`, `/appmonitor/{name}`, `/appmonitors` | REST JSON | 5 |
| [GuardDuty](guardduty.md) | `/detector`, `/detector/{detectorId}`, `/detector/{detectorId}/admin`, `/admin/*`, `/tags/*` | REST JSON | 13 |
| [AWS Account Management](account.md) | `/putAlternateContact`, `/getAlternateContact` | REST JSON | 2 |
-| [IAM Access Analyzer](access-analyzer.md) | `/analyzer`, `/analyzer/{name}` | REST JSON | 3 |
+| [IAM Access Analyzer](access-analyzer.md) | `/analyzer`, `/analyzer/{name}` | REST JSON | 4 |
| [IAM Identity Center (SSO Admin)](ssoadmin.md) | `POST /` + `X-Amz-Target: SWBExternalService.*` | JSON 1.1 | 79 |
| [IAM Identity Center OIDC](ssooidc.md) | `/client/register`, `/device_authorization`, `/token`, `/token?aws_iam=t`, `/authorize`, `/device` | REST JSON | 4 |
| [IAM Identity Center Access Portal](ssoportal.md) | `/assignment/accounts`, `/assignment/roles`, `/federation/credentials`, `/logout` | REST JSON | 4 |
diff --git a/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerController.java b/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerController.java
index 8b7a4451b0..1029d81e39 100644
--- a/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerController.java
+++ b/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerController.java
@@ -75,6 +75,16 @@ public class AccessAnalyzerController {
return Response.ok(objectMapper.createObjectNode()).build();
}
+ @GET
+ @Path("/analyzer/{analyzerName}")
+ public Response getAnalyzer(@Context HttpHeaders headers, @PathParam("analyzerName") String analyzerName) {
+ String region = regionResolver.resolveRegion(headers);
+ Analyzer analyzer = accessAnalyzerService.getAnalyzer(region, analyzerName);
+ ObjectNode response = objectMapper.createObjectNode();
+ response.set("analyzer", analyzerSummary(analyzer));
+ return Response.ok(response).build();
+ }
+
private ObjectNode analyzerSummary(Analyzer analyzer) {
ObjectNode node = objectMapper.createObjectNode();
node.put("arn", analyzer.getArn());
diff --git a/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerService.java b/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerService.java
index 1f1bfa5b14..4509d8a4b8 100644
--- a/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerService.java
@@ -84,13 +84,8 @@ public class AccessAnalyzerService implements Resettable {
}
public synchronized void deleteAnalyzer(String region, String analyzerName) {
- validateAnalyzerName(analyzerName);
- String key = storageKey(region, analyzerName);
- if (analyzers.get(key).isEmpty()) {
- throw new AwsException("ResourceNotFoundException",
- "The specified analyzer could not be found.", 404);
- }
- analyzers.delete(key);
+ getAnalyzer(region, analyzerName);
+ analyzers.delete(storageKey(region, analyzerName));
}
private static int analyzerLimit(String type) {
@@ -158,4 +153,24 @@ public class AccessAnalyzerService implements Resettable {
private static AwsException validation(String message) {
return new AwsException("ValidationException", message, 400);
}
+
+ public Analyzer getAnalyzer(String region, String analyzerName) {
+ validateAnalyzerName(analyzerName);
+ String key = storageKey(region, analyzerName);
+ return analyzers.get(key).orElseThrow(() -> analyzerNotFound(analyzerName));
+ }
+
+ private static AwsException analyzerNotFound(String analyzerName) {
+ return new AwsException("ResourceNotFoundException", "The specified analyzer could not be found.", 404,
+ resourceFields(analyzerName, "analyzer"));
+ }
+
+ private static Map<String, Object> resourceFields(String resourceId, String resourceType) {
+ Map<String, Object> fields = new LinkedHashMap<>();
+ fields.put("resourceType", resourceType);
+ if (resourceId != null) {
+ fields.put("resourceId", resourceId);
+ }
+ return fields;
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerIntegrationTest.java
index fc814f6fb6..86c1012172 100644
--- a/src/test/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/accessanalyzer/AccessAnalyzerIntegrationTest.java
@@ -69,4 +69,26 @@ class AccessAnalyzerIntegrationTest {
.body("{\"analyzerName\":\"bad-analyzer\",\"type\":\"INVALID\"}")
.put("/analyzer").then().statusCode(400).body("__type", equalTo("ValidationException"));
}
+
+ @Test
+ void getAnalyzerReturnsAnalyzer() {
+ given().contentType("application/json").header("Authorization", AUTH)
+ .body("{\"analyzerName\":\"test-analyzer\",\"type\":\"ACCOUNT\"}")
+ .put("/analyzer").then().statusCode(200).body("arn", notNullValue());
+ given().header("Authorization", AUTH).get("/analyzer/test-analyzer")
+ .then().statusCode(200).body("analyzer.name", equalTo("test-analyzer"))
+ .body("analyzer.type", equalTo("ACCOUNT"))
+ .body("analyzer.status", equalTo("ACTIVE"))
+ .body("analyzer.arn", notNullValue());
+ given().header("Authorization", AUTH).delete("/analyzer/test-analyzer").then().statusCode(200);
+ }
+
+ @Test
+ void getAnalyzerNotFoundReturns404() {
+ given().header("Authorization", AUTH).get("/analyzer/nonexistent")
+ .then().statusCode(404)
+ .body("__type", equalTo("ResourceNotFoundException"))
+ .body("resourceId", equalTo("nonexistent"))
+ .body("resourceType", equalTo("analyzer"));
+ }
}