spaceforge 0.0.14__py3-none-any.whl → 0.0.17__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.14'
-__version_tuple__ = version_tuple = (0, 0, 14)
+__version__ = version = '0.0.17'
+__version_tuple__ = version_tuple = (0, 0, 17)
 
 __commit_id__ = commit_id = None

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/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.dist-info → spaceforge-0.0.17.dist-info}/METADATA

@@ -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.dist-info → spaceforge-0.0.17.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=YDX9ERYoOeE60PulkdUCy2JxmS89Xb_igX2wwbidLMQ,706
+spaceforge/_version_scm.py,sha256=S11KPmKYJXKQX0D8GWJ9ou0JkWsMIQoAxzWzBzTnRp4,706
 spaceforge/cls.py,sha256=8jZ0noS-kIBQWHp7pWHOX6yzs5N30gIEm6-slWgBaKI,6182
 spaceforge/conftest.py,sha256=U-xCavCsgRAQXqflIIOMeq9pcGbeqRviUNkEXgZol8g,2141
 spaceforge/generator.py,sha256=7tt0zpqrD2pZsoVxQa0BfzBH1ZtGr6o3r_LmpBjrOJk,16739
-spaceforge/plugin.py,sha256=fuATKzkkev2hNKWpQYMwJs1ZHgYKxEXGdlqHQ_wmpZ4,16057
+spaceforge/plugin.py,sha256=CdpdmFQ6sXPE86dqDnPpHsjRZd0ZQBqE9rp5NxmHfD8,16083
 spaceforge/runner.py,sha256=aBQQLG8MFVrqCzM0X8HgERYbhLKbmlOHUPKjV7-xvpA,3163
 spaceforge/schema.json,sha256=F0STokM3YYT0xzcNdtnELZJJgpyi49mwk9Oj8ueD39s,10631
 spaceforge/test_cls.py,sha256=nXAgbnFnGdFxrtA7vNXiePjNUASuoYW-lEuQGx9WMGs,468
@@ -15,7 +15,7 @@ spaceforge/test_generator_binaries.py,sha256=X_7pPLGE45eQt-Kv9_ku__LsyLgOvViHc_B
 spaceforge/test_generator_core.py,sha256=gOqRx0rnME-srGMHun4KidXMN-iaqfKKTyoQ0Tw6b9Q,6253
 spaceforge/test_generator_hooks.py,sha256=2lJs8dYlFb7QehWcYF0O4qg38s5UudEpzJyBi1XiS3k,2542
 spaceforge/test_generator_parameters.py,sha256=77az9rcocFny2AC4O2eTzjCW712fR1DBHzGrgBKeR4w,1878
-spaceforge/test_plugin.py,sha256=Ufr9I9hz3hR9ATnOrkbH7Ouev9cDcdrw2iQJG5l2T2A,13676
+spaceforge/test_plugin.py,sha256=jp3Nmq-DgYDMlQrell3nInEsp4xQ5NP6R0THqcPX6kM,13655
 spaceforge/test_plugin_file_operations.py,sha256=B0qvIo5EcfKMiHLhBv-hAnpSonn83ojcmJHXasydojA,3782
 spaceforge/test_plugin_hooks.py,sha256=rNCZZyd_SDMkm1x3yl5mjQ5tBMGm3YNd1U6h_niWRQs,2962
 spaceforge/test_plugin_inheritance.py,sha256=WHfvU5s-2GtfcI9-1bHXH7bacr77ikq68V3Z3BBQKvQ,3617
@@ -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.14.dist-info/licenses/LICENSE,sha256=wyljRrfnWY2ggQKkSCg3Nw2hxwPMmupopaKs9Kpgys8,1065
-spaceforge-0.0.14.dist-info/METADATA,sha256=zT9cFLQOwMjkHyrXeUDN4a0Pm_elJI2dpMhrvWetjZc,16804
-spaceforge-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-spaceforge-0.0.14.dist-info/entry_points.txt,sha256=qawuuKBSNTGg-njnQnhxxFldFvXYAPej6bF_f3iyQ48,56
-spaceforge-0.0.14.dist-info/top_level.txt,sha256=eVw-Lw4Th0oHM8Gx1Y8YetyNgbNbMBU00yWs-kwGeSs,11
-spaceforge-0.0.14.dist-info/RECORD,,
+spaceforge-0.0.17.dist-info/licenses/LICENSE,sha256=wyljRrfnWY2ggQKkSCg3Nw2hxwPMmupopaKs9Kpgys8,1065
+spaceforge-0.0.17.dist-info/METADATA,sha256=wx9eANlUUju04Vx4qnEFSdaVruUvr2qOdeq0Nqq6edk,16804
+spaceforge-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+spaceforge-0.0.17.dist-info/entry_points.txt,sha256=qawuuKBSNTGg-njnQnhxxFldFvXYAPej6bF_f3iyQ48,56
+spaceforge-0.0.17.dist-info/top_level.txt,sha256=eVw-Lw4Th0oHM8Gx1Y8YetyNgbNbMBU00yWs-kwGeSs,11
+spaceforge-0.0.17.dist-info/RECORD,,