Skip to content

Commit 0fbe434

Browse files
SK-2071: test pr yml
1 parent bee5731 commit 0fbe434

2 files changed

Lines changed: 21 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ protected void setBearerToken() throws SkyflowException {
218218
prioritiseCredentials();
219219
Validations.validateCredentials(this.finalCredentials);
220220
if (this.finalCredentials.getApiKey() != null) {
221-
setApiKey();
222-
return;
221+
// setApiKey();
222+
token=this.finalCredentials.getApiKey();
223223
} else if (Token.isExpired(token)) {
224224
LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog());
225225
token = Utils.generateBearerToken(this.finalCredentials);
@@ -784,7 +784,7 @@ private void setApiKey() {
784784
} else {
785785
LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
786786
}
787-
this.apiClientBuilder.token(token);
787+
// this.apiClientBuilder.token(token);
788788
}
789789

790790
private void updateVaultURL() {

src/test/java/com/skyflow/VaultClientTests.java

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ public static void setup() {
8080
@Test
8181
public void testVaultClientGetRecordsAPI() {
8282
try {
83-
Dotenv dotenv = Dotenv.load();
83+
// Dotenv dotenv = Dotenv.load();
84+
// Credentials credentials = new Credentials();
85+
// credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
86+
// vaultConfig.setCredentials(credentials);
8487
Credentials credentials = new Credentials();
85-
credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
88+
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321"); // Use a non-null dummy API key
8689
vaultConfig.setCredentials(credentials);
8790
vaultClient = new VaultClient(vaultConfig, credentials);
8891
vaultClient.setBearerToken();
@@ -99,9 +102,12 @@ public void testVaultClientGetRecordsAPI() {
99102
@Test
100103
public void testVaultClientGetTokensAPI() {
101104
try {
102-
Dotenv dotenv = Dotenv.load();
105+
// Dotenv dotenv = Dotenv.load();
106+
// Credentials credentials = new Credentials();
107+
// credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
108+
// vaultConfig.setCredentials(credentials);
103109
Credentials credentials = new Credentials();
104-
credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
110+
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321"); // Use a non-null dummy API key
105111
vaultConfig.setCredentials(credentials);
106112
vaultClient = new VaultClient(vaultConfig, credentials);
107113
vaultClient.setBearerToken();
@@ -116,10 +122,15 @@ public void testVaultClientGetTokensAPI() {
116122
@Test
117123
public void testVaultClientGetQueryAPI() {
118124
try {
119-
Dotenv dotenv = Dotenv.load();
125+
// Dotenv dotenv = Dotenv.load();
126+
// Credentials credentials = new Credentials();
127+
// credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
128+
// vaultConfig.setCredentials(credentials);
129+
120130
Credentials credentials = new Credentials();
121-
credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
131+
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321"); // Use a non-null dummy API key
122132
vaultConfig.setCredentials(credentials);
133+
123134
vaultClient = new VaultClient(vaultConfig, credentials);
124135
vaultClient.setBearerToken();
125136
} catch (Exception e) {
@@ -287,10 +298,8 @@ public void testGetTokenizePayload() {
287298
@Test
288299
public void testSetBearerToken() {
289300
try {
290-
Dotenv dotenv = Dotenv.load();
291301
Credentials credentials = new Credentials();
292-
credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
293-
System.out.println(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
302+
credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321"); // Use a non-null dummy API key
294303
vaultConfig.setCredentials(credentials);
295304
vaultClient = new VaultClient(vaultConfig, credentials);
296305
vaultClient.setBearerToken();

0 commit comments

Comments
 (0)