Skip to content

Updated CLI token source parseExpiry method to account for different time format #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nfx merged 7 commits into from
Jul 17, 2023
Merged

Updated CLI token source parseExpiry method to account for different time format #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4df3d79
update parseExpiry
tanmay-db Jul 17, 2023
00a623a
cleanup
tanmay-db Jul 17, 2023
6bae4d1
account for multiple precision pattern
tanmay-db Jul 17, 2023
5049891
Merge branch 'main' into parseExpiry
tanmay-db Jul 17, 2023
09cd975
-
tanmay-db Jul 17, 2023
37e8929
Merge branch 'parseExpiry' of github.com:databricks/databricks-sdk-ja…
tanmay-db Jul 17, 2023
a342237
-
tanmay-db Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions databricks-sdk-java/src/main/java/com/databricks/sdk/core/CliTokenSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ public CliTokenSource(
this.getAllEnv = getAllEnv;
}

private static LocalDateTime parseExpiry(String expiry) {
static LocalDateTime parseExpiry(String expiry) {
Copy link
Contributor Author

@tanmay-db tanmay-db Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making package private

String multiplePrecisionPattern =
Copy link
Contributor Author

@tanmay-db tanmay-db Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would need to account for multiple precision digits else it would be fragile. There are difference in how Java 8,11 uses the formatter vs higher versions: 17, 20. https://github.com/databricks/databricks-sdk-java/actions/runs/5575864416/jobs/10186346317?pr=116

We could also truncate the digits to milli or micro seconds but it doesn't account for digits lower than them, will have loss of data and more maintenance. It is better to do pattern matching for all 1-9 digits.

"[SSSSSSSSS][SSSSSSSS][SSSSSSS][SSSSSS][SSSSS][SSSS][SSS][SS][S]";
List<String> datePatterns =
Arrays.asList(
"yyyy-MM-dd HH:mm:ss.SSSSSS", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX");
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mm:ss." + multiplePrecisionPattern,
"yyyy-MM-dd'T'HH:mm:ss." + multiplePrecisionPattern + "XXX",
"yyyy-MM-dd'T'HH:mm:ss." + multiplePrecisionPattern + "'Z'");
DateTimeParseException lastException = null;
for (String pattern : datePatterns) {
try {
Expand Down
37 changes: 37 additions & 0 deletions databricks-sdk-java/src/test/java/com/databricks/sdk/core/CliTokenSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.databricks.sdk.core;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;
import org.junit.jupiter.api.Test;

public class CliTokenSourceTest {

@Test
public void testParseExpiryWithoutTruncate() {
LocalDateTime parsedDateTime = CliTokenSource.parseExpiry("2023-07-17T09:02:22.330612218Z");
assertEquals(LocalDateTime.of(2023, 7, 17, 9, 2, 22, 330612218), parsedDateTime);
}

@Test
public void testParseExpiryWithTruncate() {
LocalDateTime parsedDateTime = CliTokenSource.parseExpiry("2023-07-17T09:02:22.33061221Z");
assertEquals(LocalDateTime.of(2023, 7, 17, 9, 2, 22, 330612210), parsedDateTime);
}

@Test
public void testParseExpiryWithTruncateAndLessNanoSecondDigits() {
LocalDateTime parsedDateTime = CliTokenSource.parseExpiry("2023-07-17T09:02:22.330612Z");
assertEquals(LocalDateTime.of(2023, 7, 17, 9, 2, 22, 330612000), parsedDateTime);
}

@Test
public void testParseExpiryWithMoreThanNineNanoSecondDigits() {
try {
CliTokenSource.parseExpiry("2023-07-17T09:02:22.33061221987Z");
} catch (DateTimeParseException e) {
assert (e.getMessage().contains("could not be parsed"));
}
}
}