Merge pull request #1518 from data-integrations/PLUGIN-1842

[PLUGIN-1842] Fix error type in GCS Bucket Create
data-integrations · Feb 18, 2025 · 3b2036c · 3b2036c
2 parents 41a9e15 + 9ef260b
commit 3b2036c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProvider.java b/src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProvider.java
@@ -41,6 +41,7 @@ public class GCPErrorDetailsProvider implements ErrorDetailsProvider {
    * @param e The Throwable to get the error information from.
    * @return A ProgramFailureException with the given error information, otherwise null.
    */
+  @Override
   public ProgramFailureException getExceptionDetails(Exception e, ErrorContext errorContext) {
     List<Throwable> causalChain = Throwables.getCausalChain(e);
     for (Throwable t : causalChain) {

diff --git a/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java
@@ -25,6 +25,7 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.cdap.api.exception.ErrorCategory;
+import io.cdap.cdap.api.exception.ErrorCodeType;
 import io.cdap.cdap.api.exception.ErrorType;
 import io.cdap.cdap.api.exception.ErrorUtils;
 import io.cdap.cdap.etl.api.FailureCollector;
@@ -141,9 +142,12 @@ public void run(ActionContext context) throws Exception {
         } else if (gcsPath.equals(bucketPath) && config.failIfExists()) {
           // if the gcs path is just a bucket, and it exists, fail the pipeline
           rollback = true;
-          String errorReason = String.format("Path %s already exists", gcsPath);
-          throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
-            errorReason, errorReason, ErrorType.USER, true, null);
+          String errorReason = String.format("Path %s already exists. "
+                  + "Please delete the existing path or set 'Fail if Object Exists' to false.",
+              gcsPath);
+          throw ErrorUtils.getProgramFailureException(
+              new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
+              errorReason, errorReason, ErrorType.USER, true, null);
         }
       }
 
@@ -171,9 +175,12 @@ public void run(ActionContext context) throws Exception {
         } else {
           if (config.failIfExists()) {
             rollback = true;
-            String errorReason = String.format("Path %s already exists", gcsPath);
-            throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
-              errorReason, errorReason, ErrorType.SYSTEM, true, null);
+            String errorReason = String.format("Path %s already exists. "
+                + "Please delete the existing path or set 'Fail if Object Exists' to false.",
+                gcsPath);
+            throw ErrorUtils.getProgramFailureException(
+                new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
+                errorReason, errorReason, ErrorType.USER, false, null);
           }
         }
       }