Skip to content
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

[bot] Merge master/016e88dc into rel/dev #861

Merged
merged 2 commits into from
Oct 24, 2024
Merged

[bot] Merge master/016e88dc into rel/dev #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf865fb
fix: automation deser for first_run
hkad98 Oct 24, 2024
016e88d
Merge pull request #860 from hkad98/jkd/trivial
hkad98 Oct 24, 2024
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: 1 addition & 2 deletions gooddata-sdk/gooddata_sdk/catalog/workspace/declarative_model/workspace/automation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# (C) 2024 GoodData Corporation
import builtins
from datetime import datetime
from typing import Any, Optional

from attrs import define, field
Expand All @@ -26,7 +25,7 @@
class CatalogAutomationSchedule(Base):
cron: str
cron_description: Optional[str] = field(default=None, eq=False)
first_run: Optional[datetime] = None
first_run: Optional[str] = None
timezone: Optional[str] = "UTC"

@staticmethod
Expand Down
18 changes: 10 additions & 8 deletions gooddata-sdk/tests/catalog/fixtures/workspaces/layout_automations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: []
Expand Down Expand Up @@ -143,7 +143,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: ''
Expand All @@ -161,6 +161,7 @@ interactions:
type: notificationChannel
schedule:
cron: 0 0 * * *
firstRun: '2023-10-05T14:30:00+00:00'
timezone: UTC
headers:
Accept-Encoding:
Expand Down Expand Up @@ -221,7 +222,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: ''
Expand Down Expand Up @@ -292,9 +293,9 @@ interactions:
X-XSS-Protection:
- '0'
content-length:
- '203'
- '237'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string:
Expand All @@ -306,6 +307,7 @@ interactions:
type: notificationChannel
schedule:
cron: 0 0 * * *
firstRun: '2023-10-05T14:30:00Z'
timezone: UTC
state: ACTIVE
title: Automation
Expand Down Expand Up @@ -372,7 +374,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: ''
Expand Down Expand Up @@ -443,7 +445,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: []
Expand Down Expand Up @@ -511,7 +513,7 @@ interactions:
X-XSS-Protection:
- '0'
set-cookie:
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Wed, 23 Oct 2024 11:21:42 GMT;
- SPRING_REDIRECT_URI=; Max-Age=0; Expires=Thu, 24 Oct 2024 09:45:11 GMT;
Path=/; HTTPOnly; SameSite=Lax
body:
string: ''
4 changes: 1 addition & 3 deletions gooddata-sdk/tests/catalog/test_catalog_workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,9 +947,7 @@ def test_layout_automations(test_config):
title="Automation",
state="ACTIVE",
notification_channel=CatalogNotificationChannelIdentifier(id="webhook"),
schedule=CatalogAutomationSchedule(
cron="0 0 * * *",
),
schedule=CatalogAutomationSchedule(cron="0 0 * * *", first_run="2023-10-05 14:30:00+00:00"),
metadata={"key": "value"},
)
]
Expand Down
Loading