diff --git a/gradle.properties b/gradle.properties index 47f16bc9..03e64815 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,4 @@ group=com.nike artifactId=cerberus-lifecycle-cli -version=3.0.0 +version=3.0.1 diff --git a/src/main/java/com/nike/cerberus/operation/core/CreateCerberusBackupOperation.java b/src/main/java/com/nike/cerberus/operation/core/CreateCerberusBackupOperation.java index 7006b7ba..900da3c6 100644 --- a/src/main/java/com/nike/cerberus/operation/core/CreateCerberusBackupOperation.java +++ b/src/main/java/com/nike/cerberus/operation/core/CreateCerberusBackupOperation.java @@ -53,7 +53,6 @@ import com.nike.cerberus.domain.backup.CerberusBackupMetadata; import com.nike.cerberus.domain.backup.CerberusSdbMetadata; import com.nike.cerberus.domain.environment.BackupRegionInfo; -import com.nike.cerberus.module.CerberusModule; import com.nike.cerberus.operation.Operation; import com.nike.cerberus.service.MetricsService; import com.nike.cerberus.service.S3StoreService; @@ -65,7 +64,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; diff --git a/src/main/java/com/nike/cerberus/store/ConfigStore.java b/src/main/java/com/nike/cerberus/store/ConfigStore.java index cbd33d67..676c59db 100644 --- a/src/main/java/com/nike/cerberus/store/ConfigStore.java +++ b/src/main/java/com/nike/cerberus/store/ConfigStore.java @@ -570,6 +570,7 @@ public Properties getCmsSystemProperties() { final BaseOutputs baseOutputs = getBaseStackOutputs(); final BaseParameters baseParameters = getBaseStackParameters(); + final VaultParameters vaultParameters = getVaultStackParamters(); final Optional cmsVaultToken = getCmsVaultToken(); final Optional cmsDatabasePassword = getCmsDatabasePassword(); @@ -578,7 +579,7 @@ public Properties getCmsSystemProperties() { final String rootUserArn = String.format("arn:aws:iam::%s:root", callerIdentity.getAccount()); final Properties properties = new Properties(); - properties.put(VAULT_ADDR_KEY, getCerberusBaseUrl()); + properties.put(VAULT_ADDR_KEY, String.format("https://%s", cnameToHost(vaultParameters.getCname()))); properties.put(VAULT_TOKEN_KEY, cmsVaultToken.get()); properties.put(ROOT_USER_ARN_KEY, rootUserArn); properties.put(ADMIN_ROLE_ARN_KEY, baseParameters.getAccountAdminArn());