Merge pull request #3 from muselab-d2x/feature/jobs

- Fix bug with reusing a successful scratch create request
muselab-d2x · Mar 6, 2024 · def4bc9 · def4bc9
2 parents 63d3c50 + 602217a
commit def4bc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/d2x_cli/commands/job.py b/src/d2x_cli/commands/job.py
@@ -176,9 +176,9 @@ def pre_flow(self, coordinator):
         self.steps = coordinator.steps
         self.live.start()
         self._init_job_panel()
-        self.log_task = asyncio.create_task(
-            self.tail_logs()
-        )  # Start as a background task
+        #self.log_task = asyncio.create_task(
+        #    self.tail_logs()
+        #)  # Start as a background task
         return coordinator
 
     def pre_task(self, step: StepSpec):
@@ -719,14 +719,17 @@ def run_job(runtime, job_id, retry_scratch=False, verbose=False):
 
             # If the scratch create request is completed, use its org
             if scratch_create_request["status"] == "success":
+                org_user = d2x.read(
+                    D2XApiObjects.OrgUser, scratch_create_request["org_user_id"]
+                )
                 import_org_from_d2x(
                     d2x,
                     runtime.keychain,
                     logger,
                     org_name,
-                    org_id=scratch_create_request["org_id"],
+                    org_salesforce_id=org_user["org"]["salesforce_id"],
                     org_user_id=scratch_create_request["org_user_id"],
-                    username=scratch_create_request["username"],
+                    username=org_user["username"],
                     org_alias=scratch_alias,
                 )
 

diff --git a/src/d2x_cli/commands/scratch.py b/src/d2x_cli/commands/scratch.py
@@ -22,3 +22,10 @@ def list(runtime, include_delete):
     api_list_to_table(d2x.list(D2XApiObjects.ScratchCreateRequest))
     if include_delete:
         api_list_to_table(d2x.list(D2XApiObjects.ScratchDeleteRequest))
+
+@scratch.command(name="info", help="Get information about a scratch org request.")
+@click.argument("id", type=str)
+@pass_runtime(require_project=True, require_keychain=True)
+def info(runtime, id):
+    d2x = get_d2x_api_client(runtime)
+    print(d2x.read(D2XApiObjects.ScratchCreateRequest, id))