feat: adding new node type CompositeActionInput

.github/workflows/release.yml

@@ -14,9 +14,15 @@ jobs:
         prevent: true
         fail-on-error: true
         allowed-ips: >
+          3.216.34.172
+          3.228.146.75
+          18.206.20.10
+          18.210.197.188
           18.215.138.58
           34.194.164.123
+          34.205.13.154
           44.196.175.70
+          44.205.64.79
           52.1.184.176
           52.3.144.121
           54.165.156.197
@@ -64,9 +70,15 @@ jobs:
           prevent: true
           fail-on-error: true
           allowed-ips: >
+            3.216.34.172
+            3.228.146.75
+            18.206.20.10
+            18.210.197.188
             18.215.138.58
             34.194.164.123
+            34.205.13.154
             44.196.175.70
+            44.205.64.79
             52.1.184.176
             52.3.144.121
             54.165.156.197
@@ -85,7 +97,6 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

.github/workflows/test_pr.yml

@@ -57,6 +57,8 @@ jobs:
           fi
           exit 0
 
+  # A job that runs integration tests in an isolated environment against
+  # a predefined organization: RavenIntegrationTests
   test_raven:
     runs-on: ubuntu-latest
     steps:
@@ -65,9 +67,15 @@ jobs:
           prevent: true
           fail-on-error: true
           allowed-ips: >
+            3.216.34.172
+            3.228.146.75
+            18.206.20.10
+            18.210.197.188
             18.215.138.58
             34.194.164.123
+            34.205.13.154
             44.196.175.70
+            44.205.64.79
             52.1.184.176
             52.3.144.121
             54.165.156.197
@@ -90,6 +98,8 @@ jobs:
         run: |
           make test-build
 
+  # A job for testing the setup process and unit tests of RAVEN against
+  # different versions of Python
   test_raven_package:
     runs-on: ubuntu-latest
 
@@ -103,9 +113,15 @@ jobs:
           prevent: true
           fail-on-error: true
           allowed-ips: >
+            3.216.34.172
+            3.228.146.75
+            18.206.20.10
+            18.210.197.188
             18.215.138.58
             34.194.164.123
+            34.205.13.154
             44.196.175.70
+            44.205.64.79
             52.1.184.176
             52.3.144.121
             54.165.156.197
@@ -133,10 +149,13 @@ jobs:
       - name: Setup environment
         run: make setup
 
-      - name: Download Organization
+      - name: Test Raven
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           raven download org --token $GITHUB_TOKEN --org-name RavenIntegrationTests
           raven index
-          raven report --format json | jq > /dev/null
+          raven report --format json | jq > /dev/null
+
+      - name: Run Unit Tests
+        run: pytest -v tests/unit

.gitignore

@@ -87,6 +87,7 @@ ipython_config.py
 
 # Local debugging - Run tests outside containers
 temp_test_raven.py
+temp/
 
 # pyenv
 .python-version

Makefile

@@ -15,4 +15,4 @@ test-build:
 test-run:
 	@echo "DO NOT USE DIRECTLY; PLEASE USE: make test-build"
 	@echo "Running Tests..."
-	@python3 test_raven.py
+	@pytest -v tests

deployment/test.dockerfile

@@ -11,9 +11,6 @@ COPY Makefile requirements.txt /raven/
 COPY src /raven/src
 COPY tests /raven/tests
 
-# Move the main test file to the Root directory
-RUN mv /raven/tests/test_raven.py /raven/test_raven.py
-
 # Install any needed packages specified in requirements.txt
 RUN pip3 install -r requirements.txt
 

src/common/utils.py

@@ -121,3 +121,7 @@ def is_url_contains_a_token(url) -> bool:
 
 def str_to_bool(s: str) -> bool:
     return bool(int(s))
+
+
+def raw_str_to_bool(s: str) -> bool:
+    return True if s == "true" else False

src/workflow_components/composite_action.py

@@ -8,6 +8,7 @@
 from src.common.utils import (
     get_dependencies_in_code,
     convert_dict_to_list,
+    raw_str_to_bool,
 )
 from src.workflow_components.dependency import UsesString, UsesStringType
 
@@ -27,6 +28,43 @@ def get_or_create_composite_action(path: str) -> "CompositeAction":
     return obj
 
 
+class CompositeActionInput(GraphObject):
+    __primarykey__ = "_id"
+
+    _id = Property()
+    name = Property()
+    default = Property()
+    description = Property()
+    required = Property()
+    url = Property()
+    path = Property()
+    action = RelatedTo("CompositeAction")
+
+    def __init__(self, _id: str, path: str):
+        self._id = _id
+        self.path = path
+
+    @staticmethod
+    def from_dict(obj_dict) -> "CompositeActionInput":
+        i = CompositeActionInput(
+            _id=obj_dict["_id"],
+            path=obj_dict["path"],
+        )
+
+        i.name = obj_dict["name"]
+        i.url = obj_dict["url"]
+
+        if "default" in obj_dict:
+            i.default = obj_dict["default"]
+
+        if "description" in obj_dict:
+            i.description = obj_dict["description"]
+
+        i.required = raw_str_to_bool(obj_dict.get("required", "false"))
+
+        return i
+
+
 class CompositeActionStep(GraphObject):
     __primarykey__ = "_id"
 
@@ -91,12 +129,12 @@ class CompositeAction(GraphObject):
     _id = Property()
     name = Property()
     path = Property()
-    inputs = Property()
     using = Property()
     image = Property()
     url = Property()
     is_public = Property()
 
+    inputs = RelatedTo(CompositeActionInput)
     steps = RelatedTo(CompositeActionStep)
 
     def __init__(self, name: Optional[str], path: str):
@@ -111,7 +149,12 @@ def from_dict(obj_dict) -> "CompositeAction":
         ca.url = obj_dict["url"]
         ca.is_public = obj_dict["is_public"]
         if "inputs" in obj_dict:
-            ca.inputs = list(obj_dict["inputs"].keys())
+            for name, input in obj_dict["inputs"].items():
+                input["_id"] = md5(f"{ca._id}_{name}".encode()).hexdigest()
+                input["name"] = name
+                input["url"] = ca.url
+                input["path"] = ca.path
+                ca.inputs.add(CompositeActionInput.from_dict(input))
 
         if "runs" in obj_dict:
             d_runs = obj_dict["runs"]

tests/integration/integration_consts.py

@@ -48,3 +48,6 @@
         },
     },
 ]
+
+START_NODE_INDEX = 0
+DEST_NODE_INDEX = 2