spaceforge 0.0.7__tar.gz → 0.0.8__tar.gz

{spaceforge-0.0.7 → spaceforge-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaceforge
-Version: 0.0.7
+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.7 → spaceforge-0.0.8}/plugins/enviroment_manager/plugin.py

@@ -149,6 +149,9 @@ resource "spacelift_environment_variable" "__this" {
         )
     ]
 
+    def __init__(self):
+        super().__init__()
+
     def load_yaml_file(self, file_path):
         """Load YAML file and return parsed content"""
         try:
@@ -190,13 +193,13 @@ resource "spacelift_environment_variable" "__this" {
             query = "{ stack(id: \"" + stack_id + "\") { trackedCommit { hash } } }"
             response = self.query_api(query)
             if "errors" in response:
-                self.logger.error("Error fetching stack tracked commit:", response["errors"])
+                self.logger.error(f"Error fetching stack tracked commit: {response['errors']}")
                 continue
 
             # Ensure we have a tracked commit
             try:
                 tracked_commit = response["data"]["stack"]["trackedCommit"]["hash"]
-            except TypeError:
+            except (TypeError, KeyError):
                 tracked_commit = None
             if tracked_commit is None:
                 self.logger.error(f"Stack {stack_id} has no tracked commit. Skipping.")

{spaceforge-0.0.7 → spaceforge-0.0.8}/plugins/enviroment_manager/plugin.yaml

@@ -286,6 +286,9 @@ contexts:
               )
           ]
 
+          def __init__(self):
+              super().__init__()
+
           def load_yaml_file(self, file_path):
               """Load YAML file and return parsed content"""
               try:
@@ -327,13 +330,13 @@ contexts:
                   query = "{ stack(id: \"" + stack_id + "\") { trackedCommit { hash } } }"
                   response = self.query_api(query)
                   if "errors" in response:
-                      self.logger.error("Error fetching stack tracked commit:", response["errors"])
+                      self.logger.error(f"Error fetching stack tracked commit: {response['errors']}")
                       continue
 
                   # Ensure we have a tracked commit
                   try:
                       tracked_commit = response["data"]["stack"]["trackedCommit"]["hash"]
-                  except TypeError:
+                  except (TypeError, KeyError):
                       tracked_commit = None
                   if tracked_commit is None:
                       self.logger.error(f"Stack {stack_id} has no tracked commit. Skipping.")

{spaceforge-0.0.7 → spaceforge-0.0.8}/spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.7'
-__version_tuple__ = version_tuple = (0, 0, 7)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)
 
-__commit_id__ = commit_id = 'g0a9b4ad4a'
+__commit_id__ = commit_id = 'g3b76eed20'

{spaceforge-0.0.7 → spaceforge-0.0.8}/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 Exception as e:
-            self.logger.error(f"HTTP error occurred: {e}")
+        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
@@ -307,8 +317,8 @@ class SpaceforgePlugin(ABC):
                     )
                     return False
                 self.logger.debug("Markdown content uploaded successfully.")
-        except Exception as e:
-            self.logger.error(f"HTTP error occurred during upload: {e}")
+        except HTTPError as e:
+            self.logger.error(f"HTTP error occurred during upload: ({e.code}) {e.reason} {e.msg}")
             return False
 
         return True

{spaceforge-0.0.7 → spaceforge-0.0.8}/spaceforge.egg-info/PKG-INFO

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