Upgrade to new version of Astra SDK

Author: mboglesby

netapp_dataops_k8s/README.md

@@ -73,7 +73,7 @@ The NetApp DataOps Toolkit provides several extended capabilities that require [
 
 The toolkit uses the Astra Control Python SDK to interface with the Astra Control API. The Astra Control Python SDK is installed automatically when you install the NetApp DataOps Toolkit using pip.
 
-In order for the Astra Control Python SDK to be able to communicate with the Astra Control API, you must create a 'config.yaml' file containing your Astra Control API connection details. Refer to the [Astra Control Python SDK README](https://github.com/NetApp/netapp-astra-toolkits/tree/b478109b084ad387753d085219a8a8d3d399a4e6) for formatting details. Note that you do not need to follow the installation instructions outlined in the Astra Control Python SDK README; you only need to create the 'config.yaml' file. Once you have created the 'config.yaml' file, you must store it in one of the following locations:
+In order for the Astra Control Python SDK to be able to communicate with the Astra Control API, you must create a 'config.yaml' file containing your Astra Control API connection details. Refer to the [Astra Control Python SDK README](https://github.com/NetApp/netapp-astra-toolkits/tree/v2.1.3) for formatting details. Note that you do not need to follow the installation instructions outlined in the Astra Control Python SDK README; you only need to create the 'config.yaml' file. Once you have created the 'config.yaml' file, you must store it in one of the following locations:
 - ~/.config/astra-toolkits/
 - /etc/astra-toolkits/
 - The directory pointed to by the shell environment variable 'ASTRATOOLKITS_CONF'

netapp_dataops_k8s/docs/workspace_management.md

@@ -858,6 +858,7 @@ If an error is encountered, the function will raise an exception of one of the f
 ```py
 InvalidConfigError              # kubeconfig or AstraSDK config file is missing or is invalid.
 APIConnectionError              # The Kubernetes or Astra Control API returned an error.
+AstraAppDoesNotExistError       # App does not exist in Astra. Are you sure that the workspace name is correct?
 ```
 
 <a name="lib-backup-jupyterlab"></a>
@@ -890,4 +891,5 @@ If an error is encountered, the function will raise an exception of one of the f
 ```py
 InvalidConfigError              # kubeconfig or AstraSDK config file is missing or is invalid.
 APIConnectionError              # The Kubernetes or Astra Control API returned an error.
+AstraAppNotManagedError         # JupyterLab workspace has not been registered with Astra Control.
 ```

netapp_dataops_k8s/netapp_dataops/k8s/__init__.py

@@ -63,6 +63,11 @@ class AstraClusterDoesNotExistError(Exception):
     pass
 
 
+class AstraAppDoesNotExistError(Exception):
+    '''Error that will be raised when an app doesn't exist within Astra Control'''
+    pass
+
+
 class ServiceUnavailableError(Exception):
     '''Error that will be raised when a service is not available'''
     pass
@@ -511,20 +516,34 @@ def _wait_for_triton_dev_deployment(server_name: str, namespace: str = "default"
         sleep(5)
 
 
-def _retrieve_astra_app_id_for_jupyter_lab(astra_apps: dict, workspace_name: str) -> str :
+def _retrieve_astra_app_id_for_jupyter_lab(astra_apps: dict, workspace_name: str, include_full_app_details: bool = False) -> str :
     # Get Astra K8s cluster name
     try :
         astra_k8s_cluster_name = _get_astra_k8s_cluster_name()
     except KeyError :
         raise InvalidConfigError()
 
     # Parse Astra Apps
-    for app_id,app_details in astra_apps.items() :
+    for app_details in astra_apps["items"] :
+        # Check cluster name
+        if app_details["clusterName"] != astra_k8s_cluster_name :
+            pass
+
+        # Get app label for workspace
         workspace_app_label = _get_jupyter_lab_labels(workspaceName=workspace_name)["app"]
-        if (app_details[0] == workspace_app_label) and (app_details[1] == astra_k8s_cluster_name) :
-            return app_id
 
-    return ""
+        # See if app label matches
+        for app_labels in app_details["appLabels"] :
+            if (app_labels["name"] == "app") and (app_labels["value"] == workspace_app_label) :
+                if include_full_app_details :
+                    return app_details["id"], app_details
+                else :
+                    return app_details["id"]
+
+    if include_full_app_details :
+        return "", None
+    else :
+        return ""
 
 
 #
@@ -648,7 +667,7 @@ def clone_jupyter_lab_to_new_namespace(source_workspace_name: str, new_namespace
 
     # Determine Astra App ID for source workspace
     try :
-        source_astra_app_id = _retrieve_astra_app_id_for_jupyter_lab(astra_apps=astra_apps, workspace_name=source_workspace_name)
+        source_astra_app_id, source_astra_app_details = _retrieve_astra_app_id_for_jupyter_lab(astra_apps=astra_apps, workspace_name=source_workspace_name, include_full_app_details=True)
     except InvalidConfigError :
         if print_output :
             _print_astra_k8s_cluster_name_error()
@@ -663,7 +682,7 @@ def clone_jupyter_lab_to_new_namespace(source_workspace_name: str, new_namespace
         raise AstraAppNotManagedError(error_message)
 
     # Determine Astra cluster ID for source workspace
-    source_astra_cluster_id = astra_apps[source_astra_app_id][2]
+    source_astra_cluster_id = source_astra_app_details["clusterID"]
 
     # Determine Astra cluster ID for "clone-to" cluster
     if clone_to_cluster_name :
@@ -675,9 +694,9 @@ def clone_jupyter_lab_to_new_namespace(source_workspace_name: str, new_namespace
                 print("Error: Astra Control API Error: ", err)
             raise APIConnectionError(err)
 
-        for cluster_id,cluster_info in astra_clusters.items() :
-            if cluster_info[0] == clone_to_cluster_name :
-                clone_to_cluster_id = cluster_id
+        for cluster_info in astra_clusters["items"] :
+            if cluster_info["name"] == clone_to_cluster_name :
+                clone_to_cluster_id = cluster_info["id"]
 
         if not clone_to_cluster_id :
             error_message = "Cluster '" + clone_to_cluster_name + "' does not exist in Astra Control."
@@ -2018,16 +2037,22 @@ def register_jupyter_lab_with_astra(workspace_name: str, namespace: str = "defau
 
     # Determine Astra App ID for workspace
     try :
-        astra_app_id = _retrieve_astra_app_id_for_jupyter_lab(astra_apps=astra_apps_unmanaged, workspace_name=workspace_name)
+        astra_app_id, astra_app_details = _retrieve_astra_app_id_for_jupyter_lab(astra_apps=astra_apps_unmanaged, workspace_name=workspace_name, include_full_app_details=True)
     except InvalidConfigError :
         if print_output :
             _print_astra_k8s_cluster_name_error()
         raise InvalidConfigError()
 
-    # Wait until app has a status of "running" in Astraa
+    # Fail if app doesn't exist in Astra
+    if not astra_app_details :
+        if print_output :
+            print("Error: App does not exist in Astra. Are you sure that the workspace name is correct?")
+        raise AstraAppDoesNotExistError()
+
+    # Wait until app has a status of "running" in Astra
     while True :
         try :
-            if astra_apps_unmanaged[astra_app_id][4] == "running" :
+            if astra_app_details["state"] == "running" :
                 break
         except KeyError :
             pass
@@ -2039,6 +2064,7 @@ def register_jupyter_lab_with_astra(workspace_name: str, namespace: str = "defau
         # Retrieve list of unmanaged Astra apps again
         try :
             astra_apps_unmanaged = astraSDK.getApps().main(discovered=True, namespace=namespace)
+            astra_app_id, astra_app_details = _retrieve_astra_app_id_for_jupyter_lab(astra_apps=astra_apps_unmanaged, workspace_name=workspace_name, include_full_app_details=True)
         except Exception as err :
             if print_output:
                 print("Error: Astra Control API Error: ", err)

netapp_dataops_k8s/netapp_dataops/netapp_dataops_k8s_cli.py

@@ -26,6 +26,7 @@
     APIConnectionError,
     AstraAppNotManagedError,
     AstraClusterDoesNotExistError,
+    AstraAppDoesNotExistError,
     CAConfigMap,
     InvalidConfigError
 )
@@ -787,10 +788,10 @@ def getTarget(args: list) -> str:
             if not workspace_name or not backup_name:
                 handleInvalidCommand(helpText=helpTextBackupJupyterLab, invalidOptArg=True)
 
-            # Register JupyterLab workspace
+            # Back up JupyterLab workspace
             try:
                 backup_jupyter_lab_with_astra(workspace_name=workspace_name, backup_name=backup_name, namespace=namespace, print_output=True)
-            except (InvalidConfigError, APIConnectionError):
+            except (InvalidConfigError, APIConnectionError, AstraAppNotManagedError):
                 sys.exit(1)
 
         else:
@@ -2225,7 +2226,7 @@ def getTarget(args: list) -> str:
             # Register JupyterLab workspace
             try:
                 register_jupyter_lab_with_astra(workspace_name=workspaceName, namespace=namespace, print_output=True)
-            except (InvalidConfigError, APIConnectionError):
+            except (InvalidConfigError, APIConnectionError, AstraAppDoesNotExistError):
                 sys.exit(1)
 
         else:

netapp_dataops_k8s/setup.cfg

@@ -26,18 +26,20 @@ scripts =
     netapp_dataops/netapp_dataops_k8s_cli.py
 install_requires =
     notebook
-    kubernetes
     pandas
-    tabulate
     numpy>=1.22.0
-    netapp-astra-toolkits==2.0
+    actoolkit==2.1.3
     certifi==2020.12.5
     chardet==4.0.0
+    dnspython==2.1.0
     idna==2.10
     PyYAML==5.4.1
     requests==2.25.1
+    tabulate==0.8.9
     termcolor==1.1.0
     urllib3==1.26.5
+    func_timeout==4.3.5
+    kubernetes==23.6.0
 python_requires = >=3.8
 
 [options.packages.find]