spaceforge 0.0.14__tar.gz → 0.0.17__tar.gz

{spaceforge-0.0.14 → spaceforge-0.0.17}/PKG-INFO

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

{spaceforge-0.0.14 → spaceforge-0.0.17}/plugins/enviroment_manager/plugin.py

@@ -255,7 +255,7 @@ resource "spacelift_environment_variable" "__this" {
             if "errors" in response:
                 self.logger.error(f"Error triggering stack preview for {stack_id}:", response["errors"])
             else:
-                url = f"https://{self.spacelift_domain}/stack/{stack_id}/run/{response['data']['runTrigger']['id']}"
+                url = f"{self.spacelift_domain}/stack/{stack_id}/run/{response['data']['runTrigger']['id']}"
                 markdown.append(f"- Triggered [stack preview]({url}) for {stack_id} with commit {tracked_commit}.")
 
         if len(markdown) > 0:

{spaceforge-0.0.14 → spaceforge-0.0.17}/plugins/enviroment_manager/plugin.yaml

@@ -409,7 +409,7 @@ contexts:
                   if "errors" in response:
                       self.logger.error(f"Error triggering stack preview for {stack_id}:", response["errors"])
                   else:
-                      url = f"https://{self.spacelift_domain}/stack/{stack_id}/run/{response['data']['runTrigger']['id']}"
+                      url = f"{self.spacelift_domain}/stack/{stack_id}/run/{response['data']['runTrigger']['id']}"
                       markdown.append(f"- Triggered [stack preview]({url}) for {stack_id} with commit {tracked_commit}.")
 
               if len(markdown) > 0:

{spaceforge-0.0.14 → spaceforge-0.0.17}/spaceforge/_version_scm.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.14'
-__version_tuple__ = version_tuple = (0, 0, 14)
+__version__ = version = '0.0.17'
+__version_tuple__ = version_tuple = (0, 0, 17)
 
-__commit_id__ = commit_id = 'ga50701aaf'
+__commit_id__ = commit_id = 'gad9a26e5d'

{spaceforge-0.0.14 → spaceforge-0.0.17}/spaceforge/plugin.py

@@ -35,19 +35,22 @@ class SpaceforgePlugin(ABC):
         self._run_id = os.environ.get("TF_VAR_spacelift_run_id", "local")
         self._is_local = self._run_id == "local"
         self.logger = self._setup_logger()
+        self.spacelift_domain = os.environ.get(
+            "TF_VAR_spacelift_graphql_endpoint", ""
+        ).replace("/graphql", "")
 
         self._api_token = os.environ.get("SPACELIFT_API_TOKEN") or False
-        self.spacelift_domain = (
+        self._api_endpoint = (
             os.environ.get("TF_VAR_spacelift_graphql_endpoint") or False
         )
-        self._api_enabled = bool(self._api_token and self.spacelift_domain)
+        self._api_enabled = bool(self._api_token and self._api_endpoint)
         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.
-        if self.spacelift_domain and isinstance(self.spacelift_domain, str):
+        if self._api_endpoint and isinstance(self._api_endpoint, 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://"):
@@ -60,7 +63,7 @@ class SpaceforgePlugin(ABC):
             #     self._api_enabled = False
 
             if self._api_enabled:
-                self._spacelift_markdown_endpoint = self.spacelift_domain.replace(
+                self._spacelift_markdown_endpoint = self._api_endpoint.replace(
                     "/graphql", "/worker/plugin_logs_url"
                 )
 
@@ -111,10 +114,7 @@ class SpaceforgePlugin(ABC):
         return logger
 
     def use_user_token(self, id: str, token: str) -> None:
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self._api_token}",
-        }
+        headers = {"Content-Type": "application/json"}
 
         query = """
         mutation requestApiKey($id: ID!, $secret: String!){
@@ -130,12 +130,12 @@ class SpaceforgePlugin(ABC):
         }
 
         req = urllib.request.Request(
-            self.spacelift_domain,  # type: ignore[arg-type]
+            self._api_endpoint,  # type: ignore[arg-type]
             json.dumps(data).encode("utf-8"),
             headers,
         )
 
-        self.logger.debug(f"Sending request to url: {self.spacelift_domain}")
+        self.logger.debug(f"Sending request to url: {self._api_endpoint}")
         try:
             with urllib.request.urlopen(req) as response:
                 resp: Dict[str, Any] = json.loads(response.read().decode("utf-8"))
@@ -252,12 +252,12 @@ class SpaceforgePlugin(ABC):
             data["variables"] = variables
 
         req = urllib.request.Request(
-            self.spacelift_domain,  # type: ignore[arg-type]
+            self._api_endpoint,  # type: ignore[arg-type]
             json.dumps(data).encode("utf-8"),
             headers,
         )
 
-        self.logger.debug(f"Sending request to url: {self.spacelift_domain}")
+        self.logger.debug(f"Sending request to url: {self._api_endpoint}")
         try:
             with urllib.request.urlopen(req) as response:
                 resp: Dict[str, Any] = json.loads(response.read().decode("utf-8"))

{spaceforge-0.0.14 → spaceforge-0.0.17}/spaceforge/test_plugin.py

@@ -21,7 +21,7 @@
 #
 #         # Assert
 #         assert plugin._api_token is False
-#         assert plugin.spacelift_domain is False
+#         assert plugin._api_endpoint is False
 #         assert plugin._api_enabled is False
 #         assert plugin._workspace_root == os.getcwd()
 #         assert isinstance(plugin.logger, logging.Logger)
@@ -36,7 +36,7 @@
 #
 #         # Assert
 #         assert plugin._api_token == "test_token"
-#         assert plugin.spacelift_domain == "https://test.spacelift.io"
+#         assert plugin._api_endpoint == "https://test.spacelift.io"
 #         assert plugin._api_enabled is True
 #         assert plugin._workspace_root == os.getcwd()
 #
@@ -53,7 +53,7 @@
 #             plugin = SpaceforgePlugin()
 #
 #         # Assert
-#         assert plugin.spacelift_domain == "https://test.spacelift.io"
+#         assert plugin._api_endpoint == "https://test.spacelift.io"
 #         assert plugin._api_enabled is True
 #
 #     def test_should_disable_api_when_domain_has_no_https_prefix(self) -> None:
@@ -69,7 +69,7 @@
 #             plugin = SpaceforgePlugin()
 #
 #         # Assert
-#         assert plugin.spacelift_domain == "test.spacelift.io"
+#         assert plugin._api_endpoint == "test.spacelift.io"
 #         assert plugin._api_enabled is False
 #
 #     def test_should_disable_api_when_only_token_provided(self) -> None:
@@ -271,7 +271,7 @@
 #         plugin = SpaceforgePlugin()
 #         plugin._api_enabled = True
 #         plugin._api_token = "test_token"
-#         plugin.spacelift_domain = "https://test.spacelift.io"
+#         plugin._api_endpoint = "https://test.spacelift.io"
 #
 #         expected_data = {"data": {"test": "result"}}
 #         mock_api_response.read.return_value = json.dumps(expected_data).encode("utf-8")
@@ -305,7 +305,7 @@
 #         plugin = SpaceforgePlugin()
 #         plugin._api_enabled = True
 #         plugin._api_token = "test_token"
-#         plugin.spacelift_domain = "https://test.spacelift.io"
+#         plugin._api_endpoint = "https://test.spacelift.io"
 #
 #         mock_response_data = {"data": {"test": "result"}}
 #         mock_response = Mock()
@@ -331,7 +331,7 @@
 #         plugin = SpaceforgePlugin()
 #         plugin._api_enabled = True
 #         plugin._api_token = "test_token"
-#         plugin.spacelift_domain = "https://test.spacelift.io"
+#         plugin._api_endpoint = "https://test.spacelift.io"
 #
 #         mock_response_data = {"errors": [{"message": "Test error"}]}
 #         mock_response = Mock()

{spaceforge-0.0.14 → spaceforge-0.0.17}/spaceforge.egg-info/PKG-INFO

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