Skip to content

Commit b64524d

Browse files
skyflow-shravanskyflow-shravan
authored
SK-2286 take vault url from env and override (#223)
* SK-2286 take vault url from env and override * SK-2286 add validation for vault url format * SK-2286 add validation for vault url format
1 parent bb87aa9 commit b64524d

5 files changed

Lines changed: 40 additions & 7 deletions

File tree

‎common/src/main/java/com/skyflow/errors/ErrorMessage.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public enum ErrorMessage {
1616
EmptyVaultId("%s0 Initialization failed. Invalid vault ID. Vault ID must not be empty."),
1717
InvalidClusterId("%s0 Initialization failed. Invalid cluster ID. Specify cluster ID."),
1818
EmptyClusterId("%s0 Initialization failed. Invalid cluster ID. Specify a valid cluster ID."),
19+
EmptyVaultUrl("%s0 Initialization failed. Vault URL is empty. Specify a valid vault URL."),
20+
InvalidVaultUrlFormat("%s0 Initialization failed. Vault URL must start with 'https://'."),
1921

2022
// Connection config
2123
InvalidConnectionId("%s0 Initialization failed. Invalid connection ID. Specify a valid connection ID."),
@@ -73,11 +75,13 @@ public enum ErrorMessage {
7375
InsufficientTokensPassedForTokenModeEnableStrict("%s0 Validation error. 'tokenMode' is set to 'ENABLE_STRICT', but some fields are missing tokens. Specify tokens for all fields."),
7476
BatchInsertPartialSuccess("%s0 Insert operation completed with partial success."),
7577
BatchInsertFailure("%s0 Insert operation failed."),
78+
RecordSizeExceedError("%s0 Maximum number of records exceeded. The limit is 10000."),
7679

7780
// Detokenize
7881
InvalidDetokenizeData("%s0 Validation error. Invalid detokenize data. Specify valid detokenize data."),
7982
EmptyDetokenizeData("%s0 Validation error. Invalid data tokens. Specify at least one data token."),
8083
EmptyTokenInDetokenizeData("%s0 Validation error. Invalid data tokens. Specify a valid data token."),
84+
TokensSizeExceedError("%s0 Maximum number of tokens exceeded. The limit is 10000."),
8185

8286
// Get
8387
IdsKeyError("%s0 Validation error. 'ids' key is missing from the payload. Specify an 'ids' key."),

‎common/src/main/java/com/skyflow/utils/BaseUtils.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import com.skyflow.serviceaccount.util.BearerToken;
1212
import com.skyflow.serviceaccount.util.Token;
1313
import com.skyflow.utils.logger.LogUtil;
14+
import io.github.cdimascio.dotenv.Dotenv;
15+
import io.github.cdimascio.dotenv.DotenvException;
1416
import org.apache.commons.codec.binary.Base64;
1517

1618
import java.io.File;
@@ -43,6 +45,23 @@ public static String getVaultURL(String clusterId, Env env, String vaultDomain)
4345
return sb.toString();
4446
}
4547

48+
public static String getEnvVaultURL() {
49+
try {
50+
Dotenv dotenv = Dotenv.load();
51+
String vaultURL = dotenv.get("VAULT_URL");
52+
if (vaultURL != null && vaultURL.trim().isEmpty()) {
53+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultUrl.getMessage());
54+
} else if (vaultURL != null && !vaultURL.startsWith(BaseConstants.SECURE_PROTOCOL)) {
55+
throw new SkyflowException( ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidVaultUrlFormat.getMessage());
56+
}
57+
return vaultURL;
58+
} catch (DotenvException e) {
59+
return null;
60+
} catch (SkyflowException e) {
61+
throw new RuntimeException(e);
62+
}
63+
}
64+
4665
public static String generateBearerToken(Credentials credentials) throws SkyflowException {
4766
String bearerToken;
4867
if (credentials.getPath() != null) {

‎common/src/main/java/com/skyflow/utils/validations/BaseValidations.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ public static void validateVaultConfig(VaultConfig vaultConfig) throws SkyflowEx
2828
} else if (vaultId.trim().isEmpty()) {
2929
LogUtil.printErrorLog(ErrorLogs.EMPTY_VAULT_ID.getLog());
3030
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyVaultId.getMessage());
31-
} else if (clusterId == null) {
32-
LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog());
33-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage());
34-
} else if (clusterId.trim().isEmpty()) {
35-
LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog());
36-
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage());
31+
} else if (BaseUtils.getEnvVaultURL() == null) {
32+
if (clusterId == null) {
33+
LogUtil.printErrorLog(ErrorLogs.CLUSTER_ID_IS_REQUIRED.getLog());
34+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidClusterId.getMessage());
35+
} else if (clusterId.trim().isEmpty()) {
36+
LogUtil.printErrorLog(ErrorLogs.EMPTY_CLUSTER_ID.getLog());
37+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyClusterId.getMessage());
38+
}
3739
} else if (credentials != null) {
3840
validateCredentials(credentials);
3941
}

‎v3/src/main/java/com/skyflow/VaultClient.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ protected void setBearerToken() throws SkyflowException {
8080
}
8181

8282
private void updateVaultURL() {
83-
String vaultURL = Utils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
83+
String vaultURL = Utils.getEnvVaultURL();
84+
if (vaultURL == null || vaultURL.isEmpty()) {
85+
vaultURL = Utils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
86+
}
8487
this.apiClientBuilder.url(vaultURL);
8588
}
8689

‎v3/src/main/java/com/skyflow/utils/validations/Validations.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public static void validateInsertRequest(InsertRequest insertRequest) throws Sky
4646
ErrorLogs.EMPTY_VALUES.getLog(), InterfaceName.INSERT.getName()
4747
));
4848
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.EmptyValues.getMessage());
49+
} else if(values.size() > 10000) {
50+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.RecordSizeExceedError.getMessage());
4951
} else if (upsert != null && upsert.isEmpty()){
5052
LogUtil.printErrorLog(Utils.parameterizedString(
5153
ErrorLogs.EMPTY_UPSERT.getLog(), InterfaceName.INSERT.getName()
@@ -82,6 +84,9 @@ public static void validateDetokenizeRequest(DetokenizeRequest request) throws S
8284
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.DetokenizeRequestNull.getMessage());
8385
}
8486
List<String> tokens = request.getTokens();
87+
if(tokens.size() > 10000) {
88+
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.TokensSizeExceedError.getMessage());
89+
}
8590
if (tokens == null || tokens.isEmpty()) {
8691
LogUtil.printErrorLog(Utils.parameterizedString(
8792
ErrorLogs.EMPTY_DETOKENIZE_DATA.getLog(), InterfaceName.DETOKENIZE.getName()

0 commit comments

Comments
 (0)