Skip to content

Commit f12c459

Browse files
authored
Dependency Alignment (requirements.txt/setup.py) (#23)
Continuation of [Issue #19](#19) * Changed `certifi` requirement to `>=2024.0,<2026.0` to allow for better compatibility * Updated `typing-extensions` to `~4.9.0` * Synced `requirements.txt` to `setup.py` (previously mismatched) Cleaned up some code to conform with `PEP8`
1 parent 74588ab commit f12c459

File tree

9 files changed

+100
-73
lines changed

9 files changed

+100
-73
lines changed

chkp_harmony_endpoint_management_sdk/classes/harmony_api_exception.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from typing import Optional, Any
22
from enum import Enum
33

4+
45
class HarmonyErrorScope(Enum):
56
NETWORKING = 'NETWORKING'
67
SERVICE = 'SERVICE'

chkp_harmony_endpoint_management_sdk/classes/harmony_endpoint_sdk_info.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ def __init__(self, sdk_build: str, sdk_version: str, spec: str, spec_version: st
66
self.spec = spec
77
self.spec_version = spec_version
88
self.released_on = released_on
9-
9+
1010
def __str__(self):
11-
return f'sdk_build:"{self.sdk_build}", sdk_version:"{self.sdk_version}", spec:"{self.spec}", spec_version:"{self.spec_version}", released_on:"{self.released_on}"'
11+
return (
12+
f'sdk_build:"{self.sdk_build}", '
13+
f'sdk_version:"{self.sdk_version}", '
14+
f'spec:"{self.spec}", '
15+
f'spec_version:"{self.spec_version}", '
16+
f'released_on:"{self.released_on}"'
17+
)

chkp_harmony_endpoint_management_sdk/classes/internal.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing import Any, Callable
22

3+
34
class SessionOperations:
45
def __init__(self, job_status_operation: Callable[[], Any], login_operation: Callable[[], Any], keep_alive_operation: Callable[[], Any] = None):
56
self.login_operation = login_operation
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from aenum import Enum
22

3+
34
class SDKConnectionState(Enum):
4-
CONNECTED = 'CONNECTED'
5-
CONNECTING = 'CONNECTING'
6-
DISCONNECTED = 'DISCONNECTED'
7-
CONNECTION_ISSUE = 'CONNECTION_ISSUE'
5+
CONNECTED = 'CONNECTED'
6+
CONNECTING = 'CONNECTING'
7+
DISCONNECTED = 'DISCONNECTED'
8+
CONNECTION_ISSUE = 'CONNECTION_ISSUE'

chkp_harmony_endpoint_management_sdk/core/harmony_endpoint.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
from chkp_harmony_endpoint_management_sdk.classes.harmony_endpoint_saas_options import HarmonyEndpointSaaSOptions
44
from chkp_harmony_endpoint_management_sdk.classes.infinity_portal_auth import InfinityPortalAuth
55
from chkp_harmony_endpoint_management_sdk.classes.internal import SessionOperations
6-
from chkp_harmony_endpoint_management_sdk.classes.on_premise_portal_auth import OnPremisePortalAuth
76
from chkp_harmony_endpoint_management_sdk.core.session_manager import SessionManager
87
from chkp_harmony_endpoint_management_sdk.generated.cloud import HarmonyEndpointBase as HarmonyEndpointCloudBase
9-
# from chkp_harmony_endpoint_management_sdk.generated.premise import HarmonyEndpointBase as HarmonyEndpointPremiseBase
108
from chkp_harmony_endpoint_management_sdk.generated.saas import HarmonyEndpointBase as HarmonyEndpointSaaSBase
119

10+
# from chkp_harmony_endpoint_management_sdk.classes.on_premise_portal_auth import OnPremisePortalAuth
11+
# from chkp_harmony_endpoint_management_sdk.generated.premise import HarmonyEndpointBase as HarmonyEndpointPremiseBase
12+
1213
print_ea_message = True
14+
15+
1316
class HarmonyEndpoint(HarmonyEndpointCloudBase):
1417

1518
def __init__(self):
@@ -18,10 +21,13 @@ def __init__(self):
1821
def connect(self, infinity_portal_auth: InfinityPortalAuth):
1922
def keep_alive():
2023
return self._session_api.keep_alive()
24+
2125
def login():
2226
return self._session_api.login_cloud()
27+
2328
def job_status(job_id):
24-
return self.jobs_api.get_job_by_id(path_params={ 'jobId': job_id })
29+
return self.jobs_api.get_job_by_id(path_params={'jobId': job_id})
30+
2531
session_operations = SessionOperations(keep_alive_operation=keep_alive, login_operation=login, job_status_operation=job_status)
2632
self._session_manager.connect_cloud(infinity_portal_auth, session_operations)
2733

@@ -35,12 +41,13 @@ def job_status(job_id):
3541
# def keep_alive():
3642
# return self._session_api.keep_alive()
3743
# def login():
38-
# return self._session_api.login_premise(body={ "username": on_premise_portal_auth.username, "password" : on_premise_portal_auth.password })
44+
# return self._session_api.login_premise(body={"username": on_premise_portal_auth.username, "password": on_premise_portal_auth.password})
3945
# def job_status(job_id):
4046
# return self.jobs_api.get_job_by_id(path_params={ 'jobId': job_id })
4147
# session_operations = SessionOperations(keep_alive_operation=keep_alive, login_operation=login, job_status_operation=job_status)
4248
# self._session_manager.connect_premise(on_premise_portal_auth, session_operations)
4349

50+
4451
class HarmonyEndpointSaaS(HarmonyEndpointSaaSBase):
4552

4653
def __init__(self):
@@ -49,8 +56,8 @@ def __init__(self):
4956
def connect(self, infinity_portal_auth: InfinityPortalAuth, harmony_endpoint_saas_options: HarmonyEndpointSaaSOptions):
5057
def keep_alive():
5158
return self._manage_session_api.public_mssp_keep_alive()
59+
5260
def login():
5361
return self._manage_session_api.public_mssp_login()
5462
session_operations = SessionOperations(keep_alive_operation=keep_alive, login_operation=login, job_status_operation=None)
5563
self._session_manager.connect_saas(infinity_portal_auth, harmony_endpoint_saas_options, session_operations)
56-

chkp_harmony_endpoint_management_sdk/core/logger.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import logging
22
import os
3-
import datetime
43

54
handler = logging.StreamHandler()
65

@@ -28,17 +27,21 @@
2827

2928
logger(f'logger is activated with "{__activate_logs}"')
3029

30+
3131
def activate_all_loggers():
3232
_logger.setLevel(logging.DEBUG)
3333
_error_logger.setLevel(logging.DEBUG)
3434
_network_logger.setLevel(logging.DEBUG)
3535

36+
3637
def activate_info_logger():
3738
_logger.setLevel(logging.DEBUG)
3839

40+
3941
def activate_error_logger():
4042
_error_logger.setLevel(logging.DEBUG)
4143

44+
4245
def activate_network_logger():
4346
_network_logger.setLevel(logging.DEBUG)
4447

@@ -47,12 +50,12 @@ def activate_network_logger():
4750
activate_all_loggers()
4851
else:
4952
loggers = __activate_logs.split(',')
50-
53+
5154
if 'info' in loggers:
5255
activate_info_logger()
5356

5457
if 'error' in loggers:
5558
activate_error_logger()
5659

5760
if 'network' in loggers:
58-
activate_network_logger()
61+
activate_network_logger()

0 commit comments

Comments
 (0)