spaceforge 0.0.4__tar.gz → 0.0.5__tar.gz

{spaceforge-0.0.4 → spaceforge-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaceforge
-Version: 0.0.4
+Version: 0.0.5
 Summary: A Python framework for building Spacelift plugins
 Home-page: https://github.com/spacelift-io/plugins
 Author: Spacelift

{spaceforge-0.0.4 → spaceforge-0.0.5}/plugins/wiz/plugin.py

@@ -88,9 +88,9 @@ webhook[{"endpoint_id": "wiz-alert-endpoint"}] {
   input.run_updated.run.marked_unsafe == true
 }
             """,
-            labels={
+            labels=[
                 "wiz-plugin"
-            }
+            ]
         )
     ]
 
@@ -179,4 +179,6 @@ webhook[{"endpoint_id": "wiz-alert-endpoint"}] {
                     markdown += "\n"
             if "reportUrl" in stdout_json:
                 markdown += f"<a href=\"{stdout_json['reportUrl']}\" rel=\"noopener noreferrer\">View Report</a>\n"
-            self.send_markdown(markdown)
+            result = self.send_markdown(markdown)
+            if not result:
+                self.logger.error("Failed to send Wiz CLI output to spacelift")

{spaceforge-0.0.4 → spaceforge-0.0.5}/plugins/wiz/plugin.yaml

@@ -134,9 +134,9 @@ contexts:
         input.run_updated.run.marked_unsafe == true
       }
                   """,
-                  labels={
+                  labels=[
                       "wiz-plugin"
-                  }
+                  ]
               )
           ]
 
@@ -225,7 +225,9 @@ contexts:
                           markdown += "\n"
                   if "reportUrl" in stdout_json:
                       markdown += f"<a href=\"{stdout_json['reportUrl']}\" rel=\"noopener noreferrer\">View Report</a>\n"
-                  self.send_markdown(markdown)
+                  result = self.send_markdown(markdown)
+                  if not result:
+                      self.logger.error("Failed to send Wiz CLI output to spacelift")
     sensitive: false
   - path: /mnt/workspace/plugins/wiz/binary_install_wizcli.sh
     content: |-
@@ -266,7 +268,7 @@ contexts:
       fi
       . venv/bin/activate
 
-      if command -v spaceforge; then
+      if ! command -v spaceforge; then
           pip install spaceforge
       fi
 

{spaceforge-0.0.4 → spaceforge-0.0.5}/spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.4'
-__version_tuple__ = version_tuple = (0, 0, 4)
+__version__ = version = '0.0.5'
+__version_tuple__ = version_tuple = (0, 0, 5)
 
-__commit_id__ = commit_id = 'g46df965db'
+__commit_id__ = commit_id = 'gd83c2c6ce'

{spaceforge-0.0.4 → spaceforge-0.0.5}/spaceforge/plugin.py

@@ -233,7 +233,7 @@ class SpaceforgePlugin(ABC):
             data: Dict[str, Any] = json.load(f)
             return data
 
-    def send_markdown(self, markdown: str) -> None:
+    def send_markdown(self, markdown: str) -> bool:
         """
         Send a markdown message to the Spacelift run.
 
@@ -245,13 +245,13 @@ class SpaceforgePlugin(ABC):
                 "Spacelift run is local. Not uploading markdown. Below is a preview of what would be sent"
             )
             self.logger.info(markdown)
-            return
+            return True
 
         if self._spacelift_markdown_endpoint is None:
             self.logger.error(
                 'API is not enabled, please export "SPACELIFT_API_TOKEN" and "TF_VAR_spacelift_graphql_endpoint".'
             )
-            exit(1)
+            return False
 
         headers = {"Authorization": f"Bearer {self._api_token}"}
         body = {
@@ -266,26 +266,30 @@ class SpaceforgePlugin(ABC):
             method="POST",
         )
 
-        with urllib.request.urlopen(req) as response:
-            if response.status != 200:
-                self.logger.error(
-                    f"Error getting signed URL for markdown upload: {response}"
-                )
-                return
-
-            raw_response = response.read().decode("utf-8")
-            self.logger.debug(raw_response)
-            resp: Dict[str, Any] = json.loads(raw_response)
-            if "url" not in resp or "headers" not in resp:
-                self.logger.error(
-                    "Markdown signed url response does not contain 'url' or 'headers' key."
-                )
-                return
+        try:
+            with urllib.request.urlopen(req) as response:
+                if response.status != 200:
+                    self.logger.error(
+                        f"Error getting signed URL for markdown upload: {response}"
+                    )
+                    return False
+
+                raw_response = response.read().decode("utf-8")
+                self.logger.debug(raw_response)
+                resp: Dict[str, Any] = json.loads(raw_response)
+                if "url" not in resp or "headers" not in resp:
+                    self.logger.error(
+                        "Markdown signed url response does not contain 'url' or 'headers' key."
+                    )
+                    return False
 
-            signed_url = resp["url"]
-            headers = resp["headers"]
-            headers["Content-Type"] = "text/markdown"
-            headers["Content-Length"] = str(len(markdown))
+                signed_url = resp["url"]
+                headers = resp["headers"]
+                headers["Content-Type"] = "text/markdown"
+                headers["Content-Length"] = str(len(markdown))
+        except urllib.request.HTTPError as e:
+            self.logger.error(f"HTTP error occurred: {e.code} - {e.reason}")
+            return False
 
         # Now we upload the markdown content to the signed URL
         req = urllib.request.Request(
@@ -300,8 +304,9 @@ class SpaceforgePlugin(ABC):
                 self.logger.error(
                     f"Error uploading markdown content: {put_response.status}"
                 )
-                return
+                return False
             self.logger.debug("Markdown content uploaded successfully.")
+        return True
 
     def add_to_policy_input(self, input_name: str, data: Dict[str, Any]) -> None:
         """

{spaceforge-0.0.4 → spaceforge-0.0.5}/spaceforge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaceforge
-Version: 0.0.4
+Version: 0.0.5
 Summary: A Python framework for building Spacelift plugins
 Home-page: https://github.com/spacelift-io/plugins
 Author: Spacelift