From 3271e5e513fd84e84ae643b10af9c84cb549184e Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 5 Nov 2016 18:15:28 +0100 Subject: [PATCH] Test corrections --- .../java/de/stklcode/jvault/connector/model/AppRole.java | 2 ++ .../stklcode/jvault/connector/HTTPVaultConnectorTest.java | 2 +- .../stklcode/jvault/connector/model/AppRoleBuilderTest.java | 6 +++--- ...d0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7 | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/test/resources/data_dir/auth/ac4e0527-a7b2-1b40-1148-dc0dfaf01990/accessor/_e83aed0dd0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7 diff --git a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java index 50e3300..40d3930 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java @@ -103,6 +103,7 @@ public class AppRole { } @JsonGetter("bound_cidr_list") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public String getBoundCidrListString() { if (boundCidrList == null || boundCidrList.isEmpty()) return ""; @@ -119,6 +120,7 @@ public class AppRole { } @JsonGetter("policies") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public String getPoliciesString() { if (policies == null || policies.isEmpty()) return ""; diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java index 51c21be..bccdeaa 100644 --- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java +++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java @@ -55,7 +55,7 @@ public class HTTPVaultConnectorTest { private static String USER_ID = "5ADF8218-D7FB-4089-9E38-287465DBF37E"; private static String APPROLE_ROLE_NAME = "testrole1"; // role with secret ID private static String APPROLE_ROLE = "627b6400-90c3-a239-49a9-af65a448ca10"; - private static String APPROLE_SECRET = "154fe52a-6df2-b4e9-2dbd-d3c5e6539f9b"; + private static String APPROLE_SECRET = "fa762ca1-53c2-c687-432e-65cc7e988726"; private static String APPROLE_ROLE2 = "35b7bf43-9644-588a-e68f-2e8313bb23b7"; // role with CIDR subnet private static String SECRET_PATH = "userstore"; private static String SECRET_KEY = "foo"; diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java index 3399390..6c7a391 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleBuilderTest.java @@ -50,7 +50,7 @@ public class AppRoleBuilderTest { private static final Integer TOKEN_MAX_TTL = 9600; private static final Integer PERIOD = 1234; private static final String JSON_MIN = "{\"role_name\":\"" + NAME + "\"}"; - private static final String JSON_FULL = String.format("{\"role_name\":\"%s\",\"secret_id\":\"%s\",\"bind_secret_id\":%s,\"bound_cidr_list\":[\"%s\"],\"policies\":[\"%s\"],\"secret_id_num_uses\":%d,\"secret_id_ttl\":%d,\"token_ttl\":%d,\"token_max_ttl\":%d,\"period\":%d}", + private static final String JSON_FULL = String.format("{\"role_name\":\"%s\",\"role_id\":\"%s\",\"bind_secret_id\":%s,\"bound_cidr_list\":\"%s\",\"policies\":\"%s\",\"secret_id_num_uses\":%d,\"secret_id_ttl\":%d,\"token_ttl\":%d,\"token_max_ttl\":%d,\"period\":%d}", NAME, ID, BIND_SECRET_ID, CIDR_1, POLICY, SECRET_ID_NUM_USES, SECRET_ID_TTL, TOKEN_TTL, TOKEN_MAX_TTL, PERIOD); @BeforeClass @@ -128,8 +128,8 @@ public class AppRoleBuilderTest { assertThat(role.getBoundCidrList(), hasSize(1)); assertThat(role.getBoundCidrList(), contains(CIDR_2)); role = new AppRoleBuilder(NAME) - .withPolicies(BOUND_CIDR_LIST) - .withPolicy(CIDR_1) + .withBoundCidrList(BOUND_CIDR_LIST) + .withCidrBlock(CIDR_2) .build(); assertThat(role.getBoundCidrList(), hasSize(2)); assertThat(role.getBoundCidrList(), contains(CIDR_1, CIDR_2)); diff --git a/src/test/resources/data_dir/auth/ac4e0527-a7b2-1b40-1148-dc0dfaf01990/accessor/_e83aed0dd0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7 b/src/test/resources/data_dir/auth/ac4e0527-a7b2-1b40-1148-dc0dfaf01990/accessor/_e83aed0dd0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7 new file mode 100644 index 0000000..64667f4 --- /dev/null +++ b/src/test/resources/data_dir/auth/ac4e0527-a7b2-1b40-1148-dc0dfaf01990/accessor/_e83aed0dd0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7 @@ -0,0 +1 @@ +{"Key":"auth/ac4e0527-a7b2-1b40-1148-dc0dfaf01990/accessor/e83aed0dd0b867f09aa1dbc88b965eafba6030458d6555712e82c479cee3d2d7","Value":"AAAAAQL7t56z9Fr92ztubIfZPPkV3X1Aljnn95Y/tDXOxn8vjbjf21Fhyj3UnLwWyzK/9ip/6+x2DJBXikBOvXoCqKLXGegZ4JN9Z9UMiQ88aE9Z978r13E/rNbhIUa/PhT5NGwCbOl6vtK2hL06BHxKb+4+goM="}