Skip to content

Properly parse ISO date strings #473

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
fjakobs merged 5 commits into from
Dec 7, 2023
Merged

Properly parse ISO date strings #473

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e070ff
Use "fromisoformat" to parse tokens from the CLI
fjakobs Dec 5, 2023
b267307
Use dateutil for ISO time parsing
fjakobs Dec 6, 2023
47fe244
Copy code from google OAuth credentials.py
fjakobs Dec 6, 2023
56cc374
Assert return values
fjakobs Dec 7, 2023
ca4964a
Merge branch 'main' into ES-959603
fjakobs Dec 7, 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
3 changes: 2 additions & 1 deletion databricks/sdk/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ def __init__(self, cmd: List[str], token_type_field: str, access_token_field: st

@staticmethod
def _parse_expiry(expiry: str) -> datetime:
for fmt in ("%Y-%m-%d %H:%M:%S.%f", "%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S.%f%z"):
expiry = expiry.rstrip("Z").split(".")[0]
for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%dT%H:%M:%S"):
try:
return datetime.strptime(expiry, fmt)
except ValueError as e:
Expand Down
14 changes: 10 additions & 4 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

from databricks.sdk import WorkspaceClient
from databricks.sdk.azure import ENVIRONMENTS, AzureEnvironment
from databricks.sdk.core import (ApiClient, Config, CredentialsProvider,
DatabricksCliTokenSource, DatabricksError,
HeaderFactory, StreamingResponse,
databricks_cli)
from databricks.sdk.core import (ApiClient, CliTokenSource, Config,
CredentialsProvider, DatabricksCliTokenSource,
DatabricksError, HeaderFactory,
StreamingResponse, databricks_cli)
from databricks.sdk.service.catalog import PermissionsChange
from databricks.sdk.service.iam import AccessControlRequest
from databricks.sdk.version import __version__
Expand Down Expand Up @@ -52,6 +52,12 @@ def test_databricks_cli_token_source_not_installed(config, monkeypatch):
DatabricksCliTokenSource(config)


def test_databricks_cli_token_parse_expiry():
CliTokenSource._parse_expiry("2023-12-01T15:19:48.007742617Z")
CliTokenSource._parse_expiry("2023-12-05T15:59:01.40081+11:00")
CliTokenSource._parse_expiry("2023-12-06 10:06:05")
Copy link
Contributor

@mgyucht mgyucht Dec 6, 2023

Choose a reason for hiding this comment

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

Can you just add an assertion on the actual returned values?
BTW: good practice here would be to use pytest.mark.parameterize annotation, e.g.

@pytest.mark.parametrize(
    "date_string,expected",
    [("2023-12-01T15:19:48.007742617Z", <the expected date>),
      ("2023-12-05T15:59:01.40081+11:00", <the expected date>),
      ("2023-12-06 10:06:05", <the expected date>)])
def test_databricks_cli_token_parse_expiry(date_string, expected):



def write_small_dummy_executable(path: pathlib.Path):
cli = path.joinpath('databricks')
cli.write_text('#!/bin/sh\necho "hello world"\n')
Expand Down