Null user_quota if tiered license levels exist (#981)

* Null user_quota if tiered license levels exist
* fix types for get-users-for-group
* make capability elements non-optional
* turn groups into reference_resources
and now mypy should run clean!

Author: jorwoods

tableauserverclient/models/permissions_item.py

@@ -2,7 +2,6 @@
 import xml.etree.ElementTree as ET
 
 from defusedxml.ElementTree import fromstring
-
 from .exceptions import UnknownGranteeTypeError, UnpopulatedPropertyError
 from .group_item import GroupItem
 from .user_item import UserItem

tableauserverclient/models/site_item.py

@@ -1,3 +1,4 @@
+import warnings
 import xml.etree.ElementTree as ET
 
 from defusedxml.ElementTree import fromstring
@@ -17,6 +18,11 @@
 
 
 class SiteItem(object):
+    _user_quota: Optional[int] = None
+    _tier_creator_capacity: Optional[int] = None
+    _tier_explorer_capacity: Optional[int] = None
+    _tier_viewer_capacity: Optional[int] = None
+
     class AdminMode:
         ContentAndUsers: str = "ContentAndUsers"
         ContentOnly: str = "ContentOnly"
@@ -210,6 +216,20 @@ def status_reason(self) -> Optional[str]:
     def storage(self) -> Optional[str]:
         return self._storage
 
+    @property
+    def user_quota(self) -> Optional[int]:
+        if any((self.tier_creator_capacity, self.tier_explorer_capacity, self.tier_viewer_capacity)):
+            warnings.warn("Tiered license level is set. Returning None for user_quota")
+            return None
+        else:
+            return self._user_quota
+
+    @user_quota.setter
+    def user_quota(self, value: Optional[int]) -> None:
+        if any((self.tier_creator_capacity, self.tier_explorer_capacity, self.tier_viewer_capacity)):
+            raise ValueError("User quota conflicts with setting tiered license levels. Set those to None first.")
+        self._user_quota = value
+
     @property
     def subscribe_others_enabled(self) -> bool:
         return self._subscribe_others_enabled

test/test_site.py

@@ -194,6 +194,9 @@ def test_create(self) -> None:
             )
             new_site = self.server.sites.create(new_site)
 
+        new_site._tier_viewer_capacity = None
+        new_site._tier_creator_capacity = None
+        new_site._tier_explorer_capacity = None
         self.assertEqual("0626857c-1def-4503-a7d8-7907c3ff9d9f", new_site.id)
         self.assertEqual("tableau", new_site.content_url)
         self.assertEqual("Tableau", new_site.name)