spaceforge 0.0.6__tar.gz → 0.0.8__tar.gz

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

@@ -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 → 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.6 → spaceforge-0.0.8}/plugins/enviroment_manager/plugin.yaml

@@ -130,10 +130,10 @@ contexts:
         write_only = each.value.write_only
       }
     sensitive: false
-  - path: /mnt/workspace/plugins/environment manager/requirements.txt
+  - path: /mnt/workspace/plugins/environment_manager/requirements.txt
     content: pyyaml==6.0.2
     sensitive: false
-  - path: /mnt/workspace/plugins/environment manager/plugin.py
+  - path: /mnt/workspace/plugins/environment_manager/plugin.py
     content: |-
       from spaceforge import SpaceforgePlugin, MountedFile, Context
 
@@ -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.")
@@ -384,13 +387,13 @@ contexts:
               # Trigger stack previews
               self.trigger_stack_previews(runtime_config)
     sensitive: false
-  - path: /mnt/workspace/plugins/environment manager/before_init.sh
+  - path: /mnt/workspace/plugins/environment_manager/before_init.sh
     content: |-
       #!/bin/sh
 
       set -e
 
-      cd /mnt/workspace/plugins/environment manager
+      cd /mnt/workspace/plugins/environment_manager
 
       if [ ! -d "./venv" ]; then
           python -m venv ./venv
@@ -407,10 +410,10 @@ contexts:
       fi
 
       cd /mnt/workspace/source/$TF_VAR_spacelift_project_root
-      spaceforge runner --plugin-file /mnt/workspace/plugins/environment manager/plugin.py before_init
+      spaceforge runner --plugin-file /mnt/workspace/plugins/environment_manager/plugin.py before_init
     sensitive: false
   hooks:
     before_init:
     - mv /mnt/workspace/__environment_manager.tf /mnt/workspace/source/$TF_VAR_spacelift_project_root/__environment_manager.tf
-    - mkdir -p /mnt/workspace/plugins/environment manager
-    - chmod +x /mnt/workspace/plugins/environment manager/before_init.sh && /mnt/workspace/plugins/environment manager/before_init.sh
+    - mkdir -p /mnt/workspace/plugins/environment_manager
+    - chmod +x /mnt/workspace/plugins/environment_manager/before_init.sh && /mnt/workspace/plugins/environment_manager/before_init.sh

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/infracost/plugin.py

@@ -6,7 +6,7 @@ class InfracostPlugin(SpaceforgePlugin):
     """
 
     # Plugin metadata
-    __plugin_name__ = "infracost"
+    __plugin_name__ = "Infracost"
     __labels__ = ["cost estimation", "infrastructure"]
     __version__ = "1.0.0"
     __author__ = "Spacelift Team"

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/infracost/plugin.yaml

@@ -1,4 +1,4 @@
-name: infracost
+name: Infracost
 version: 1.0.0
 description: A plugin for integrating with Infracost to estimate costs of infrastructure changes.
 author: Spacelift Team
@@ -29,7 +29,7 @@ contexts:
           """
 
           # Plugin metadata
-          __plugin_name__ = "infracost"
+          __plugin_name__ = "Infracost"
           __labels__ = ["cost estimation", "infrastructure"]
           __version__ = "1.0.0"
           __author__ = "Spacelift Team"

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/sops/plugin.py

@@ -37,7 +37,7 @@ secrets:
     """
 
     # Plugin metadata
-    __plugin_name__ = "sops"
+    __plugin_name__ = "Sops"
     __labels__ = ["secrets management", "encryption"]
     __version__ = "1.0.0"
     __author__ = "Spacelift Team"

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/sops/plugin.yaml

@@ -1,4 +1,4 @@
-name: sops
+name: Sops
 version: 1.0.0
 description: |-
   # Plugin Sops
@@ -35,7 +35,7 @@ labels:
 - encryption
 contexts:
 - name_prefix: sops
-  description: Main context for sops
+  description: Main context for Sops
   env: []
   mounted_files:
   - path: /mnt/workspace/plugins/sops/requirements.txt
@@ -84,7 +84,7 @@ contexts:
           """
 
           # Plugin metadata
-          __plugin_name__ = "sops"
+          __plugin_name__ = "Sops"
           __labels__ = ["secrets management", "encryption"]
           __version__ = "1.0.0"
           __author__ = "Spacelift Team"

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/wiz/plugin.py

@@ -23,7 +23,7 @@ Samples of these policies are included with the plugin.
     """
 
     # Plugin metadata
-    __plugin_name__ = "wiz"
+    __plugin_name__ = "Wiz"
     __labels__ = ["security", "code scanning", "vulnerability"]
     __version__ = "1.0.0"
     __author__ = "Spacelift Team"

{spaceforge-0.0.6 → spaceforge-0.0.8}/plugins/wiz/plugin.yaml

@@ -1,4 +1,4 @@
-name: wiz
+name: Wiz
 version: 1.0.0
 description: |-
   # Plugin Wiz
@@ -69,7 +69,7 @@ contexts:
           """
 
           # Plugin metadata
-          __plugin_name__ = "wiz"
+          __plugin_name__ = "Wiz"
           __labels__ = ["security", "code scanning", "vulnerability"]
           __version__ = "1.0.0"
           __author__ = "Spacelift Team"

{spaceforge-0.0.6 → 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.6'
-__version_tuple__ = version_tuple = (0, 0, 6)
+__version__ = version = '0.0.8'
+__version_tuple__ = version_tuple = (0, 0, 8)
 
-__commit_id__ = commit_id = 'gf4078fecf'
+__commit_id__ = commit_id = 'g3b76eed20'

{spaceforge-0.0.6 → spaceforge-0.0.8}/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-0.0.6 → 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 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 → spaceforge-0.0.8}/spaceforge.egg-info/PKG-INFO

@@ -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