>From Hussain Towaileb <[email protected]>:

Hussain Towaileb has submitted this change. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19074 )

Change subject: [NO ISSUE][EXT]: Handle errors during processing GCS credentials
......................................................................

[NO ISSUE][EXT]: Handle errors during processing GCS credentials

Ext-ref: MB-64269
Change-Id: If72aa31f5f4650495264b1ca763e61d365cc951c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19074
Reviewed-by: Murtadha Hubail <[email protected]>
Tested-by: Hussain Towaileb <[email protected]>
Integration-Tests: Hussain Towaileb <[email protected]>
---
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
1 file changed, 19 insertions(+), 2 deletions(-)

Approvals:
  Murtadha Hubail: Looks good to me, approved
  Hussain Towaileb: Verified; Verified




diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
index b61d62d..c879ec6 100644
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
@@ -1881,14 +1881,17 @@

                 try {
                     
builder.setCredentials(GoogleCredentials.getApplicationDefault());
-                } catch (IOException ex) {
+                } catch (Exception ex) {
                     throw CompilationException.create(EXTERNAL_SOURCE_ERROR, 
getMessageOrToString(ex));
                 }
             } else if (jsonCredentials != null) {
                 try (InputStream credentialsStream = new 
ByteArrayInputStream(jsonCredentials.getBytes())) {
                     
builder.setCredentials(GoogleCredentials.fromStream(credentialsStream));
                 } catch (IOException ex) {
-                    throw new CompilationException(EXTERNAL_SOURCE_ERROR, 
getMessageOrToString(ex));
+                    throw CompilationException.create(EXTERNAL_SOURCE_ERROR, 
getMessageOrToString(ex));
+                } catch (Exception ex) {
+                    throw new CompilationException(EXTERNAL_SOURCE_ERROR,
+                            "Encountered an issue while processing the JSON 
credentials. Please ensure the provided credentials are valid.");
                 }
             } else {
                 builder.setCredentials(NoCredentials.getInstance());

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19074
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: If72aa31f5f4650495264b1ca763e61d365cc951c
Gerrit-Change-Number: 19074
Gerrit-PatchSet: 3
Gerrit-Owner: Hussain Towaileb <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Hussain Towaileb <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Murtadha Hubail <[email protected]>
Gerrit-MessageType: merged

Reply via email to