Skip to content

updated to support latest jamfpy #2

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
merged 1 commit into from
Feb 10, 2025
Merged

updated to support latest jamfpy #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions jamftf/importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ class Importer:
targetted (List[Resource]): A list of Resource objects to be managed.

Args:
client (jamfpy.JamfTenant): The Jamf tenant client used for API interactions.
client (jamfpy.Tenant): The Jamf tenant client used for API interactions.
targetted (List[Resource]): A list of Resource objects to be managed.

Raises:
AssertionError: If the provided client is not an instance of jamfpy.JamfTenant.
AssertionError: If the provided client is not an instance of jamfpy.Tenant.
ImporterConfigError: If the targetted list is empty.

Methods:
Expand All @@ -30,12 +30,12 @@ class Importer:
targetted: list[Resource] = None
def __init__(
self,
client: jamfpy.JamfTenant,
client: jamfpy.Tenant,
targetted: List[Resource],
debug: bool = False
):

assert isinstance(client, jamfpy.JamfTenant), "incorrect client type"
assert isinstance(client, jamfpy.Tenant), "incorrect client type"

if len(targetted) == 0:
raise ImporterConfigError("no targets set")
Expand Down
6 changes: 3 additions & 3 deletions jamftf/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def __init__(
self,
options: Options = None,
validate: bool = True,
client: jamfpy.JamfTenant = None,
client: jamfpy.Tenant = None,
debug: bool = False,
exclude: list[int] = None
):
Expand Down Expand Up @@ -130,11 +130,11 @@ def set_debug(self, debug: bool):
self.lg.info("log level has been overridden to: %s", self.lg.level)


def set_client(self, client: jamfpy.JamfTenant, refresh_data: bool = False):
def set_client(self, client: jamfpy.Tenant, refresh_data: bool = False):
"""function to wrap setting of object bound client"""
self.lg.debug("setting client...")

assert isinstance(client, jamfpy.JamfTenant), "invalid client type"
assert isinstance(client, jamfpy.Tenant), "invalid client type"
self.lg.debug("client type is correct")

self.client = client
Expand Down