Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(organizations): return account state (#3053)

Franklin G. Mendoza587d0b57581b
diff --git a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsJsonHandler.java
index 53f3a48bb1..3dade4de55 100644
--- a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsJsonHandler.java
@@ -666,6 +666,7 @@ public class OrganizationsJsonHandler {
node.put("Arn", account.getArn());
node.put("Email", account.getEmail());
node.put("Name", account.getName());
+ node.put("State", account.getStatus());
node.put("Status", account.getStatus());
node.put("JoinedMethod", account.getJoinedMethod());
putTimestamp(node, "JoinedTimestamp", account.getJoinedTimestamp());
diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java
index 280bcdb98a..06148c7115 100644
--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsIntegrationTest.java
@@ -330,6 +330,7 @@ class OrganizationsIntegrationTest {
.body("Account.Id", equalTo(memberAccountId))
.body("Account.Email", equalTo("[email protected]"))
.body("Account.Name", equalTo("Dev"))
+ .body("Account.State", equalTo("ACTIVE"))
.body("Account.Status", equalTo("ACTIVE"))
.body("Account.JoinedMethod", equalTo("CREATED"))
.body("Account.Arn", startsWith("arn:aws:organizations::000000000000:account/" + organizationId));
@@ -339,7 +340,8 @@ class OrganizationsIntegrationTest {
.post("/")
.then()
.statusCode(200)
- .body("Accounts.Id", hasItems("000000000000", memberAccountId));
+ .body("Accounts.Id", hasItems("000000000000", memberAccountId))
+ .body("Accounts.State", hasItems("ACTIVE", "ACTIVE"));
}
@Test
@@ -359,7 +361,8 @@ class OrganizationsIntegrationTest {
.then()
.statusCode(200)
.body("Accounts", hasSize(1))
- .body("Accounts[0].Id", equalTo(memberAccountId));
+ .body("Accounts[0].Id", equalTo(memberAccountId))
+ .body("Accounts[0].State", equalTo("ACTIVE"));
}
@Test