integrate-ai 9.22.6__tar.gz → 9.23.0__tar.gz

{integrate_ai-9.22.6 → integrate_ai-9.23.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: integrate_ai
-Version: 9.22.6
+Version: 9.23.0
 Summary: integrate.ai
 Author: integrate.ai
 License: Copyright (C) 2022 integrate.ai, Inc. All rights reserved.
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7.5
 Description-Content-Type: text/markdown
+Requires-Dist: click==8.1.8
 Requires-Dist: docker==7.1.0
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: requests<3.0.0,>=2.32.2

{integrate_ai-9.22.6 → integrate_ai-9.23.0}/integrate_ai/onprem_node.py

@@ -171,8 +171,11 @@ def uninstall(
         sys.exit(1)
     # register taskrunner id
     client = RestClient(token=token)
-    response = client.deregister_on_prem_taskrunner(taskrunner_name=taskrunner_name, instance_id=get_instance_id())
-    rich.print("Deregister instance ", response["containerInstance"]["ec2InstanceId"])
+    instance_id = get_instance_id()
+    # Deregister only if an instance state file is found
+    if instance_id:
+        response = client.deregister_on_prem_taskrunner(taskrunner_name=taskrunner_name, instance_id=instance_id)
+        rich.print("Deregister instance ", response["containerInstance"]["ec2InstanceId"])
 
     # uninstall ecs anywhere
     stop_ecs = "sudo systemctl stop ecs amazon-ssm-agent"
@@ -206,6 +209,12 @@ def uninstall(
         remove_directories_cmd = (
             "sudo rm -rf /var/lib/ecs /etc/ecs /var/lib/amazon/ssm /var/log/ecs /var/log/amazon/ssm"
         )
+        remove_directories_cmd += " && sudo rm -rf /var/lib/amazon/ssm/Vault/Store/RegistrationKey"
+        remove_directories_cmd += " && sudo rm -rf /etc/ecs"
+        remove_directories_cmd += " && sudo rm -rf /var/lib/ecs"
+        remove_directories_cmd += " && sudo rm -rf /var/log/ecs"
+        remove_directories_cmd += " && sudo rm  /etc/systemd/system/ecs.service"
+        remove_directories_cmd += " && sudo systemctl daemon-reexec"
         remove_directories_cmd += " && sudo rm -rf /etc/systemd/system/amazon-ssm-agent.service.d/http-proxy.conf"
         remove_directories_cmd += " && sudo rm -rf /etc/systemd/system/docker.service.d/http-proxy.conf"
         remove_directories_cmd += " && sudo rm -rf /etc/systemd/system/ecs.service.d/http-proxy.conf"
@@ -215,7 +224,7 @@ def uninstall(
         rich.print("Leftover directories removed")
 
         # Remove instance id file
-        remove_output_cmd = "sudo rm ecsanywhere_output.txt"
+        remove_output_cmd = "sudo rm -f ecsanywhere_output.txt"
         subprocess.run(remove_output_cmd, shell=True, check=True, text=True)
         rich.print("ecsanywhere_output.txt removed")
         rich.print("proxy entries removed")
@@ -233,7 +242,7 @@ def get_instance_id():
         rich.print(
             "[red]Error: Could not parse instance ID from ecsanywhere_output.txt. Please verify the file's contents."
         )
-        raise Exception("Instance ID not found.")
+        rich.print("Instance ID not found.")
     rich.print("Deregister instance with instance_id ", instance_id)
     return instance_id
 

{integrate_ai-9.22.6 → integrate_ai-9.23.0}/integrate_ai.egg-info/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: integrate_ai
-Version: 9.22.6
+Version: 9.23.0
 Summary: integrate.ai
 Author: integrate.ai
 License: Copyright (C) 2022 integrate.ai, Inc. All rights reserved.
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7.5
 Description-Content-Type: text/markdown
+Requires-Dist: click==8.1.8
 Requires-Dist: docker==7.1.0
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: requests<3.0.0,>=2.32.2

{integrate_ai-9.22.6 → integrate_ai-9.23.0}/integrate_ai.egg-info/requires.txt

@@ -1,3 +1,4 @@
+click==8.1.8
 docker==7.1.0
 pyjwt>=2.4.0
 requests<3.0.0,>=2.32.2

{integrate_ai-9.22.6 → integrate_ai-9.23.0}/setup.py

@@ -16,6 +16,7 @@ setup(**{
         ],
     },
     'install_requires': (
+        'click==8.1.8',
         'docker==7.1.0',
         'pyjwt>=2.4.0',
         'requests<3.0.0,>=2.32.2',
@@ -70,5 +71,5 @@ iai client train --token <IAI_TOKEN> --session <SESSION_ID> --train_path <PATH_T
         'integrate_ai.utils',
     ),
     'python_requires': '>=3.7.5',
-    'version': '9.22.6',
+    'version': '9.23.0',
 })