Skip to content

Commit ad003b0

Browse files
committed
Catch exceptions of IDToken construction
1 parent 7b10755 commit ad003b0

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EnvVarIDTokenSource.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ public IDToken getIDToken(String audience) {
4141
throw new IllegalArgumentException("Environment cannot be null");
4242
}
4343

44-
String token = env.get(envVarName);
45-
if (Strings.isNullOrEmpty(token)) {
46-
throw new DatabricksException("Missing environment variable: " + envVarName);
44+
try {
45+
String token = env.get(envVarName);
46+
return new IDToken(token);
47+
} catch (IllegalArgumentException e) {
48+
throw new DatabricksException(
49+
"Received empty ID token from environment variable " + envVarName);
4750
}
48-
return new IDToken(token);
4951
}
5052
}

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileIDTokenSource.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ public IDToken getIDToken(String audience) {
5656
throw new DatabricksException("File " + filePath + " is empty");
5757
}
5858

59-
String token = lines.get(0).trim();
60-
if (Strings.isNullOrEmpty(token)) {
61-
throw new DatabricksException("File " + filePath + " is empty");
59+
try {
60+
String token = lines.get(0).trim();
61+
return new IDToken(token);
62+
} catch (IllegalArgumentException e) {
63+
throw new DatabricksException("Received empty ID token from file " + filePath);
6264
}
6365

64-
return new IDToken(token);
6566
} catch (IOException e) {
6667
throw new DatabricksException(
6768
"Failed to read ID token from file " + filePath + ": " + e.getMessage(), e);

0 commit comments

Comments
 (0)