From e0711e610880e8fa435567b50c645b8d1df91f01 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 22 Jun 2024 14:21:06 +0200 Subject: [PATCH] fix: rename enable_local_secret_id to local_secret_ids in AppRole model --- CHANGELOG.md | 3 +++ .../jvault/connector/model/AppRole.java | 26 ++++++++++--------- .../jvault/connector/model/AppRoleTest.java | 12 ++++----- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30f9f42..3c203d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ * Add `mount_type` attribute to common response model * Add `auth` attribute to common response model +### Fix +* Rename `enable_local_secret_id` to `local_secret_ids` in `AppRole` model + ### Dependencies * Updated Jackson to 2.17.1 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 378f624..53774e0 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/AppRole.java +++ b/src/main/java/de/stklcode/jvault/connector/model/AppRole.java @@ -32,7 +32,7 @@ import java.util.Objects; */ @JsonIgnoreProperties(ignoreUnknown = true) public final class AppRole implements Serializable { - private static final long serialVersionUID = -6248529625864573990L; + private static final long serialVersionUID = 693228837510483448L; @JsonProperty("role_name") private String name; @@ -55,9 +55,9 @@ public final class AppRole implements Serializable { @JsonInclude(JsonInclude.Include.NON_NULL) private Integer secretIdTtl; - @JsonProperty("enable_local_secret_ids") + @JsonProperty("local_secret_ids") @JsonInclude(JsonInclude.Include.NON_NULL) - private Boolean enableLocalSecretIds; + private Boolean localSecretIds; @JsonProperty("token_ttl") @JsonInclude(JsonInclude.Include.NON_NULL) @@ -111,7 +111,7 @@ public final class AppRole implements Serializable { this.secretIdBoundCidrs = builder.secretIdBoundCidrs; this.secretIdNumUses = builder.secretIdNumUses; this.secretIdTtl = builder.secretIdTtl; - this.enableLocalSecretIds = builder.enableLocalSecretIds; + this.localSecretIds = builder.localSecretIds; this.tokenTtl = builder.tokenTtl; this.tokenMaxTtl = builder.tokenMaxTtl; this.tokenPolicies = builder.tokenPolicies; @@ -262,9 +262,10 @@ public final class AppRole implements Serializable { /** * @return Enable local secret IDs? * @since 0.9 + * @since 1.3 renamed to {@code getLocalSecretIds()} */ - public Boolean getEnableLocalSecretIds() { - return enableLocalSecretIds; + public Boolean getLocalSecretIds() { + return localSecretIds; } /** @@ -335,7 +336,7 @@ public final class AppRole implements Serializable { Objects.equals(secretIdBoundCidrs, appRole.secretIdBoundCidrs) && Objects.equals(secretIdNumUses, appRole.secretIdNumUses) && Objects.equals(secretIdTtl, appRole.secretIdTtl) && - Objects.equals(enableLocalSecretIds, appRole.enableLocalSecretIds) && + Objects.equals(localSecretIds, appRole.localSecretIds) && Objects.equals(tokenTtl, appRole.tokenTtl) && Objects.equals(tokenMaxTtl, appRole.tokenMaxTtl) && Objects.equals(tokenPolicies, appRole.tokenPolicies) && @@ -350,7 +351,7 @@ public final class AppRole implements Serializable { @Override public int hashCode() { return Objects.hash(name, id, bindSecretId, secretIdBoundCidrs, secretIdNumUses, secretIdTtl, - enableLocalSecretIds, tokenTtl, tokenMaxTtl, tokenPolicies, tokenBoundCidrs, tokenExplicitMaxTtl, + localSecretIds, tokenTtl, tokenMaxTtl, tokenPolicies, tokenBoundCidrs, tokenExplicitMaxTtl, tokenNoDefaultPolicy, tokenNumUses, tokenPeriod, tokenType); } @@ -370,7 +371,7 @@ public final class AppRole implements Serializable { private List tokenPolicies; private Integer secretIdNumUses; private Integer secretIdTtl; - private Boolean enableLocalSecretIds; + private Boolean localSecretIds; private Integer tokenTtl; private Integer tokenMaxTtl; private List tokenBoundCidrs; @@ -527,12 +528,13 @@ public final class AppRole implements Serializable { /** * Enable or disable local secret IDs. * - * @param enableLocalSecretIds Enable local secret IDs? + * @param localSecretIds Enable local secret IDs? * @return self * @since 0.9 + * @since 1.3 renamed to {@code withLocalSecretIds()} */ - public Builder withEnableLocalSecretIds(final Boolean enableLocalSecretIds) { - this.enableLocalSecretIds = enableLocalSecretIds; + public Builder withLocalSecretIds(final Boolean localSecretIds) { + this.localSecretIds = localSecretIds; return this; } diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java index 8922f83..c971d47 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java @@ -43,7 +43,7 @@ class AppRoleTest extends AbstractModelTest { private static final String POLICY_2 = "policy2"; private static final Integer SECRET_ID_NUM_USES = 10; private static final Integer SECRET_ID_TTL = 7200; - private static final Boolean ENABLE_LOCAL_SECRET_IDS = false; + private static final Boolean LOCAL_SECRET_IDS = false; private static final Integer TOKEN_TTL = 4800; private static final Integer TOKEN_MAX_TTL = 9600; private static final Integer TOKEN_EXPLICIT_MAX_TTL = 14400; @@ -52,8 +52,8 @@ class AppRoleTest extends AbstractModelTest { private static final Integer TOKEN_PERIOD = 1234; private static final Token.Type TOKEN_TYPE = Token.Type.DEFAULT_SERVICE; private static final String JSON_MIN = "{\"role_name\":\"" + NAME + "\"}"; - private static final String JSON_FULL = String.format("{\"role_name\":\"%s\",\"role_id\":\"%s\",\"bind_secret_id\":%s,\"secret_id_bound_cidrs\":\"%s\",\"secret_id_num_uses\":%d,\"secret_id_ttl\":%d,\"enable_local_secret_ids\":%s,\"token_ttl\":%d,\"token_max_ttl\":%d,\"token_policies\":\"%s\",\"token_bound_cidrs\":\"%s\",\"token_explicit_max_ttl\":%d,\"token_no_default_policy\":%s,\"token_num_uses\":%d,\"token_period\":%d,\"token_type\":\"%s\"}", - NAME, ID, BIND_SECRET_ID, CIDR_1, SECRET_ID_NUM_USES, SECRET_ID_TTL, ENABLE_LOCAL_SECRET_IDS, TOKEN_TTL, TOKEN_MAX_TTL, POLICY, CIDR_1, TOKEN_EXPLICIT_MAX_TTL, TOKEN_NO_DEFAULT_POLICY, TOKEN_NUM_USES, TOKEN_PERIOD, TOKEN_TYPE.value()); + private static final String JSON_FULL = String.format("{\"role_name\":\"%s\",\"role_id\":\"%s\",\"bind_secret_id\":%s,\"secret_id_bound_cidrs\":\"%s\",\"secret_id_num_uses\":%d,\"secret_id_ttl\":%d,\"local_secret_ids\":%s,\"token_ttl\":%d,\"token_max_ttl\":%d,\"token_policies\":\"%s\",\"token_bound_cidrs\":\"%s\",\"token_explicit_max_ttl\":%d,\"token_no_default_policy\":%s,\"token_num_uses\":%d,\"token_period\":%d,\"token_type\":\"%s\"}", + NAME, ID, BIND_SECRET_ID, CIDR_1, SECRET_ID_NUM_USES, SECRET_ID_TTL, LOCAL_SECRET_IDS, TOKEN_TTL, TOKEN_MAX_TTL, POLICY, CIDR_1, TOKEN_EXPLICIT_MAX_TTL, TOKEN_NO_DEFAULT_POLICY, TOKEN_NUM_USES, TOKEN_PERIOD, TOKEN_TYPE.value()); AppRoleTest() { super(AppRole.class); @@ -68,7 +68,7 @@ class AppRoleTest extends AbstractModelTest { .withTokenPolicies(POLICIES) .withSecretIdNumUses(SECRET_ID_NUM_USES) .withSecretIdTtl(SECRET_ID_TTL) - .withEnableLocalSecretIds(ENABLE_LOCAL_SECRET_IDS) + .withLocalSecretIds(LOCAL_SECRET_IDS) .withTokenTtl(TOKEN_TTL) .withTokenMaxTtl(TOKEN_MAX_TTL) .withTokenBoundCidrs(BOUND_CIDR_LIST) @@ -98,7 +98,7 @@ class AppRoleTest extends AbstractModelTest { assertNull(role.getTokenPolicies()); assertNull(role.getSecretIdNumUses()); assertNull(role.getSecretIdTtl()); - assertNull(role.getEnableLocalSecretIds()); + assertNull(role.getLocalSecretIds()); assertNull(role.getTokenTtl()); assertNull(role.getTokenMaxTtl()); assertNull(role.getTokenBoundCidrs()); @@ -125,7 +125,7 @@ class AppRoleTest extends AbstractModelTest { assertEquals(POLICIES, role.getTokenPolicies()); assertEquals(SECRET_ID_NUM_USES, role.getSecretIdNumUses()); assertEquals(SECRET_ID_TTL, role.getSecretIdTtl()); - assertEquals(ENABLE_LOCAL_SECRET_IDS, role.getEnableLocalSecretIds()); + assertEquals(LOCAL_SECRET_IDS, role.getLocalSecretIds()); assertEquals(TOKEN_TTL, role.getTokenTtl()); assertEquals(TOKEN_MAX_TTL, role.getTokenMaxTtl()); assertEquals(BOUND_CIDR_LIST, role.getTokenBoundCidrs());