spaceforge 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.6'
-__version_tuple__ = version_tuple = (0, 0, 6)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)
 
 __commit_id__ = commit_id = None

spaceforge/generator.py

@@ -84,7 +84,8 @@ class PluginGenerator:
         self.plugin_class = plugin_class
         self.plugin_instance = plugin_class()
         self.plugin_working_directory = (
-            "/mnt/workspace/plugins/" + plugin_class.__plugin_name__.lower()
+            "/mnt/workspace/plugins/"
+            + plugin_class.__plugin_name__.lower().replace(" ", "_")
         )
         self.config = {
             "setup_virtual_env": (

spaceforge/plugin.py

@@ -8,6 +8,7 @@ import logging
 import os
 import subprocess
 import urllib.request
+from urllib.error import HTTPError
 from abc import ABC
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -48,14 +49,14 @@ class SpaceforgePlugin(ABC):
         if self.spacelift_domain and isinstance(self.spacelift_domain, str):
             # this must occur after we check if spacelift domain is false
             # because the domain could be set but not start with https://
-            if self.spacelift_domain.startswith("https://"):
-                if self.spacelift_domain.endswith("/"):
-                    self.spacelift_domain = self.spacelift_domain[:-1]
-            else:
-                self.logger.warning(
-                    "SPACELIFT_DOMAIN does not start with https://, api calls will fail."
-                )
-                self._api_enabled = False
+            # if self.spacelift_domain.startswith("https://"):
+            #     if self.spacelift_domain.endswith("/"):
+            #         self.spacelift_domain = self.spacelift_domain[:-1]
+            # else:
+            #     self.logger.warning(
+            #         "SPACELIFT_DOMAIN does not start with https://, api calls will fail."
+            #     )
+            #     self._api_enabled = False
 
             if self._api_enabled:
                 self._spacelift_markdown_endpoint = self.spacelift_domain.replace(
@@ -204,8 +205,17 @@ class SpaceforgePlugin(ABC):
             json.dumps(data).encode("utf-8"),
             headers,
         )
-        with urllib.request.urlopen(req) as response:
-            resp: Dict[str, Any] = json.loads(response.read().decode("utf-8"))
+
+        try:
+            with urllib.request.urlopen(req) as response:
+                resp: Dict[str, Any] = json.loads(response.read().decode("utf-8"))
+        except urllib.error.HTTPError as e:
+            if hasattr(e, 'read'):
+                resp = json.loads(e.read().decode('utf-8'))
+            else:
+                # We should not get here, but if we do re-raise the exception
+                self.logger.error(f"HTTP error occurred: ({e.code}) {e.reason} {e.msg}")
+                raise e
 
         if "errors" in resp:
             self.logger.error(f"Error: {resp['errors']}")
@@ -287,8 +297,8 @@ class SpaceforgePlugin(ABC):
                 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}")
+        except HTTPError as e:
+            self.logger.error(f"HTTP error occurred: ({e.code}) {e.reason} {e.msg}")
             return False
 
         # Now we upload the markdown content to the signed URL
@@ -299,13 +309,18 @@ class SpaceforgePlugin(ABC):
             method="PUT",
         )
 
-        with urllib.request.urlopen(req) as put_response:
-            if put_response.status != 200:
-                self.logger.error(
-                    f"Error uploading markdown content: {put_response.status}"
-                )
-                return False
-            self.logger.debug("Markdown content uploaded successfully.")
+        try:
+            with urllib.request.urlopen(req) as put_response:
+                if put_response.status != 200:
+                    self.logger.error(
+                        f"Error uploading markdown content: {put_response.status}"
+                    )
+                    return False
+                self.logger.debug("Markdown content uploaded successfully.")
+        except HTTPError as e:
+            self.logger.error(f"HTTP error occurred during upload: ({e.code}) {e.reason} {e.msg}")
+            return False
+
         return True
 
     def add_to_policy_input(self, input_name: str, data: Dict[str, Any]) -> None:

{spaceforge-0.0.6.dist-info → spaceforge-0.0.8.dist-info}/METADATA

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

{spaceforge-0.0.6.dist-info → spaceforge-0.0.8.dist-info}/RECORD

@@ -2,11 +2,11 @@ spaceforge/README.md,sha256=8o1Nuyasb4OxX3E7ZycyducOrR4J19bZcHrLvFeoFNg,7730
 spaceforge/__init__.py,sha256=TU-vvm15dK1ucixNW0V42eTT72x3_hmKSyxP4MC1Occ,589
 spaceforge/__main__.py,sha256=c3nAw4WBnHXIcfMlRV6Ja7r87pEhSeK-SAqiSYIasIY,643
 spaceforge/_version.py,sha256=RP_LfUd4ODnrfwn9nam8wB6bR3lM4VwmoRxK08Tkiiw,2155
-spaceforge/_version_scm.py,sha256=7MyqQ3iPP2mJruPfRYGCNCq1z7_Nk7c-eyYecYITxsY,704
+spaceforge/_version_scm.py,sha256=j-ar4gJGiWIawqKXhvv9hGJWLfwu0tISl-0GV97B7a0,704
 spaceforge/cls.py,sha256=lCGtlMv-rFFVnvfFaq36-GRqLiINswLD78amZigZo7I,6068
 spaceforge/conftest.py,sha256=U-xCavCsgRAQXqflIIOMeq9pcGbeqRviUNkEXgZol8g,2141
-spaceforge/generator.py,sha256=-1lO_1bhaM85-aULpPE2TeG4SlaznETG3YfyucKALns,16709
-spaceforge/plugin.py,sha256=PdQpBle5eU_N__2eArJgNe2BEnN3mL_SMeM6yjnBtGw,13322
+spaceforge/generator.py,sha256=7tt0zpqrD2pZsoVxQa0BfzBH1ZtGr6o3r_LmpBjrOJk,16739
+spaceforge/plugin.py,sha256=-T52w2akah5ebCTvjEEvbEf_b35zuMUgeTr-9BGNX90,13933
 spaceforge/runner.py,sha256=aBQQLG8MFVrqCzM0X8HgERYbhLKbmlOHUPKjV7-xvpA,3163
 spaceforge/schema.json,sha256=scQyV71IlbB5kipAhc880n-PG-FH8BeVk9FWFoA3Wtw,10483
 spaceforge/test_cls.py,sha256=nXAgbnFnGdFxrtA7vNXiePjNUASuoYW-lEuQGx9WMGs,468
@@ -25,9 +25,9 @@ spaceforge/test_runner_core.py,sha256=eNR9YOwJwv7LsMtNQ4WXXMPIW6RE_A7hUp4bCpzz1R
 spaceforge/test_runner_execution.py,sha256=BRlOApCmlpjE9YYvqHc8creSRu2vyPubzOCVXv-on0w,5335
 spaceforge/templates/binary_install.sh.j2,sha256=UjP_kAdvkkATKds2nqk4ouqLhuIfCgM_x0WQIl1hbIo,477
 spaceforge/templates/ensure_spaceforge_and_run.sh.j2,sha256=g5BldIEve0IkZ-mCzTXfB_rFvyWqUJqymRRaaMrpp0s,550
-spaceforge-0.0.6.dist-info/licenses/LICENSE,sha256=wyljRrfnWY2ggQKkSCg3Nw2hxwPMmupopaKs9Kpgys8,1065
-spaceforge-0.0.6.dist-info/METADATA,sha256=OwvM8wjFNiRS5kDfYTClgo9H9ZAAMIMOlkCXmqnDMac,16803
-spaceforge-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-spaceforge-0.0.6.dist-info/entry_points.txt,sha256=qawuuKBSNTGg-njnQnhxxFldFvXYAPej6bF_f3iyQ48,56
-spaceforge-0.0.6.dist-info/top_level.txt,sha256=eVw-Lw4Th0oHM8Gx1Y8YetyNgbNbMBU00yWs-kwGeSs,11
-spaceforge-0.0.6.dist-info/RECORD,,
+spaceforge-0.0.8.dist-info/licenses/LICENSE,sha256=wyljRrfnWY2ggQKkSCg3Nw2hxwPMmupopaKs9Kpgys8,1065
+spaceforge-0.0.8.dist-info/METADATA,sha256=7as3acsLiULbIUuK11a6lpeQt5K2DmeGiR8WRdxlYEI,16803
+spaceforge-0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+spaceforge-0.0.8.dist-info/entry_points.txt,sha256=qawuuKBSNTGg-njnQnhxxFldFvXYAPej6bF_f3iyQ48,56
+spaceforge-0.0.8.dist-info/top_level.txt,sha256=eVw-Lw4Th0oHM8Gx1Y8YetyNgbNbMBU00yWs-kwGeSs,11
+spaceforge-0.0.8.dist-info/RECORD,,