- add new enum value OUTPUT_TYPE
- add reading new OUTPUT_TYPE env in EnvsForClient
- add handling output type to ClientConfigurationFactory
Issue-ID: AAF-1152
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: I60269c3befff90f685e16a8e7255674df6ca9368
REQUEST_URL,
REQUEST_TIMEOUT,
OUTPUT_PATH,
REQUEST_URL,
REQUEST_TIMEOUT,
OUTPUT_PATH,
return readEnv(ClientConfigurationEnvs.CA_NAME);
}
return readEnv(ClientConfigurationEnvs.CA_NAME);
}
+ public Optional<String> getOutputType() {
+ return readEnv(ClientConfigurationEnvs.OUTPUT_TYPE);
+ }
+
private Optional<String> readEnv(ClientConfigurationEnvs envName) {
return envProvider.readEnvVariable(envName.toString());
}
private Optional<String> readEnv(ClientConfigurationEnvs envName) {
return envProvider.readEnvVariable(envName.toString());
}
.map(configuration::setCaName)
.orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid."));
.map(configuration::setCaName)
.orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid."));
+ envsForClient.getOutputType()
+ .map(configuration::setOutputType);
+
LOGGER.info("Successful validation of Client configuration. Configuration data: {}", configuration.toString());
return configuration;
LOGGER.info("Successful validation of Client configuration. Configuration data: {}", configuration.toString());
return configuration;
private static final Integer DEFAULT_TIMEOUT_MS = 30000;
private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
private static final Integer DEFAULT_TIMEOUT_MS = 30000;
private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
+ private static final String DEFAULT_OUTPUT_TYPE = "P12";
private String urlToCertService;
private Integer requestTimeout;
private String certsOutputPath;
private String caName;
private String urlToCertService;
private Integer requestTimeout;
private String certsOutputPath;
private String caName;
+ private String outputType;
public ClientConfiguration() {
urlToCertService = DEFAULT_REQUEST_URL;
requestTimeout = DEFAULT_TIMEOUT_MS;
public ClientConfiguration() {
urlToCertService = DEFAULT_REQUEST_URL;
requestTimeout = DEFAULT_TIMEOUT_MS;
+ outputType = DEFAULT_OUTPUT_TYPE;
+ public String getOutputType() {
+ return outputType;
+ }
+
+ public ClientConfiguration setOutputType(String outputType) {
+ this.outputType = outputType;
+ return this;
+ }
+
@Override
public String toString() {
@Override
public String toString() {
- return String.format("%s: %s, %s: %s, %s: %s, %s: %s",
+ return String.format("%s: %s, %s: %s, %s: %s, %s: %s, %s: %s",
ClientConfigurationEnvs.REQUEST_URL, urlToCertService,
ClientConfigurationEnvs.REQUEST_TIMEOUT, requestTimeout,
ClientConfigurationEnvs.OUTPUT_PATH, certsOutputPath,
ClientConfigurationEnvs.REQUEST_URL, urlToCertService,
ClientConfigurationEnvs.REQUEST_TIMEOUT, requestTimeout,
ClientConfigurationEnvs.OUTPUT_PATH, certsOutputPath,
- ClientConfigurationEnvs.CA_NAME, caName);
+ ClientConfigurationEnvs.CA_NAME, caName,
+ ClientConfigurationEnvs.OUTPUT_TYPE, outputType);
REQUEST_TIMEOUT=10000
OUTPUT_PATH=/var/certs
CA_NAME=RA
REQUEST_TIMEOUT=10000
OUTPUT_PATH=/var/certs
CA_NAME=RA
#Csr config envs
COMMON_NAME=onap.org
ORGANIZATION=Linux-Foundation
#Csr config envs
COMMON_NAME=onap.org
ORGANIZATION=Linux-Foundation