Merge pull request #1514 from data-integrations/error-messages-fix

Fix error messages in GCS & BQ

Author: itsankit-google

src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java

@@ -30,21 +30,22 @@
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.cdap.api.dataset.lib.KeyValue;
+import io.cdap.cdap.api.exception.ErrorType;
 import io.cdap.cdap.api.exception.ProgramFailureException;
 import io.cdap.cdap.etl.api.Emitter;
 import io.cdap.cdap.etl.api.FailureCollector;
 import io.cdap.cdap.etl.api.batch.BatchSink;
 import io.cdap.cdap.etl.api.batch.BatchSinkContext;
 import io.cdap.cdap.etl.api.exception.ErrorContext;
 import io.cdap.cdap.etl.api.exception.ErrorDetailsProviderSpec;
-import io.cdap.cdap.etl.api.exception.ErrorPhase;
 import io.cdap.plugin.common.Asset;
 import io.cdap.plugin.gcp.bigquery.common.BigQueryErrorDetailsProvider;
 import io.cdap.plugin.gcp.bigquery.sink.lib.BigQueryTableFieldSchema;
 import io.cdap.plugin.gcp.bigquery.util.BigQueryConstants;
 import io.cdap.plugin.gcp.bigquery.util.BigQueryTypeSize;
 import io.cdap.plugin.gcp.bigquery.util.BigQueryUtil;
 import io.cdap.plugin.gcp.common.CmekUtils;
+import io.cdap.plugin.gcp.common.GCPErrorDetailsProviderUtil;
 import io.cdap.plugin.gcp.common.GCPUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.NullWritable;
@@ -105,17 +106,24 @@ public final void prepareRun(BatchSinkContext context) throws Exception {
       bigQuery = GCPUtils.getBigQuery(project, credentials, null);
       dataset = bigQuery.getDataset(datasetId);
     } catch (Exception e) {
-      ProgramFailureException ex = new BigQueryErrorDetailsProvider().getExceptionDetails(e,
-          new ErrorContext(ErrorPhase.WRITING));
-      throw ex == null ? e : ex;
+      throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e,
+          String.format("Unable to get BQ dataset '%s' details", config.getDataset()),
+          ErrorType.UNKNOWN, true, GCPUtils.BQ_SUPPORTED_DOC_URL);
     }
 
     // Get the required bucket name and bucket instance (if it exists)
     Storage storage =  GCPUtils.getStorage(project, credentials);;
     String bucketName = BigQueryUtil.getStagingBucketName(context.getArguments().asMap(), config.getLocation(),
                                                           dataset, config.getBucket());
     bucketName = BigQuerySinkUtils.configureBucket(baseConfiguration, bucketName, runUUID.toString());
-    Bucket bucket = storage.get(bucketName);
+    Bucket bucket;
+    try {
+      bucket = storage.get(bucketName);
+    } catch (Exception e) {
+      throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e,
+          String.format("Unable to get GCS bucket '%s' details", bucketName),
+          ErrorType.UNKNOWN, true, GCPUtils.GCS_SUPPORTED_DOC_URL);
+    }
 
     // Set user defined job label key value pair
     String jobLabelKeyValue = getConfig().getJobLabelKeyValue();

src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java

@@ -41,7 +41,6 @@
 import io.cdap.cdap.api.exception.ErrorUtils;
 import io.cdap.cdap.etl.api.FailureCollector;
 import io.cdap.cdap.etl.api.batch.BatchSinkContext;
-import io.cdap.cdap.etl.api.exception.ErrorPhase;
 import io.cdap.cdap.etl.api.validation.ValidationFailure;
 import io.cdap.plugin.common.Asset;
 import io.cdap.plugin.common.LineageRecorder;

src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java

@@ -39,6 +39,7 @@
 import io.cdap.cdap.api.data.format.StructuredRecord;
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.cdap.api.dataset.lib.KeyValue;
+import io.cdap.cdap.api.exception.ErrorType;
 import io.cdap.cdap.api.exception.ProgramFailureException;
 import io.cdap.cdap.etl.api.Emitter;
 import io.cdap.cdap.etl.api.FailureCollector;
@@ -51,7 +52,6 @@
 import io.cdap.cdap.etl.api.engine.sql.SQLEngineInput;
 import io.cdap.cdap.etl.api.exception.ErrorContext;
 import io.cdap.cdap.etl.api.exception.ErrorDetailsProviderSpec;
-import io.cdap.cdap.etl.api.exception.ErrorPhase;
 import io.cdap.cdap.etl.api.validation.ValidationFailure;
 import io.cdap.plugin.common.Asset;
 import io.cdap.plugin.common.LineageRecorder;
@@ -62,6 +62,7 @@
 import io.cdap.plugin.gcp.bigquery.util.BigQueryConstants;
 import io.cdap.plugin.gcp.bigquery.util.BigQueryUtil;
 import io.cdap.plugin.gcp.common.CmekUtils;
+import io.cdap.plugin.gcp.common.GCPErrorDetailsProviderUtil;
 import io.cdap.plugin.gcp.common.GCPUtils;
 import org.apache.avro.generic.GenericData;
 import org.apache.hadoop.conf.Configuration;
@@ -156,9 +157,9 @@ public void prepareRun(BatchSourceContext context) throws Exception {
       bigQuery = GCPUtils.getBigQuery(config.getProject(), credentials, null);
       dataset = bigQuery.getDataset(DatasetId.of(config.getDatasetProject(), config.getDataset()));
     } catch (Exception e) {
-      ProgramFailureException ex = new BigQueryErrorDetailsProvider().getExceptionDetails(e,
-          new ErrorContext(ErrorPhase.READING));
-      throw ex == null ? e : ex;
+      throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e,
+          String.format("Unable to get BQ dataset '%s' details", config.getDataset()),
+          ErrorType.UNKNOWN, false, GCPUtils.BQ_SUPPORTED_DOC_URL);
     }
 
     // Get Configuration for this run
@@ -180,16 +181,8 @@ public void prepareRun(BatchSourceContext context) throws Exception {
 
     // Configure GCS Bucket to use
     Storage storage =  GCPUtils.getStorage(config.getProject(), credentials);;
-    String bucket = null;
-    try {
-      bucket = BigQuerySourceUtils.getOrCreateBucket(configuration, storage, bucketName, dataset,
-          bucketPath, cmekKeyName);
-    } catch (Exception e) {
-      String errorReason = "Failed to create bucket.";
-      collector.addFailure(String.format("%s %s", errorReason, e.getMessage()), null)
-        .withStacktrace(e.getStackTrace());
-      collector.getOrThrowException();
-    }
+    String bucket = BigQuerySourceUtils.getOrCreateBucket(configuration, storage, bucketName, dataset,
+        bucketPath, cmekKeyName);
 
     // Configure Service account credentials
     BigQuerySourceUtils.configureServiceAccount(configuration, config.getConnection());

src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java

@@ -107,7 +107,6 @@ public static String getOrCreateBucket(Configuration configuration,
             String.valueOf(e.getCode()), GCPUtils.GCS_SUPPORTED_DOC_URL, e);
       }
     }
-
     return bucket;
   }