model: add "build_date" to SealResponse (#73)
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
65fb01617d
commit
151b58dc82
@ -19,6 +19,7 @@ package de.stklcode.jvault.connector.model.response;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -29,7 +30,7 @@ import java.util.Objects;
|
|||||||
*/
|
*/
|
||||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SealResponse implements VaultResponse {
|
public final class SealResponse implements VaultResponse {
|
||||||
private static final long serialVersionUID = -3661916639367542617L;
|
private static final long serialVersionUID = -6000309255473305787L;
|
||||||
|
|
||||||
@JsonProperty("type")
|
@JsonProperty("type")
|
||||||
private String type;
|
private String type;
|
||||||
@ -52,6 +53,9 @@ public final class SealResponse implements VaultResponse {
|
|||||||
@JsonProperty("version")
|
@JsonProperty("version")
|
||||||
private String version;
|
private String version;
|
||||||
|
|
||||||
|
@JsonProperty("build_date")
|
||||||
|
private ZonedDateTime buildDate;
|
||||||
|
|
||||||
@JsonProperty("nonce")
|
@JsonProperty("nonce")
|
||||||
private String nonce;
|
private String nonce;
|
||||||
|
|
||||||
@ -122,6 +126,14 @@ public final class SealResponse implements VaultResponse {
|
|||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Vault build date.
|
||||||
|
* @since 1.2
|
||||||
|
*/
|
||||||
|
public ZonedDateTime getBuildDate() {
|
||||||
|
return buildDate;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return A random nonce.
|
* @return A random nonce.
|
||||||
* @since 0.8
|
* @since 0.8
|
||||||
@ -185,6 +197,7 @@ public final class SealResponse implements VaultResponse {
|
|||||||
Objects.equals(numberOfShares, that.numberOfShares) &&
|
Objects.equals(numberOfShares, that.numberOfShares) &&
|
||||||
Objects.equals(progress, that.progress) &&
|
Objects.equals(progress, that.progress) &&
|
||||||
Objects.equals(version, that.version) &&
|
Objects.equals(version, that.version) &&
|
||||||
|
Objects.equals(buildDate, that.buildDate) &&
|
||||||
Objects.equals(nonce, that.nonce) &&
|
Objects.equals(nonce, that.nonce) &&
|
||||||
Objects.equals(clusterName, that.clusterName) &&
|
Objects.equals(clusterName, that.clusterName) &&
|
||||||
Objects.equals(clusterId, that.clusterId) &&
|
Objects.equals(clusterId, that.clusterId) &&
|
||||||
@ -195,7 +208,7 @@ public final class SealResponse implements VaultResponse {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hash(type, sealed, initialized, threshold, numberOfShares, progress, version, nonce,
|
return Objects.hash(type, sealed, initialized, threshold, numberOfShares, progress, version, buildDate, nonce,
|
||||||
clusterName, clusterId, migration, recoverySeal, storageType);
|
clusterName, clusterId, migration, recoverySeal, storageType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
|||||||
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
import de.stklcode.jvault.connector.model.AbstractModelTest;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -34,7 +36,8 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
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 = "1.8.2";
|
private static final String VERSION = "1.15.3";
|
||||||
|
private static final String BUILD_DATE = "2023-11-22T20:59:54Z";
|
||||||
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";
|
||||||
@ -51,6 +54,7 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
" \"progress\": " + PROGRESS_SEALED + ",\n" +
|
" \"progress\": " + PROGRESS_SEALED + ",\n" +
|
||||||
" \"nonce\": \"\",\n" +
|
" \"nonce\": \"\",\n" +
|
||||||
" \"version\": \"" + VERSION + "\",\n" +
|
" \"version\": \"" + VERSION + "\",\n" +
|
||||||
|
" \"build_date\": \"" + BUILD_DATE + "\",\n" +
|
||||||
" \"migration\": \"" + MIGRATION + "\",\n" +
|
" \"migration\": \"" + MIGRATION + "\",\n" +
|
||||||
" \"recovery_seal\": \"" + RECOVERY_SEAL + "\",\n" +
|
" \"recovery_seal\": \"" + RECOVERY_SEAL + "\",\n" +
|
||||||
" \"storage_type\": \"" + STORAGE_TYPE + "\"\n" +
|
" \"storage_type\": \"" + STORAGE_TYPE + "\"\n" +
|
||||||
@ -64,6 +68,7 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
" \"n\": " + SHARES + ",\n" +
|
" \"n\": " + SHARES + ",\n" +
|
||||||
" \"progress\": " + PROGRESS_UNSEALED + ",\n" +
|
" \"progress\": " + PROGRESS_UNSEALED + ",\n" +
|
||||||
" \"version\": \"" + VERSION + "\",\n" +
|
" \"version\": \"" + VERSION + "\",\n" +
|
||||||
|
" \"build_date\": \"" + BUILD_DATE + "\",\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" +
|
||||||
@ -105,6 +110,7 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
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(ZonedDateTime.parse(BUILD_DATE), res.getBuildDate(), "Incorrect build date");
|
||||||
assertEquals(MIGRATION, res.getMigration(), "Incorrect migration");
|
assertEquals(MIGRATION, res.getMigration(), "Incorrect migration");
|
||||||
assertEquals(RECOVERY_SEAL, res.getRecoverySeal(), "Incorrect recovery seal");
|
assertEquals(RECOVERY_SEAL, res.getRecoverySeal(), "Incorrect recovery seal");
|
||||||
assertEquals(STORAGE_TYPE, res.getStorageType(), "Incorrect storage type");
|
assertEquals(STORAGE_TYPE, res.getStorageType(), "Incorrect storage type");
|
||||||
@ -127,6 +133,7 @@ class SealResponseTest extends AbstractModelTest<SealResponse> {
|
|||||||
assertEquals(PROGRESS_UNSEALED, res.getProgress(), "Incorrect progress");
|
assertEquals(PROGRESS_UNSEALED, res.getProgress(), "Incorrect progress");
|
||||||
assertEquals(NONCE, res.getNonce(), "Incorrect nonce");
|
assertEquals(NONCE, res.getNonce(), "Incorrect nonce");
|
||||||
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
assertEquals(VERSION, res.getVersion(), "Incorrect version");
|
||||||
|
assertEquals(ZonedDateTime.parse(BUILD_DATE), res.getBuildDate(), "Incorrect build date");
|
||||||
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(MIGRATION, res.getMigration(), "Incorrect migration");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user