Skip to content

Commit 9456cce

Browse files
authored
Revert "v0.38 - IDP configuration (#1606)"
This reverts commit cda018b.
1 parent cda018b commit 9456cce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+106
-2275
lines changed

.github/workflows/slack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request, issues]
55
jobs:
66
slack-notifications:
77
continue-on-error: true
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-20.04
99
name: Sends a message to Slack when a push, a pull request or an issue is made
1010
steps:
1111
- name: Send message to Slack API

samples/extracts.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def main():
4242
server.add_http_options({"verify": False})
4343
server.use_server_version()
4444
with server.auth.sign_in(tableau_auth):
45+
4546
wb = None
4647
ds = None
4748
if args.workbook:

tableauserverclient/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
LinkedTaskItem,
2626
LinkedTaskStepItem,
2727
LinkedTaskFlowRunItem,
28-
LocationItem,
2928
MetricItem,
3029
MonthlyInterval,
3130
PaginationItem,
@@ -36,7 +35,6 @@
3635
Resource,
3736
RevisionItem,
3837
ScheduleItem,
39-
SiteAuthConfiguration,
4038
SiteItem,
4139
ServerInfoItem,
4240
SubscriptionItem,
@@ -103,7 +101,6 @@
103101
"LinkedTaskFlowRunItem",
104102
"LinkedTaskItem",
105103
"LinkedTaskStepItem",
106-
"LocationItem",
107104
"MetricItem",
108105
"MissingRequiredFieldError",
109106
"MonthlyInterval",
@@ -124,7 +121,6 @@
124121
"ServerInfoItem",
125122
"ServerResponseError",
126123
"SiteItem",
127-
"SiteAuthConfiguration",
128124
"Sort",
129125
"SubscriptionItem",
130126
"TableauAuth",

tableauserverclient/helpers/strings.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from defusedxml.ElementTree import fromstring, tostring
22
from functools import singledispatch
3-
from typing import TypeVar, overload
3+
from typing import TypeVar
44

55

66
# the redact method can handle either strings or bytes, but it can't mix them.
@@ -41,27 +41,3 @@ def _(xml: str) -> str:
4141
@redact_xml.register # type: ignore[no-redef]
4242
def _(xml: bytes) -> bytes:
4343
return _redact_any_type(bytearray(xml), b"password", b"..[redacted]")
44-
45-
46-
@overload
47-
def nullable_str_to_int(value: None) -> None: ...
48-
49-
50-
@overload
51-
def nullable_str_to_int(value: str) -> int: ...
52-
53-
54-
def nullable_str_to_int(value):
55-
return int(value) if value is not None else None
56-
57-
58-
@overload
59-
def nullable_str_to_bool(value: None) -> None: ...
60-
61-
62-
@overload
63-
def nullable_str_to_bool(value: str) -> bool: ...
64-
65-
66-
def nullable_str_to_bool(value):
67-
return str(value).lower() == "true" if value is not None else None

tableauserverclient/models/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@
2828
LinkedTaskStepItem,
2929
LinkedTaskFlowRunItem,
3030
)
31-
from tableauserverclient.models.location_item import LocationItem
3231
from tableauserverclient.models.metric_item import MetricItem
3332
from tableauserverclient.models.pagination_item import PaginationItem
3433
from tableauserverclient.models.permissions_item import PermissionsRule, Permission
3534
from tableauserverclient.models.project_item import ProjectItem
3635
from tableauserverclient.models.revision_item import RevisionItem
3736
from tableauserverclient.models.schedule_item import ScheduleItem
3837
from tableauserverclient.models.server_info_item import ServerInfoItem
39-
from tableauserverclient.models.site_item import SiteItem, SiteAuthConfiguration
38+
from tableauserverclient.models.site_item import SiteItem
4039
from tableauserverclient.models.subscription_item import SubscriptionItem
4140
from tableauserverclient.models.table_item import TableItem
4241
from tableauserverclient.models.tableau_auth import Credentials, TableauAuth, PersonalAccessTokenAuth, JWTAuth
@@ -49,7 +48,6 @@
4948
from tableauserverclient.models.virtual_connection_item import VirtualConnectionItem
5049
from tableauserverclient.models.webhook_item import WebhookItem
5150
from tableauserverclient.models.workbook_item import WorkbookItem
52-
from tableauserverclient.models.extract_item import ExtractItem
5351

5452
__all__ = [
5553
"ColumnItem",
@@ -77,7 +75,6 @@
7775
"MonthlyInterval",
7876
"HourlyInterval",
7977
"BackgroundJobItem",
80-
"LocationItem",
8178
"MetricItem",
8279
"PaginationItem",
8380
"Permission",
@@ -86,7 +83,6 @@
8683
"RevisionItem",
8784
"ScheduleItem",
8885
"ServerInfoItem",
89-
"SiteAuthConfiguration",
9086
"SiteItem",
9187
"SubscriptionItem",
9288
"TableItem",
@@ -107,5 +103,4 @@
107103
"LinkedTaskItem",
108104
"LinkedTaskStepItem",
109105
"LinkedTaskFlowRunItem",
110-
"ExtractItem",
111106
]

tableauserverclient/models/datasource_item.py

Lines changed: 2 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@
66
from defusedxml.ElementTree import fromstring
77

88
from tableauserverclient.datetime_helpers import parse_datetime
9-
from tableauserverclient.helpers.strings import nullable_str_to_bool, nullable_str_to_int
109
from tableauserverclient.models.connection_item import ConnectionItem
1110
from tableauserverclient.models.exceptions import UnpopulatedPropertyError
1211
from tableauserverclient.models.permissions_item import PermissionsRule
13-
from tableauserverclient.models.project_item import ProjectItem
1412
from tableauserverclient.models.property_decorators import (
1513
property_not_nullable,
1614
property_is_boolean,
1715
property_is_enum,
1816
)
1917
from tableauserverclient.models.revision_item import RevisionItem
2018
from tableauserverclient.models.tag_item import TagItem
21-
from tableauserverclient.models.user_item import UserItem
2219

2320

2421
class DatasourceItem:
@@ -43,9 +40,6 @@ class DatasourceItem:
4340
specified, it will default to SiteDefault. See REST API Publish
4441
Datasource for more information about ask_data_enablement.
4542
46-
connected_workbooks_count : Optional[int]
47-
The number of workbooks connected to the datasource.
48-
4943
connections : list[ConnectionItem]
5044
The list of data connections (ConnectionItem) for the specified data
5145
source. You must first call the populate_connections method to access
@@ -73,12 +67,6 @@ class DatasourceItem:
7367
A Boolean value to determine if a datasource should be encrypted or not.
7468
See Extract and Encryption Methods for more information.
7569
76-
favorites_total : Optional[int]
77-
The number of users who have marked the data source as a favorite.
78-
79-
has_alert : Optional[bool]
80-
A Boolean value that indicates whether the data source has an alert.
81-
8270
has_extracts : Optional[bool]
8371
A Boolean value that indicates whether the datasource has extracts.
8472
@@ -87,32 +75,20 @@ class DatasourceItem:
8775
specific data source or to delete a data source with the get_by_id and
8876
delete methods.
8977
90-
is_published : Optional[bool]
91-
A Boolean value that indicates whether the data source is published.
92-
9378
name : Optional[str]
9479
The name of the data source. If not specified, the name of the published
9580
data source file is used.
9681
97-
owner: Optional[UserItem]
98-
The owner of the data source.
99-
10082
owner_id : Optional[str]
10183
The identifier of the owner of the data source.
10284
103-
project : Optional[ProjectItem]
104-
The project that the data source belongs to.
105-
10685
project_id : Optional[str]
10786
The identifier of the project associated with the data source. You must
10887
provide this identifier when you create an instance of a DatasourceItem.
10988
11089
project_name : Optional[str]
11190
The name of the project associated with the data source.
11291
113-
server_name : Optional[str]
114-
The name of the server where the data source is published.
115-
11692
tags : Optional[set[str]]
11793
The tags (list of strings) that have been added to the data source.
11894
@@ -167,13 +143,6 @@ def __init__(self, project_id: Optional[str] = None, name: Optional[str] = None)
167143
self.owner_id: Optional[str] = None
168144
self.project_id: Optional[str] = project_id
169145
self.tags: set[str] = set()
170-
self._connected_workbooks_count: Optional[int] = None
171-
self._favorites_total: Optional[int] = None
172-
self._has_alert: Optional[bool] = None
173-
self._is_published: Optional[bool] = None
174-
self._server_name: Optional[str] = None
175-
self._project: Optional[ProjectItem] = None
176-
self._owner: Optional[UserItem] = None
177146

178147
self._permissions = None
179148
self._data_quality_warnings = None
@@ -305,42 +274,14 @@ def revisions(self) -> list[RevisionItem]:
305274
def size(self) -> Optional[int]:
306275
return self._size
307276

308-
@property
309-
def connected_workbooks_count(self) -> Optional[int]:
310-
return self._connected_workbooks_count
311-
312-
@property
313-
def favorites_total(self) -> Optional[int]:
314-
return self._favorites_total
315-
316-
@property
317-
def has_alert(self) -> Optional[bool]:
318-
return self._has_alert
319-
320-
@property
321-
def is_published(self) -> Optional[bool]:
322-
return self._is_published
323-
324-
@property
325-
def server_name(self) -> Optional[str]:
326-
return self._server_name
327-
328-
@property
329-
def project(self) -> Optional[ProjectItem]:
330-
return self._project
331-
332-
@property
333-
def owner(self) -> Optional[UserItem]:
334-
return self._owner
335-
336277
def _set_connections(self, connections) -> None:
337278
self._connections = connections
338279

339280
def _set_permissions(self, permissions):
340281
self._permissions = permissions
341282

342-
def _set_data_quality_warnings(self, dqw):
343-
self._data_quality_warnings = dqw
283+
def _set_data_quality_warnings(self, dqws):
284+
self._data_quality_warnings = dqws
344285

345286
def _set_revisions(self, revisions):
346287
self._revisions = revisions
@@ -369,13 +310,6 @@ def _parse_common_elements(self, datasource_xml, ns):
369310
use_remote_query_agent,
370311
webpage_url,
371312
size,
372-
connected_workbooks_count,
373-
favorites_total,
374-
has_alert,
375-
is_published,
376-
server_name,
377-
project,
378-
owner,
379313
) = self._parse_element(datasource_xml, ns)
380314
self._set_values(
381315
ask_data_enablement,
@@ -397,13 +331,6 @@ def _parse_common_elements(self, datasource_xml, ns):
397331
use_remote_query_agent,
398332
webpage_url,
399333
size,
400-
connected_workbooks_count,
401-
favorites_total,
402-
has_alert,
403-
is_published,
404-
server_name,
405-
project,
406-
owner,
407334
)
408335
return self
409336

@@ -428,13 +355,6 @@ def _set_values(
428355
use_remote_query_agent,
429356
webpage_url,
430357
size,
431-
connected_workbooks_count,
432-
favorites_total,
433-
has_alert,
434-
is_published,
435-
server_name,
436-
project,
437-
owner,
438358
):
439359
if ask_data_enablement is not None:
440360
self._ask_data_enablement = ask_data_enablement
@@ -474,20 +394,6 @@ def _set_values(
474394
self._webpage_url = webpage_url
475395
if size is not None:
476396
self._size = int(size)
477-
if connected_workbooks_count is not None:
478-
self._connected_workbooks_count = connected_workbooks_count
479-
if favorites_total is not None:
480-
self._favorites_total = favorites_total
481-
if has_alert is not None:
482-
self._has_alert = has_alert
483-
if is_published is not None:
484-
self._is_published = is_published
485-
if server_name is not None:
486-
self._server_name = server_name
487-
if project is not None:
488-
self._project = project
489-
if owner is not None:
490-
self._owner = owner
491397

492398
@classmethod
493399
def from_response(cls, resp: str, ns: dict) -> list["DatasourceItem"]:
@@ -522,11 +428,6 @@ def _parse_element(datasource_xml: ET.Element, ns: dict) -> tuple:
522428
use_remote_query_agent = datasource_xml.get("useRemoteQueryAgent", None)
523429
webpage_url = datasource_xml.get("webpageUrl", None)
524430
size = datasource_xml.get("size", None)
525-
connected_workbooks_count = nullable_str_to_int(datasource_xml.get("connectedWorkbooksCount", None))
526-
favorites_total = nullable_str_to_int(datasource_xml.get("favoritesTotal", None))
527-
has_alert = nullable_str_to_bool(datasource_xml.get("hasAlert", None))
528-
is_published = nullable_str_to_bool(datasource_xml.get("isPublished", None))
529-
server_name = datasource_xml.get("serverName", None)
530431

531432
tags = None
532433
tags_elem = datasource_xml.find(".//t:tags", namespaces=ns)
@@ -537,14 +438,12 @@ def _parse_element(datasource_xml: ET.Element, ns: dict) -> tuple:
537438
project_name = None
538439
project_elem = datasource_xml.find(".//t:project", namespaces=ns)
539440
if project_elem is not None:
540-
project = ProjectItem.from_xml(project_elem, ns)
541441
project_id = project_elem.get("id", None)
542442
project_name = project_elem.get("name", None)
543443

544444
owner_id = None
545445
owner_elem = datasource_xml.find(".//t:owner", namespaces=ns)
546446
if owner_elem is not None:
547-
owner = UserItem.from_xml(owner_elem, ns)
548447
owner_id = owner_elem.get("id", None)
549448

550449
ask_data_enablement = None
@@ -572,11 +471,4 @@ def _parse_element(datasource_xml: ET.Element, ns: dict) -> tuple:
572471
use_remote_query_agent,
573472
webpage_url,
574473
size,
575-
connected_workbooks_count,
576-
favorites_total,
577-
has_alert,
578-
is_published,
579-
server_name,
580-
project,
581-
owner,
582474
)

0 commit comments

Comments
 (0)