spec 2 support

Author: ddovbii

README.md

@@ -5,7 +5,7 @@ A github action which is used in a combination with [torque-start-sb-action](htt
 ## Usage
 
 ```yaml
-- uses: QualiTorque/torque-end-sb-action@v0.0.3
+- uses: QualiTorque/torque-end-sb-action@v0.1
   with:
     # The name of the Torque Space your repository is connected to
     space: TestSpace
@@ -54,7 +54,7 @@ jobs:
     steps:
     - name: Start Torque Sandbox
       id: start-sandbox
-      uses: QualiTorque/torque-start-sb-action@v0.0.3
+      uses: QualiTorque/torque-start-sb-action@v0.1
       with:
         space: Demo
         blueprint_name: WebApp
@@ -68,14 +68,10 @@ jobs:
       id: test-app
       run: |
         echo "Running tests against sandbox with id: ${{ steps.start-sandbox.outputs.sandbox_id }}"
-        shortcuts=${{ steps.start-sandbox.outputs.sandbox_shortcuts }}
-        readarray -t shortcuts <<< "$(jq '. | .flask-app[]' <<< '${{ steps.start-sandbox.outputs.sandbox_shortcuts }}')"
-        for shortcut in ${shortcuts[@]}; do
-            "Do something with this ${shortcut}."
-        done
+        echo "Do something with sandbox details json: ${{ steps.start-sandbox.outputs.sandbox_details }}"
 
     - name: Stop sandbox
-      uses: QualiTorque/torque-end-sb-action@v0.0.3
+      uses: QualiTorque/torque-end-sb-action@v0.1
       with:
         space: Demo
         sandbox_id: ${{ steps.start-sandbox.outputs.sandbox_id }}

common.py

@@ -1,23 +1,32 @@
 import sys
 import requests
+from constants import VERSION
 
 
 class TorqueSession(requests.Session):
     def __init__(self):
         super(TorqueSession, self).__init__()
-        self.headers.update({"Accept": "application/json", "Accept-Charset": "utf-8"})
+        self.headers.update(
+            {
+                "Accept": "application/json",
+                "Accept-Charset": "utf-8",
+                "User-Agent": f"Torque-Plugin-Github-Actions/{VERSION}"
+            }
+        )
 
     def torque_auth(self, token: str) -> None:
         self.headers.update({"Authorization": f"Bearer {token}"})
 
 
 class TorqueClient:
-    def __init__(self, space: str, token: str, session: TorqueSession = TorqueSession(), account: str = None):
+    TORQUE_SERVER = "portal.qtorque.io"
+
+    def __init__(self, space: str, token: str, session: TorqueSession = TorqueSession()):
         self.token = token
         self.space = space
         self.session = session
         session.torque_auth(self.token)
-        self.base_api_url = f"https://qtorque.io/api/spaces/{self.space}"
+        self.base_api_url = f"https://{self.TORQUE_SERVER}/api/spaces/{self.space}"
 
     def _request(self, endpoint: str, method: str = 'GET', params: dict = None) -> requests.Response:
         self._validate_creds()
@@ -56,23 +65,22 @@ def start_sandbox(
         sandbox_name: str,
         duration: int = 120,
         inputs: dict = None,
-        artifacts: dict = None,
-        branch: str = None) -> str:
+        # branch: str = None
+        ) -> str:
 
-        path = "sandbox"
+        path = "environments"
         iso_duration = f"PT{duration}M"
         params = {
             "sandbox_name": sandbox_name,
             "blueprint_name": blueprint_name,
             "duration": iso_duration,
             "inputs": inputs,
-            "artifacts": artifacts,
         }
 
-        if branch:
-            params["source"] = {
-                "branch": branch,
-            }
+        # if branch:
+        #     params["source"] = {
+        #         "branch": branch,
+        #     }
 
         res = self._request(path, method="POST", params=params)
         sandbox_id = res.json()["id"]
@@ -81,15 +89,15 @@ def start_sandbox(
 
     def get_sandbox(self, sandbox_id: str) -> dict:
         """Returns Sandbox as a json"""
-        path = f"sandbox/{sandbox_id}"
+        path = f"environments/{sandbox_id}"
 
         res = self._request(path, method="GET")
 
         return res.json()
 
 
     def end_sandbox(self, sandbox_id: str) -> None:
-        path = f"sandbox/{sandbox_id}"
+        path = f"environments/{sandbox_id}"
 
         res = self._request(path, method="DELETE")
 

constants.py

@@ -0,0 +1 @@
+VERSION = "v0.1.0"