algosec-appviz 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

algosec_appviz/main.py

@@ -1,5 +1,6 @@
 import requests
 from algosec_appviz import environment
+from datetime import datetime, timedelta
 from mydict import MyDict
 
 regions = {
@@ -19,12 +20,19 @@ class AppViz:
             raise ValueError(f"Invalid region, must be one of: {', '.join(regions.keys())}")
 
         self.proxies = proxies
+        self.region = region
+        self.tenant_id = tenant_id or environment.get_tenant_id()
+        self._client_id = client_id or environment.get_client_id()
+        self._client_secret = client_secret or environment.get_client_secret()
 
-        login_url = f"https://{regions[region]}/api/algosaas/auth/v1/access-keys/login"
+        self._init_token()
+
+    def _init_token(self):
+        login_url = f"https://{regions[self.region]}/api/algosaas/auth/v1/access-keys/login"
         data = {
-            "tenantId": tenant_id or environment.get_tenant_id(),
-            "clientId": client_id or environment.get_client_id(),
-            "clientSecret": client_secret or environment.get_client_secret()
+            "tenantId": self.tenant_id,
+            "clientId": self._client_id,
+            "clientSecret": self._client_secret
         }
 
         headers = {
@@ -36,9 +44,10 @@ class AppViz:
         if response.status_code != 200:
             raise ConnectionError(f"Authentication to AppViz failed: {response.text}")
 
-        self.url = 'https://' + regions[region]
+        self.url = 'https://' + regions[self.region]
         self._token_type = response.json()['token_type']
         self._token = response.json()['access_token']
+        self._token_expires = datetime.now() + timedelta(seconds=response.json()['expires_in'])
 
     def create_application(self, name=None, **kwargs):
         if not name:
@@ -82,7 +91,7 @@ class AppViz:
         """
         Deletes a network object in AppViz
         :param obj_id: The object ID
-        :return: True if successful, false if not
+        :return: Change details if successful, empty string otherwise
         """
         if not obj_id:
             raise ValueError("Object ID is mandatory")
@@ -96,6 +105,29 @@ class AppViz:
 
         return result
 
+    def update_network_object(self, obj_id=None, **kwargs):
+        """
+        Updates a network object in AppViz
+        :return: The new object details, if successful, empty string otherwise
+        """
+        if not obj_id:
+            raise ValueError("Object ID is mandatory")
+
+        result = self._make_api_call('POST',
+                                     f'/BusinessFlow/rest/v1/network_objects/{obj_id}',
+                                     body={**kwargs})
+
+        if isinstance(result, dict) and 'networkObject' in result.keys():
+            return result['networkObject']
+
+        try:
+            print(result[1])
+        except KeyError:
+            if 'success' in result.keys() and not result['success']:
+                print(result['message'])
+
+        return ""
+
     def get_applications(self):
         response = self._make_api_call('GET',
                                        '/BusinessFlow/rest/v1/applications')
@@ -141,6 +173,10 @@ class AppViz:
         return [MyDict(x) for x in response]
 
     def _make_api_call(self, method, url_path, body=None, params=None):
+        # Check if the token is still valid, otherwise request a new one
+        if datetime.now() >= self._token_expires - timedelta(seconds=5):
+            self._init_token()
+
         valid_methods = ['get', 'post', 'delete']
         headers = {
             'Accept': 'application/json',

{algosec_appviz-0.0.8.dist-info → algosec_appviz-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: algosec_appviz
-Version: 0.0.8
+Version: 0.0.10
 Summary: AlgoSec AppViz Library
 Home-page: https://github.com/bogdan-iot/algosec-appviz
 License: LICENSE

algosec_appviz-0.0.10.dist-info/RECORD

@@ -0,0 +1,7 @@
+algosec_appviz/__init__.py,sha256=epwLWpezNwfYP0Zuqk32rWEvNeloAKzbrRFi9tzlsXo,46
+algosec_appviz/environment.py,sha256=ycrVSpR6oLpj9p54SvDdy0nqwS9IwHAh-1x-zOaTQ5I,1775
+algosec_appviz/main.py,sha256=4rUcspAZtjWgzKKN-PznQUmxsp-jGMQY5Fz_TBBerMw,7132
+algosec_appviz-0.0.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+algosec_appviz-0.0.10.dist-info/METADATA,sha256=fjdGcU5_4MRTMLw2Cru5dh7IRKpzPKruMek8iWAvfgs,1799
+algosec_appviz-0.0.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+algosec_appviz-0.0.10.dist-info/RECORD,,

algosec_appviz-0.0.8.dist-info/RECORD

@@ -1,7 +0,0 @@
-algosec_appviz/__init__.py,sha256=epwLWpezNwfYP0Zuqk32rWEvNeloAKzbrRFi9tzlsXo,46
-algosec_appviz/environment.py,sha256=ycrVSpR6oLpj9p54SvDdy0nqwS9IwHAh-1x-zOaTQ5I,1775
-algosec_appviz/main.py,sha256=NAkuuMtSFgZcnhMnBV-22ebT3_ObocFGsdj-KAas3AI,5783
-algosec_appviz-0.0.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-algosec_appviz-0.0.8.dist-info/METADATA,sha256=isNuuOwxax_jp7kBJmVDN0w52uExys-4OxP_eAJzf40,1798
-algosec_appviz-0.0.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-algosec_appviz-0.0.8.dist-info/RECORD,,