primitive 0.2.60__tar.gz → 0.2.63__tar.gz

{primitive-0.2.60 → primitive-0.2.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.60
+Version: 0.2.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

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/__about__.py

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

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/exec/actions.py

@@ -69,6 +69,10 @@ class Exec(BaseAction):
         ssh_client = SSHClient()
         ssh_client.load_system_host_keys()
 
+        # if a failure case happens where the server is only accepting passwords
+        # ensure that `PubkeyAuthentication yes` is set in your ssh config
+        # this file is typically located at `/etc/ssh/sshd_config`
+
         ssh_client.connect(
             hostname=ssh_hostname,
             username=ssh_username,

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/jobs/graphql/queries.py

@@ -74,7 +74,7 @@ query jobRuns(
 job_run_query = (
     job_run_fragment
     + """
-query jobRun($id: GlobalID!) {
+query jobRun($id: ID!) {
     jobRun(id: $id) {
         ...JobRunFragment
     }
@@ -83,7 +83,7 @@ query jobRun($id: GlobalID!) {
 )
 
 github_app_token_for_job_run_query = """
-query ghAppTokenForJobRun($jobRunId: GlobalID!) {
+query ghAppTokenForJobRun($jobRunId: ID!) {
     ghAppTokenForJobRun(jobRunId: $jobRunId)
 }
 """
@@ -91,7 +91,7 @@ query ghAppTokenForJobRun($jobRunId: GlobalID!) {
 job_run_status_query = (
     job_run_status_fragment
     + """
-query jobRun($id: GlobalID!) {
+query jobRun($id: ID!) {
     jobRun(id: $id) {
         ...JobRunStatusFragment
     }
@@ -101,7 +101,7 @@ query jobRun($id: GlobalID!) {
 
 
 job_secrets_for_job_run_query = """
-query jobSecretsForJobRun($jobRunId: GlobalID!) {
+query jobSecretsForJobRun($jobRunId: ID!) {
     jobSecretsForJobRun(jobRunId: $jobRunId)
 }
 """

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/provisioning/actions.py

@@ -8,7 +8,8 @@ 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")
+SSH_DIR = Path(HOME_DIRECTORY / ".ssh")
+AUTHORIZED_KEYS_FILEPATH = SSH_DIR.joinpath("authorized_keys")
 
 
 class Provisioning(BaseAction):
@@ -24,8 +25,16 @@ class Provisioning(BaseAction):
         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 SSH_DIR.exists() is False:
+            SSH_DIR.mkdir(parents=True, exist_ok=True)
+            SSH_DIR.chmod(0o700)
+
+        if AUTHORIZED_KEYS_FILEPATH.exists() is False:
+            AUTHORIZED_KEYS_FILEPATH.touch()
+            AUTHORIZED_KEYS_FILEPATH.chmod(0o600)
+
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = SSH_DIR.joinpath(
+            f"authorized_keys.bak-{reservation_id}"
         )
 
         if AUTHORIZED_KEYS_FILEPATH.exists():
@@ -47,8 +56,8 @@ class Provisioning(BaseAction):
         # 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}"
+        AUTHORIZED_KEYS_BACKUP_FILEPATH = SSH_DIR.joinpath(
+            f"authorized_keys.bak-{reservation_id}"
         )
 
         if AUTHORIZED_KEYS_BACKUP_FILEPATH.exists():

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/provisioning/graphql/queries.py

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

{primitive-0.2.60 → primitive-0.2.63}/src/primitive/reservations/graphql/queries.py

@@ -38,7 +38,7 @@ query reservations(
 reservation_query = (
     reservation_fragment
     + """
-query reservation($id: GlobalID!) {
+query reservation($id: ID!) {
   reservation(id: $id) {
     ...ReservationFragment
   }