SK-2274 release/25.8.2

.github/workflows/beta-release.yml

@@ -7,14 +7,15 @@ jobs:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: ${{ github.ref_name }}
-      server-id: ossrh
+      server-id: central
       profile: maven-central
       tag: 'beta'
+      module: 'v3'
     secrets:
       server-username: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_USERNAME }}
       server-password: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_PASSWORD }}
       gpg-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
       gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
       test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
-      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
+      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

.github/workflows/internal-release.yml

@@ -1,26 +1,27 @@
-name: Publish package to the JFROG Artifactory
+name: Publish v3 module to the JFROG Artifactory
 on:
   push:
     tags-ignore:
       - '*.*'
     paths-ignore:
       - "*.md"
     branches:
-      - release/*
+      - v3-release/*
 
 jobs:
-  build-and-deploy:
+  build-and-deploy-v3:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: ${{ github.ref_name }}
       server-id: central
       profile: jfrog
       tag: 'internal'
+      module: 'v3'
     secrets:
       server-username: ${{ secrets.ARTIFACTORY_USERNAME }}
       server-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
       gpg-key: ${{ secrets.JFROG_GPG_KEY }}
       gpg-passphrase: ${{ secrets.JFROG_GPG_PASSPHRASE }}
       skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
       test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
-      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
+      test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

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

@@ -21,6 +21,13 @@ on:
         description: 'Release Tag'
         required: true
         type: string
+
+      module:
+        description: 'Module to build and publish'
+        required: false
+        type: string
+        default: ''
+
     secrets:
       server-username:
         required: true
@@ -54,7 +61,7 @@ jobs:
       - name: Set up maven or jfrog repository
         uses: actions/setup-java@v1
         with:
-          java-version: "1.8"
+          java-version: "11"
           distribution: "adopt"
           server-id: ${{ inputs.server-id }}
           server-username: SERVER_USERNAME
@@ -87,7 +94,7 @@ jobs:
           if ${{ inputs.tag == 'internal' }}; then
             ./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}" "$(git rev-parse --short "$GITHUB_SHA")"
           else
-            ./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}"
+            ./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}" "" "${{ inputs.module }}"
           fi
 
       - name: Commit changes
@@ -99,7 +106,7 @@ jobs:
             git checkout ${{ env.branch_name }}
           fi
 
-          git add pom.xml
+          git add v3/pom.xml
           if [[ "${{ inputs.tag }}" == "internal" ]]; then
             git commit -m "[AUTOMATED] Private Release ${{ steps.previoustag.outputs.tag }}-dev-$(git rev-parse --short $GITHUB_SHA)"
             git push origin ${{ github.ref_name }} -f
@@ -125,9 +132,14 @@ jobs:
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
       - name: Publish package
-        run: mvn --batch-mode deploy -P ${{ inputs.profile }}
+        run: |
+          if [[ "${{ inputs.tag }}" == "internal" ]]; then
+            mvn --batch-mode -pl ${{ inputs.module }} -am deploy -P jfrog
+          elif [[ "${{ inputs.tag }}" == "beta" || "${{ inputs.tag }}" == "public" ]]; then
+            mvn --batch-mode -pl ${{ inputs.module }} -am deploy -P ${{ inputs.profile }}
+          fi
 
         env:
           SERVER_USERNAME: ${{ secrets.server-username }}
           SERVER_PASSWORD: ${{ secrets.server-password  }}
-          GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}
+          GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}

.gitignore

@@ -1,3 +1,6 @@
 .idea
 
-target
+target
+
+**/dependency-reduced-pom.xml
+.env

common/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.skyflow</groupId>
+        <artifactId>skyflow</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>common</artifactId>
+    <version>1.0.0</version>
+
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>

common/src/main/java/com/skyflow/BaseSkyflow.java

@@ -0,0 +1,48 @@
+package com.skyflow;
+
+import com.skyflow.config.Credentials;
+import com.skyflow.config.VaultConfig;
+import com.skyflow.enums.LogLevel;
+import com.skyflow.logs.InfoLogs;
+import com.skyflow.utils.BaseUtils;
+import com.skyflow.utils.logger.LogUtil;
+
+import java.util.LinkedHashMap;
+
+class BaseSkyflow {
+    private final BaseSkyflowClientBuilder builder;
+
+    protected BaseSkyflow(BaseSkyflowClientBuilder builder) {
+        this.builder = builder;
+    }
+
+    public LogLevel getLogLevel() {
+        return this.builder.logLevel;
+    }
+
+    public VaultConfig getVaultConfig() {
+        Object[] array = this.builder.vaultConfigMap.values().toArray();
+        return (VaultConfig) array[0];
+    }
+
+    static class BaseSkyflowClientBuilder {
+        protected final LinkedHashMap<String, VaultConfig> vaultConfigMap;
+        protected Credentials skyflowCredentials;
+        protected LogLevel logLevel;
+
+        protected BaseSkyflowClientBuilder() {
+            this.vaultConfigMap = new LinkedHashMap<>();
+            this.skyflowCredentials = null;
+            this.logLevel = LogLevel.ERROR;
+        }
+
+        public BaseSkyflowClientBuilder setLogLevel(LogLevel logLevel) {
+            this.logLevel = logLevel == null ? LogLevel.ERROR : logLevel;
+            LogUtil.setupLogger(this.logLevel);
+            LogUtil.printInfoLog(BaseUtils.parameterizedString(
+                    InfoLogs.CURRENT_LOG_LEVEL.getLog(), String.valueOf(logLevel)
+            ));
+            return this;
+        }
+    }
+}

src/main/java/com/skyflow/config/Credentials.java → common/src/main/java/com/skyflow/config/Credentials.java

@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-public class Credentials {
+public class Credentials implements Cloneable {
     private String path;
     private ArrayList<String> roles;
     private String context;
@@ -63,4 +63,13 @@ public String getApiKey() {
     public void setApiKey(String apiKey) {
         this.apiKey = apiKey;
     }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        Credentials cloned = (Credentials) super.clone();
+        if (this.roles != null) {
+            cloned.roles = new ArrayList<>(this.roles);
+        }
+        return cloned;
+    }
 }

src/main/java/com/skyflow/config/VaultConfig.java → common/src/main/java/com/skyflow/config/VaultConfig.java

@@ -2,7 +2,7 @@
 
 import com.skyflow.enums.Env;
 
-public class VaultConfig {
+public class VaultConfig implements Cloneable {
     private String vaultId;
     private String clusterId;
     private Env env;
@@ -46,4 +46,13 @@ public Credentials getCredentials() {
     public void setCredentials(Credentials credentials) {
         this.credentials = credentials;
     }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        VaultConfig cloned = (VaultConfig) super.clone();
+        if (this.credentials != null) {
+            cloned.credentials = (Credentials) this.credentials.clone();
+        }
+        return cloned;
+    }
 }

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

@@ -1,11 +1,12 @@
 package com.skyflow.errors;
 
-import com.skyflow.utils.Constants;
+import com.skyflow.utils.SdkVersion;
 
 public enum ErrorMessage {
     // Client initialization
     VaultIdAlreadyInConfigList("%s0 Validation error. VaultId is present in an existing config. Specify a new vaultId in config."),
     VaultIdNotInConfigList("%s0 Validation error. VaultId is missing from the config. Specify the vaultIds from configs."),
+    OnlySingleVaultConfigAllowed("%s0 Validation error. A vault config already exists. Cannot add another vault config."),
     ConnectionIdAlreadyInConfigList("%s0 Validation error. ConnectionId is present in an existing config. Specify a connectionId in config."),
     ConnectionIdNotInConfigList("%s0 Validation error. ConnectionId is missing from the config. Specify the connectionIds from configs."),
     EmptyCredentials("%s0 Validation error. Invalid credentials. Credentials must not be empty."),
@@ -51,6 +52,7 @@ public enum ErrorMessage {
     JwtDecodeError("%s0 Validation error. Invalid access token. Verify your credentials."),
     MissingAccessToken("%s0 Validation error. Access token not present in the response from bearer token generation. Verify your credentials."),
     MissingTokenType("%s0 Validation error. Token type not present in the response from bearer token generation. Verify your credentials."),
+    BearerTokenExpired("%s0 Validation error. Bearer token is invalid or expired. Please provide a valid bearer token."),
 
     // Insert
     TableKeyError("%s0 Validation error. 'table' key is missing from the payload. Specify a 'table' key."),
@@ -145,15 +147,24 @@ public enum ErrorMessage {
     FailedToDecodeFileFromResponse("%s0  Failed to decode the file from the response. Ensure the response is valid and try again."),
     EmptyFileAndFilePathInDeIdentifyFile("%s0 Validation error. Both file and filePath are empty. Specify either file object or filePath, not both."),
     PollingForResultsFailed("%s0 API error. Polling for results failed. Unable to retrieve the deidentified file"),
-    FailedtoSaveProcessedFile("%s0 Validation error. Failed to save the processed file. Ensure the output directory is valid and writable."),
+    FailedToSaveProcessedFile("%s0 Validation error. Failed to save the processed file. Ensure the output directory is valid and writable."),
     InvalidAudioFileType("%s0 Validation error. The file type is not supported. Specify a valid file type mp3 or wav."),
     // Generic
-    ErrorOccurred("%s0 API error. Error occurred.")
+    ErrorOccurred("%s0 API error. Error occurred."),
+
+    DetokenizeRequestNull("%s0 Validation error. DetokenizeRequest object is null. Specify a valid DetokenizeRequest object."),
+
+    NullTokenGroupRedactions("%s0 Validation error. TokenGroupRedaction in the list is null. Specify a valid TokenGroupRedactions object."),
+
+    NullRedactionInTokenGroup("%s0 Validation error. Redaction in TokenGroupRedactions is null or empty. Specify a valid redaction."),
+
+    NullTokenGroupNameInTokenGroup("%s0 Validation error. TokenGroupName in TokenGroupRedactions is null or empty. Specify a valid tokenGroupName."),
+    ;
     ;
     private final String message;
 
     ErrorMessage(String message) {
-        this.message = message.replace("%s0", Constants.SDK_PREFIX);
+        this.message = message.replace("%s0", SdkVersion.getSdkPrefix());
     }
 
     public String getMessage() {

src/main/java/com/skyflow/errors/SkyflowException.java → common/src/main/java/com/skyflow/errors/SkyflowException.java

@@ -4,7 +4,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.skyflow.utils.Constants;
+import com.skyflow.utils.BaseConstants;
 
 import java.util.List;
 import java.util.Map;
@@ -70,7 +70,7 @@ public String getRequestId() {
     }
 
     private void setRequestId(Map<String, List<String>> responseHeaders) {
-        List<String> ids = responseHeaders.get(Constants.REQUEST_ID_HEADER_KEY);
+        List<String> ids = responseHeaders.get(BaseConstants.REQUEST_ID_HEADER_KEY);
         this.requestId = ids == null ? null : ids.get(0);
     }
 
@@ -99,7 +99,7 @@ public JsonArray getDetails() {
 
     private void setDetails(Map<String, List<String>> responseHeaders) {
         JsonElement detailsElement = ((JsonObject) responseBody.get("error")).get("details");
-        List<String> errorFromClientHeader = responseHeaders.get(Constants.ERROR_FROM_CLIENT_HEADER_KEY);
+        List<String> errorFromClientHeader = responseHeaders.get(BaseConstants.ERROR_FROM_CLIENT_HEADER_KEY);
         if (detailsElement != null) {
             this.details = detailsElement.getAsJsonArray();
         }

common/src/main/java/com/skyflow/generated/auth/rest/ApiClient.java

@@ -0,0 +1,28 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+package com.skyflow.generated.auth.rest;
+
+import com.skyflow.generated.auth.rest.core.ClientOptions;
+import com.skyflow.generated.auth.rest.core.Suppliers;
+import com.skyflow.generated.auth.rest.resources.authentication.AuthenticationClient;
+import java.util.function.Supplier;
+
+public class ApiClient {
+    protected final ClientOptions clientOptions;
+
+    protected final Supplier<AuthenticationClient> authenticationClient;
+
+    public ApiClient(ClientOptions clientOptions) {
+        this.clientOptions = clientOptions;
+        this.authenticationClient = Suppliers.memoize(() -> new AuthenticationClient(clientOptions));
+    }
+
+    public AuthenticationClient authentication() {
+        return this.authenticationClient.get();
+    }
+
+    public static ApiClientBuilder builder() {
+        return new ApiClientBuilder();
+    }
+}