primitive 0.1.62__py3-none-any.whl → 0.1.63__py3-none-any.whl

primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.1.62"
+__version__ = "0.1.63"

primitive/agent/actions.py

@@ -20,7 +20,7 @@ class Agent(BaseAction):
         logger.info(" [*] primitive")
         logger.info(f" [*] Version: {__version__}")
 
-        # Create cache dir if it doesnt exist
+        # Create cache dir if it doesn't exist
         cache_dir = get_sources_cache()
 
         # Create uploader
@@ -53,6 +53,11 @@ class Agent(BaseAction):
                         logger.debug("Active Reservation:")
                         logger.debug(f"Node ID: {active_reservation_id}")
                         logger.debug(f"PK: {active_reservation_pk}")
+
+                        logger.debug("Running pre provisioning steps for reservation.")
+                        self.primitive.provisioning.add_reservation_authorized_keys(
+                            reservation_id=active_reservation_id
+                        )
                 else:
                     if (
                         hardware["activeReservation"] is None
@@ -62,6 +67,12 @@ class Agent(BaseAction):
                         logger.debug("Previous Reservation is Complete:")
                         logger.debug(f"Node ID: {active_reservation_id}")
                         logger.debug(f"PK: {active_reservation_pk}")
+                        logger.debug(
+                            "Running cleanup provisioning steps for reservation."
+                        )
+                        self.primitive.provisioning.remove_reservation_authorized_keys(
+                            reservation_id=active_reservation_id
+                        )
                         active_reservation_id = None
                         active_reservation_pk = None
 

primitive/client.py

@@ -1,20 +1,22 @@
 import sys
+
+from loguru import logger
+
+from .agent.actions import Agent
 from .auth.actions import Auth
-from .projects.actions import Projects
-from .utils.config import read_config_file
+from .daemons.actions import Daemons
+from .exec.actions import Exec
 from .files.actions import Files
-from .sim.actions import Sim
-from .hardware.actions import Hardware
-from .lint.actions import Lint
-from .agent.actions import Agent
 from .git.actions import Git
-from .daemons.actions import Daemons
+from .hardware.actions import Hardware
 from .jobs.actions import Jobs
+from .lint.actions import Lint
 from .organizations.actions import Organizations
-from .exec.actions import Exec
+from .projects.actions import Projects
+from .provisioning.actions import Provisioning
 from .reservations.actions import Reservations
-
-from loguru import logger
+from .sim.actions import Sim
+from .utils.config import read_config_file
 
 logger.disable("primitive")
 
@@ -67,6 +69,7 @@ class Primitive:
         self.git: Git = Git(self)
         self.daemons: Daemons = Daemons(self)
         self.exec: Exec = Exec(self)
+        self.provisioning: Provisioning = Provisioning(self)
 
     def get_host_config(self):
         self.full_config = read_config_file()

primitive/exec/actions.py

@@ -1,4 +1,3 @@
-import tempfile
 import typing
 
 from primitive.exec.interactive import interactive_shell
@@ -46,34 +45,16 @@ class Exec(BaseAction):
             reservation_id=reservation["id"], desired_status="in_progress"
         )
 
-        ssh_credentials = self.primitive.hardware.get_hardware_ssh_credentials(
-            hardware_id=hardware["id"]
-        )
-
-        ssh_hostname = ssh_credentials["ssh_hostname"]
-        ssh_username = ssh_credentials["ssh_username"]
-        ssh_password = ssh_credentials["ssh_password"]
-        ssh_private_key = ssh_credentials["ssh_private_key"]
+        ssh_hostname = hardware["hostname"]
+        ssh_username = hardware["ssh_username"]
 
         ssh_client = SSHClient()
         ssh_client.load_system_host_keys()
-        keyfile = None
-        if ssh_private_key:
-            keyfile = tempfile.NamedTemporaryFile()
-            keyfile.write(ssh_private_key.encode())
-            keyfile.flush()
-            ssh_client.connect(
-                hostname=ssh_hostname,
-                username=ssh_username,
-                key_filename=keyfile.name,
-            )
-        else:
-            ssh_client.connect(
-                hostname=ssh_hostname,
-                username=ssh_username,
-                pkey=ssh_private_key,
-                password=ssh_password,
-            )
+
+        ssh_client.connect(
+            hostname=ssh_hostname,
+            username=ssh_username,
+        )
 
         if command:
             formatted_command = " ".join(command)
@@ -86,8 +67,6 @@ class Exec(BaseAction):
             channel.invoke_shell()
             interactive_shell(channel)
             ssh_client.close()
-            if keyfile:
-                keyfile.close()
 
         if created_reservation_on_behalf_of_user:
             print("Cleaning up reservation.")

primitive/hardware/actions.py

@@ -22,7 +22,7 @@ from .graphql.mutations import (
     hardware_update_mutation,
     register_hardware_mutation,
 )
-from .graphql.queries import hardware_list, hardware_ssh_credentials
+from .graphql.queries import hardware_list
 
 if typing.TYPE_CHECKING:
     pass
@@ -303,7 +303,7 @@ class Hardware(BaseAction):
         # and headers are set correctly
         self.primitive.get_host_config()
         self.check_in_http(is_healthy=True)
-        return True
+        return result
 
     @guard
     def update_hardware_system_info(self):
@@ -479,16 +479,3 @@ class Hardware(BaseAction):
                 raise Exception(f"No hardware found with slug {hardware_identifier}")
 
         return hardware
-
-    @guard
-    def get_hardware_ssh_credentials(self, hardware_id: str):
-        query = gql(hardware_ssh_credentials)
-
-        variables = {
-            "id": hardware_id,
-        }
-        result = self.primitive.session.execute(
-            query, variable_values=variables, get_execution_result=True
-        )
-        ssh_credentials = result.data.get("hardware").get("sshCredentials")
-        return ssh_credentials

primitive/hardware/graphql/fragments.py

@@ -10,6 +10,8 @@ fragment HardwareFragment on Hardware {
   isOnline
   isQuarantined
   isHealthy
+  hostname
+  sshUsername
   capabilities {
     id
     pk

primitive/hardware/graphql/queries.py

@@ -29,13 +29,3 @@ query hardwareList(
 }
 """
 )
-
-hardware_ssh_credentials = """
-query hardwareSSHCredentials($id: GlobalID!) {
-  hardware(id: $id) {
-    id
-    pk
-    sshCredentials
-  }
-}
-"""

primitive/provisioning/actions.py

@@ -0,0 +1,62 @@
+from pathlib import Path
+
+from gql import gql
+
+from primitive.utils.actions import BaseAction
+
+from ..utils.auth import guard
+from .graphql.queries import authorized_keys_query
+
+HOME_DIRECTORY = Path.home()
+AUTHORIZED_KEYS_FILEPATH = Path(HOME_DIRECTORY / ".ssh" / "authorized_keys")
+
+
+class Provisioning(BaseAction):
+    @guard
+    def get_authorized_keys(self, reservation_id: str) -> str:
+        variables = {
+            "reservationId": reservation_id,
+        }
+        query = gql(authorized_keys_query)
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
+        return result.data["authorizedKeys"]
+
+    def add_reservation_authorized_keys(self, reservation_id: str) -> None:
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = Path(
+            HOME_DIRECTORY / ".ssh" / f"authorized_keys.bak-{reservation_id}"
+        )
+
+        if AUTHORIZED_KEYS_FILEPATH.exists():
+            AUTHORIZED_KEYS_BACKUP_FILEPATH.write_text(
+                AUTHORIZED_KEYS_FILEPATH.read_text()
+            )
+        else:
+            AUTHORIZED_KEYS_FILEPATH.touch()
+
+        authorized_keys = self.get_authorized_keys(reservation_id=reservation_id)
+
+        AUTHORIZED_KEYS_FILEPATH.write_text(
+            AUTHORIZED_KEYS_FILEPATH.read_text()
+            + f"\n## START PRIMITIVE SSH PUBLIC KEYS FOR RESERVATION ID {reservation_id}\n"
+            + authorized_keys
+            + f"\n## END PRIMITIVE SSH PUBLIC KEYS FOR RESERVATION ID {reservation_id}\n"
+        )
+
+        # self.primitive.sshd.reload()
+
+    def remove_reservation_authorized_keys(self, reservation_id: str) -> None:
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = Path(
+            HOME_DIRECTORY / ".ssh" / f"authorized_keys.bak-{reservation_id}"
+        )
+
+        if AUTHORIZED_KEYS_BACKUP_FILEPATH.exists():
+            AUTHORIZED_KEYS_FILEPATH.write_text(
+                AUTHORIZED_KEYS_BACKUP_FILEPATH.read_text()
+            )
+            AUTHORIZED_KEYS_BACKUP_FILEPATH.unlink()
+        else:
+            AUTHORIZED_KEYS_FILEPATH.unlink()
+
+        # self.primitive.sshd.reload()

primitive/provisioning/graphql/queries.py

@@ -0,0 +1,5 @@
+authorized_keys_query = """
+query authorizedKeys($reservationId: GlobalID!) {
+    authorizedKeys(reservationId: $reservationId)
+}
+"""

primitive/reservations/graphql/fragments.py

@@ -32,7 +32,7 @@ fragment ReservationFragment on Reservation {
   reason
   startedAt
   endedAt
-  elapsedTime
+  # elapsedTime
   status
   conclusion
   conclusionMessage

{primitive-0.1.62.dist-info → primitive-0.1.63.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.62
+Version: 0.1.63
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli
 Author-email: Dylan Stein <dylan@primitive.tech>, Chase Zimmerman <chase@primitive.tech>
-License-Expression: MIT
-License-File: LICENSE.txt
+License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{primitive-0.1.62.dist-info → primitive-0.1.63.dist-info}/RECORD

@@ -1,9 +1,9 @@
-primitive/__about__.py,sha256=geKDLLFDQydMN_sAK9SDHgrotZtzInxl2yNgIL4tHng,130
+primitive/__about__.py,sha256=uiVaG3uarbeydunpM548F3cr2wnnZhtxTkRYjlZVUoU,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=CGmWiqqCLMHtHGOUPuf3tVO6VvChBZ1VdSwCCglnBgA,2582
-primitive/client.py,sha256=p-5z1iGM8ZydIrkYf4R6b7Yna73oszlGdXim9-Zsbyk,2364
+primitive/client.py,sha256=P7cCDperMu3pxlmRAP-H2owM-cj1kRlZWrqujxnWa4o,2473
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=B7d2oNMjtjUP2RhD-QnNDWNl3jHwjUDk5KLWQ2OnNQ4,5883
+primitive/agent/actions.py,sha256=Hosy2o2FntfBtcNqqHuMFq9dm99EVfySy0v2JGeufvc,6474
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/agent/process.py,sha256=LVI-RB4a0YEuXUTYMXKL5Xi9euNwUI2nxj00mv8EFOg,2253
 primitive/agent/provision.py,sha256=rmwnro1K5F8mwtd45XAq7RVQmpDWnbBCQ8X_qgWhm3M,1546
@@ -20,7 +20,7 @@ primitive/daemons/commands.py,sha256=-Muh-6ib4uAVtPn_67AcMrDwuCwYlCnRQozCi2Xurmk
 primitive/daemons/launch_agents.py,sha256=qovt32gwpjGDd82z_SY5EGCUjaUyNA49pZFajZsw3eE,4796
 primitive/daemons/launch_service.py,sha256=FPB9qKEjhllRfEpct0ng2L9lpIaGJbQwn1JdFT8uBA8,5600
 primitive/exec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/exec/actions.py,sha256=Q7Nj4SVIh2XH83mirpBRQietwWZDZXdoBF3gGvUVzCU,3425
+primitive/exec/actions.py,sha256=hgUYi_G69SPbMRpVZv8EjeqIy41apXZIIw9lcg37zAY,2633
 primitive/exec/commands.py,sha256=66LO2kkJC-ynNZQpUCXv4Ol15QoacdSZAHblePDcmLo,510
 primitive/exec/interactive.py,sha256=TscY6s2ZysijidKPheq6y-fCErUVLS0zcdTW8XyFWGI,2435
 primitive/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -38,12 +38,12 @@ primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,72
 primitive/graphql/sdk.py,sha256=BhCGmDtc4sNnH8CxbQSJyFwOZ-ZSqMtjsxMB3JRBhPw,1456
 primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_6zRq91zqs,303
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/actions.py,sha256=fgwTASzElwk4PxLS2_sdIQYdwbRnuKczThV-aN_MT5A,19049
+primitive/hardware/actions.py,sha256=jtthNgRyeRD8txt4WqEZskPtsDWU2Yg2gJZLSrEx1io,18603
 primitive/hardware/commands.py,sha256=_HaWOdRQSkhnA1xZZHZWgadSQ9Gijxtnzg2vc_IDSMA,1854
 primitive/hardware/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/graphql/fragments.py,sha256=2uI0_WIhJISgd9Yx8tAdM7EUuAXEeQMUIXTIfkbZc2Q,246
+primitive/hardware/graphql/fragments.py,sha256=PuqhW42fKUvRqOli5W7nOs2RfJ8FruSQC1gKBp3psBQ,271
 primitive/hardware/graphql/mutations.py,sha256=Zd6HxnIgTJ9mJQAfKJkdeDfstcPAal6Bj38pnKb_RuI,904
-primitive/hardware/graphql/queries.py,sha256=1xEe8JoXt_MmqJ3bIeCk13PpzyNFJn4OgRDU2_93mZA,574
+primitive/hardware/graphql/queries.py,sha256=dhihQwr4O7zxDNRjeNWhkAXaSDOBsK-uqIczEGy1XLI,430
 primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/actions.py,sha256=CtyO-Z9614TgIoXJJX1QGsoll0fgpBIjG9PJH5JwCQs,4901
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
@@ -68,11 +68,15 @@ primitive/projects/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 primitive/projects/graphql/fragments.py,sha256=02F5nyI8i-ML_bV5FFHUgFWM5bBBfjmz_tkP-4QOXjU,127
 primitive/projects/graphql/mutations.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/projects/graphql/queries.py,sha256=nFaVf6YOHA2L_FTgIUdRK-80hYTmv1a1X5ac7QPMp1k,646
+primitive/provisioning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+primitive/provisioning/actions.py,sha256=IYZYAbtomtZtlkqDaBxx4e7PFKGkRNqek_tABH6q_zY,2116
+primitive/provisioning/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+primitive/provisioning/graphql/queries.py,sha256=cBtuKa6shoatYZfKSnQoPJP6B8g8y3QhFqJ_pkvMcG0,134
 primitive/reservations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/reservations/actions.py,sha256=XjjF0UJAgKryuSJqakLMAWshZIbuM-DkTmdU95cANs4,4434
 primitive/reservations/commands.py,sha256=OwWWE9DrvtrVBcBki0bKTOqCzCQk090c0rPIAt89JLY,2243
 primitive/reservations/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/reservations/graphql/fragments.py,sha256=OPh8ylJR2kxfArBJ4IYIBLvWJyms3A2jVNNFLkTroRM,474
+primitive/reservations/graphql/fragments.py,sha256=_TQfJeHky-Hh3WCHWobQ6-A1lpSvU-YkS0V9cqj2nOU,476
 primitive/reservations/graphql/mutations.py,sha256=IqzwQL7OclN7RpIcidrTQo9cGYofY7wqoBOdnY0pwN8,651
 primitive/reservations/graphql/queries.py,sha256=x31wTRelskX2fc0fx2qrY7XT1q74nvzLv_Xef3o9weg,746
 primitive/sim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,8 +93,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=j7E1YwgNWw57dFHVfEbqRNVcPHX0xDefX2vFSNgeI_8,1648
 primitive/utils/verible.py,sha256=Zb5NUISvcaIgEvgCDBWr-GCoceMa79Tcwvr5Wl9lfnA,2252
-primitive-0.1.62.dist-info/METADATA,sha256=sQ2iai9V1lS1U_snKtzwP4JsUgUaHPYyqzoRnmaHVhk,3811
-primitive-0.1.62.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.62.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.62.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.62.dist-info/RECORD,,
+primitive-0.1.63.dist-info/METADATA,sha256=o-IZgpjA7lYJYn-sxuRBDA4EXxHA_c57G1U8Q3dcZzE,3774
+primitive-0.1.63.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+primitive-0.1.63.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.63.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.63.dist-info/RECORD,,

{primitive-0.1.62.dist-info → primitive-0.1.63.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any