SK-2071: update vault client

Author: saileshwar-skyflow

.github/workflows/beta-release.yml

@@ -18,4 +18,3 @@ jobs:
       skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
       test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
       test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
-      vault-client-creds: ${{ secrets.VAULT_CLIENT_SKYFLOW_CREDENTIALS }} >> .env

.github/workflows/internal-release.yml

@@ -25,4 +25,3 @@ jobs:
       skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
       test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
       test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
-      vault-client-creds: ${{ secrets.VAULT_CLIENT_SKYFLOW_CREDENTIALS }} >> .env

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
       - name: Build & Run tests with Maven
-        run: mvn -B package -DTEST_VAULT_ID=${{ secrets.TEST_VAULT_ID }} -DTEST_VAULT_URL=${{ secrets.TEST_VAULT_URL }} -DTEST_SKYFLOW_ID=${{ secrets.TEST_SKYFLOW_ID }} -DTEST_TOKEN=${{ secrets.TEST_TOKEN }} -DTEST_CREDENTIALS=${{ secrets.TEST_CREDENTIALS_FILE_STRING }} -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -DTEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} -DVAULT_CLIENT_SKYFLOW_CREDENTIALS=${{ secrets.VAULT_CLIENT_SKYFLOW_CREDENTIALS }} -f pom.xml
+        run: mvn -B package -DTEST_VAULT_ID=${{ secrets.TEST_VAULT_ID }} -DTEST_VAULT_URL=${{ secrets.TEST_VAULT_URL }} -DTEST_SKYFLOW_ID=${{ secrets.TEST_SKYFLOW_ID }} -DTEST_TOKEN=${{ secrets.TEST_TOKEN }} -DTEST_CREDENTIALS=${{ secrets.TEST_CREDENTIALS_FILE_STRING }} -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -DTEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} -f pom.xml
 
       - name: Codecov
         uses: codecov/codecov-action@v2.1.0

.github/workflows/pr.yml

@@ -40,7 +40,6 @@ jobs:
           echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
           echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
           echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
-          echo VAULT_CLIENT_SKYFLOW_CREDENTIALS=${{ secrets.VAULT_CLIENT_SKYFLOW_CREDENTIALS }} >> .env
 
       - name: Build & Run tests with Maven
         run: mvn -B package -f pom.xml

.github/workflows/release.yml

@@ -18,4 +18,3 @@ jobs:
       skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
       test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
       test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
-      vault-client-creds: ${{ secrets.VAULT_CLIENT_SKYFLOW_CREDENTIALS }} >> .env

.github/workflows/shared-build-and-deploy.yml

@@ -43,9 +43,6 @@ on:
       test-reusable-token:
         required: true
 
-      vault-client-creds:
-        required: true
-
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -119,7 +116,6 @@ jobs:
           echo SKYFLOW_CREDENTIALS=${{ secrets.skyflow-credentials }} >> .env
           echo TEST_EXPIRED_TOKEN=${{ secrets.test-expired-token }} >> .env
           echo TEST_REUSABLE_TOKEN=${{ secrets.test-reusable-token }} >> .env
-          echo VAULT_CLIENT_SKYFLOW_CREDENTIALS=${{ secrets.vault-client-creds }} >> .env
 
       - name: Create credentials json
         id: create-json

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

@@ -218,7 +218,7 @@ protected void setBearerToken() throws SkyflowException {
         prioritiseCredentials();
         Validations.validateCredentials(this.finalCredentials);
         if (this.finalCredentials.getApiKey() != null) {
-//            setApiKey();
+            LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
             token=this.finalCredentials.getApiKey();
         } else if (Token.isExpired(token)) {
             LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog());
@@ -777,16 +777,6 @@ private TokenTypeWithoutVault buildTokenType(TokenFormat tokenFormat,
                 .build();
     }
 
-
-    private void setApiKey() {
-        if (apiKey == null) {
-            apiKey = this.finalCredentials.getApiKey();
-        } else {
-            LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
-        }
-//        this.apiClientBuilder.token(token);
-    }
-
     private void updateVaultURL() {
         String vaultURL = Utils.getVaultURL(this.vaultConfig.getClusterId(), this.vaultConfig.getEnv());
         this.apiClientBuilder.url(vaultURL);

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

@@ -80,9 +80,8 @@ public static void setup() {
     @Test
     public void testVaultClientGetRecordsAPI() {
         try {
-            Dotenv dotenv = Dotenv.load();
             Credentials credentials = new Credentials();
-            credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
+            credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
             vaultConfig.setCredentials(credentials);
             vaultClient = new VaultClient(vaultConfig, credentials);
             vaultClient.setBearerToken();
@@ -99,9 +98,8 @@ public void testVaultClientGetRecordsAPI() {
     @Test
     public void testVaultClientGetTokensAPI() {
         try {
-            Dotenv dotenv = Dotenv.load();
             Credentials credentials = new Credentials();
-            credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
+            credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
             vaultConfig.setCredentials(credentials);
             vaultClient = new VaultClient(vaultConfig, credentials);
             vaultClient.setBearerToken();
@@ -116,9 +114,8 @@ public void testVaultClientGetTokensAPI() {
     @Test
     public void testVaultClientGetQueryAPI() {
         try {
-            Dotenv dotenv = Dotenv.load();
             Credentials credentials = new Credentials();
-            credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
+            credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
             vaultConfig.setCredentials(credentials);
 
             vaultClient = new VaultClient(vaultConfig, credentials);
@@ -288,9 +285,8 @@ public void testGetTokenizePayload() {
     @Test
     public void testSetBearerToken() {
         try {
-            Dotenv dotenv = Dotenv.load();
             Credentials credentials = new Credentials();
-            credentials.setCredentialsString(dotenv.get("VAULT_CLIENT_SKYFLOW_CREDENTIALS"));
+            credentials.setApiKey("sky-ab123-abcd1234cdef1234abcd4321cdef4321");
             vaultConfig.setCredentials(credentials);
             vaultClient = new VaultClient(vaultConfig, credentials);
             vaultClient.setBearerToken();