model: add migration, recovery and storage type fields to seal status
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
dc4b62496a
commit
f6180c4f90
@ -3,6 +3,9 @@
|
|||||||
### Fix
|
### Fix
|
||||||
* Use `replication_performance_mode` instead of `replication_perf_mode` in health response.
|
* Use `replication_performance_mode` instead of `replication_perf_mode` in health response.
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
* Add `migration`, `recovery_seal` and `storage_type` fields to `SealReponse` model
|
||||||
|
|
||||||
### Test
|
### Test
|
||||||
* Tested against Vault 1.9.2
|
* Tested against Vault 1.9.2
|
||||||
|
|
||||||
|
@ -57,6 +57,15 @@ public final class SealResponse implements VaultResponse {
|
|||||||
@JsonProperty("cluster_id")
|
@JsonProperty("cluster_id")
|
||||||
private String clusterId;
|
private String clusterId;
|
||||||
|
|
||||||
|
@JsonProperty("migration")
|
||||||
|
private Boolean migration;
|
||||||
|
|
||||||
|
@JsonProperty("recovery_seal")
|
||||||
|
private Boolean recoverySeal;
|
||||||
|
|
||||||
|
@JsonProperty("storage_type")
|
||||||
|
private String storageType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Seal type.
|
* @return Seal type.
|
||||||
* @since 0.8
|
* @since 0.8
|
||||||
@ -132,4 +141,28 @@ public final class SealResponse implements VaultResponse {
|
|||||||
public String getClusterId() {
|
public String getClusterId() {
|
||||||
return clusterId;
|
return clusterId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Migration status (since Vault 1.4)
|
||||||
|
* @since 1.1
|
||||||
|
*/
|
||||||
|
public Boolean getMigration() {
|
||||||
|
return migration;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Recovery seal status.
|
||||||
|
* @since 1.1
|
||||||
|
*/
|
||||||
|
public Boolean getRecoverySeal() {
|
||||||
|
return recoverySeal;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Storage type (since Vault 1.3).
|
||||||
|
* @since 1.1
|
||||||
|
*/
|
||||||
|
public String getStorageType() {
|
||||||
|
return storageType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,10 +33,13 @@ class SealResponseTest {
|
|||||||
private static final Integer SHARES = 5;
|
private static final Integer SHARES = 5;
|
||||||
private static final Integer PROGRESS_SEALED = 2;
|
private static final Integer PROGRESS_SEALED = 2;
|
||||||
private static final Integer PROGRESS_UNSEALED = 0;
|
private static final Integer PROGRESS_UNSEALED = 0;
|
||||||
private static final String VERSION = "0.11.2";
|
private static final String VERSION = "1.8.2";
|
||||||
private static final String CLUSTER_NAME = "vault-cluster-d6ec3c7f";
|
private static final String CLUSTER_NAME = "vault-cluster-d6ec3c7f";
|
||||||
private static final String CLUSTER_ID = "3e8b3fec-3749-e056-ba41-b62a63b997e8";
|
private static final String CLUSTER_ID = "3e8b3fec-3749-e056-ba41-b62a63b997e8";
|
||||||
private static final String NONCE = "ef05d55d-4d2c-c594-a5e8-55bc88604c24";
|
private static final String NONCE = "ef05d55d-4d2c-c594-a5e8-55bc88604c24";
|
||||||
|
private static final Boolean MIGRATION = false;
|
||||||
|
private static final Boolean RECOVERY_SEAL = false;
|
||||||
|
private static final String STORAGE_TYPE = "file";
|
||||||
|
|
||||||
private static final String RES_SEALED = "{\n" +
|
private static final String RES_SEALED = "{\n" +
|
||||||
" \"type\": \"" + TYPE + "\",\n" +
|
" \"type\": \"" + TYPE + "\",\n" +
|
||||||
@ -46,7 +49,10 @@ class SealResponseTest {
|
|||||||
" \"n\": " + SHARES + ",\n" +
|
" \"n\": " + SHARES + ",\n" +
|
||||||
" \"progress\": " + PROGRESS_SEALED + ",\n" +
|
" \"progress\": " + PROGRESS_SEALED + ",\n" +
|
||||||
" \"nonce\": \"\",\n" +
|
" \"nonce\": \"\",\n" +
|
||||||
" \"version\": \"" + VERSION + "\"\n" +
|
" \"version\": \"" + VERSION + "\",\n" +
|
||||||
|
" \"migration\": \"" + MIGRATION + "\",\n" +
|
||||||
|
" \"recovery_seal\": \"" + RECOVERY_SEAL + "\",\n" +
|
||||||
|
" \"storage_type\": \"" + STORAGE_TYPE + "\"\n" +
|
||||||
"}";
|
"}";
|
||||||
|
|
||||||
private static final String RES_UNSEALED = "{\n" +
|
private static final String RES_UNSEALED = "{\n" +
|
||||||
@ -59,7 +65,10 @@ class SealResponseTest {
|
|||||||
" \"version\": \"" + VERSION + "\",\n" +
|
" \"version\": \"" + VERSION + "\",\n" +
|
||||||
" \"cluster_name\": \"" + CLUSTER_NAME + "\",\n" +
|
" \"cluster_name\": \"" + CLUSTER_NAME + "\",\n" +
|
||||||
" \"cluster_id\": \"" + CLUSTER_ID + "\",\n" +
|
" \"cluster_id\": \"" + CLUSTER_ID + "\",\n" +
|
||||||
" \"nonce\": \"" + NONCE + "\"\n" +
|
" \"nonce\": \"" + NONCE + "\",\n" +
|
||||||
|
" \"migration\": \"" + MIGRATION + "\",\n" +
|
||||||
|
" \"recovery_seal\": \"" + RECOVERY_SEAL + "\",\n" +
|
||||||
|
" \"storage_type\": \"" + STORAGE_TYPE + "\"\n" +
|
||||||
"}";
|
"}";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -81,6 +90,9 @@ class SealResponseTest {
|
|||||||
assertEquals(PROGRESS_SEALED, res.getProgress(), "Incorrect progress");
|
assertEquals(PROGRESS_SEALED, res.getProgress(), "Incorrect progress");
|
||||||
assertEquals("", res.getNonce(), "Nonce not empty");
|
assertEquals("", res.getNonce(), "Nonce not empty");
|
||||||
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
||||||
|
assertEquals(MIGRATION, res.getMigration(), "Incorrect migration");
|
||||||
|
assertEquals(RECOVERY_SEAL, res.getRecoverySeal(), "Incorrect recovery seal");
|
||||||
|
assertEquals(STORAGE_TYPE, res.getStorageType(), "Incorrect storage type");
|
||||||
// And the fields, that should not be filled.
|
// And the fields, that should not be filled.
|
||||||
assertNull(res.getClusterName(), "Cluster name should not be populated");
|
assertNull(res.getClusterName(), "Cluster name should not be populated");
|
||||||
assertNull(res.getClusterId(), "Cluster ID should not be populated");
|
assertNull(res.getClusterId(), "Cluster ID should not be populated");
|
||||||
@ -102,5 +114,8 @@ class SealResponseTest {
|
|||||||
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
||||||
assertEquals(CLUSTER_NAME, res.getClusterName(), "Incorrect cluster name");
|
assertEquals(CLUSTER_NAME, res.getClusterName(), "Incorrect cluster name");
|
||||||
assertEquals(CLUSTER_ID, res.getClusterId(), "Incorrect cluster ID");
|
assertEquals(CLUSTER_ID, res.getClusterId(), "Incorrect cluster ID");
|
||||||
|
assertEquals(MIGRATION, res.getMigration(), "Incorrect migration");
|
||||||
|
assertEquals(RECOVERY_SEAL, res.getRecoverySeal(), "Incorrect recovery seal");
|
||||||
|
assertEquals(STORAGE_TYPE, res.getStorageType(), "Incorrect storage type");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user