spaceforge 0.0.13__tar.gz → 0.0.16__tar.gz

{spaceforge-0.0.13 → spaceforge-0.0.16}/PKG-INFO

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

{spaceforge-0.0.13 → spaceforge-0.0.16}/spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.13'
-__version_tuple__ = version_tuple = (0, 0, 13)
+__version__ = version = '0.0.16'
+__version_tuple__ = version_tuple = (0, 0, 16)
 
-__commit_id__ = commit_id = 'g4dc3579b1'
+__commit_id__ = commit_id = 'g11adf16b1'

{spaceforge-0.0.13 → spaceforge-0.0.16}/spaceforge/plugin.py

@@ -9,7 +9,7 @@ import os
 import subprocess
 import urllib.request
 from abc import ABC
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 from urllib.error import HTTPError
 
 
@@ -43,6 +43,7 @@ class SpaceforgePlugin(ABC):
         self._api_enabled = bool(self._api_token and self.spacelift_domain)
         self._workspace_root = os.getcwd()
         self._spacelift_markdown_endpoint = None
+        self._markdown_endpoint_token = os.environ.get("SPACELIFT_API_TOKEN") or False
 
         # This should be the last thing we do in the constructor
         # because we set api_enabled to false if the domain is set up incorrectly.
@@ -109,13 +110,8 @@ class SpaceforgePlugin(ABC):
 
         return logger
 
-    def use_user_token(
-        self, id: str, token: str, api_query: Callable[[str, None], Dict[str, Any]]
-    ) -> None:
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self._api_token}",
-        }
+    def use_user_token(self, id: str, token: str) -> None:
+        headers = {"Content-Type": "application/json"}
 
         query = """
         mutation requestApiKey($id: ID!, $secret: String!){
@@ -310,13 +306,16 @@ class SpaceforgePlugin(ABC):
             self.logger.info(markdown)
             return True
 
-        if self._spacelift_markdown_endpoint is None:
+        if (
+            self._spacelift_markdown_endpoint is None
+            or not self._markdown_endpoint_token
+        ):
             self.logger.error(
                 'API is not enabled, please export "SPACELIFT_API_TOKEN" and "TF_VAR_spacelift_graphql_endpoint".'
             )
             return False
 
-        headers = {"Authorization": f"Bearer {self._api_token}"}
+        headers = {"Authorization": f"Bearer {self._markdown_endpoint_token}"}
         body = {
             "plugin_name": self.__plugin_name__,
         }

{spaceforge-0.0.13 → spaceforge-0.0.16}/spaceforge.egg-info/PKG-INFO

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