spaceforge 0.0.13__py3-none-any.whl → 0.0.14__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- spaceforge/_version_scm.py +2 -2
- spaceforge/plugin.py +8 -6
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/METADATA +1 -1
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/RECORD +8 -8
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/WHEEL +0 -0
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/entry_points.txt +0 -0
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/licenses/LICENSE +0 -0
- {spaceforge-0.0.13.dist-info → spaceforge-0.0.14.dist-info}/top_level.txt +0 -0
spaceforge/_version_scm.py
CHANGED
|
@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
|
|
|
28
28
|
commit_id: COMMIT_ID
|
|
29
29
|
__commit_id__: COMMIT_ID
|
|
30
30
|
|
|
31
|
-
__version__ = version = '0.0.
|
|
32
|
-
__version_tuple__ = version_tuple = (0, 0,
|
|
31
|
+
__version__ = version = '0.0.14'
|
|
32
|
+
__version_tuple__ = version_tuple = (0, 0, 14)
|
|
33
33
|
|
|
34
34
|
__commit_id__ = commit_id = None
|
spaceforge/plugin.py
CHANGED
|
@@ -9,7 +9,7 @@ import os
|
|
|
9
9
|
import subprocess
|
|
10
10
|
import urllib.request
|
|
11
11
|
from abc import ABC
|
|
12
|
-
from typing import Any,
|
|
12
|
+
from typing import Any, Dict, List, Optional, Tuple
|
|
13
13
|
from urllib.error import HTTPError
|
|
14
14
|
|
|
15
15
|
|
|
@@ -43,6 +43,7 @@ class SpaceforgePlugin(ABC):
|
|
|
43
43
|
self._api_enabled = bool(self._api_token and self.spacelift_domain)
|
|
44
44
|
self._workspace_root = os.getcwd()
|
|
45
45
|
self._spacelift_markdown_endpoint = None
|
|
46
|
+
self._markdown_endpoint_token = os.environ.get("SPACELIFT_API_TOKEN") or False
|
|
46
47
|
|
|
47
48
|
# This should be the last thing we do in the constructor
|
|
48
49
|
# because we set api_enabled to false if the domain is set up incorrectly.
|
|
@@ -109,9 +110,7 @@ class SpaceforgePlugin(ABC):
|
|
|
109
110
|
|
|
110
111
|
return logger
|
|
111
112
|
|
|
112
|
-
def use_user_token(
|
|
113
|
-
self, id: str, token: str, api_query: Callable[[str, None], Dict[str, Any]]
|
|
114
|
-
) -> None:
|
|
113
|
+
def use_user_token(self, id: str, token: str) -> None:
|
|
115
114
|
headers = {
|
|
116
115
|
"Content-Type": "application/json",
|
|
117
116
|
"Authorization": f"Bearer {self._api_token}",
|
|
@@ -310,13 +309,16 @@ class SpaceforgePlugin(ABC):
|
|
|
310
309
|
self.logger.info(markdown)
|
|
311
310
|
return True
|
|
312
311
|
|
|
313
|
-
if
|
|
312
|
+
if (
|
|
313
|
+
self._spacelift_markdown_endpoint is None
|
|
314
|
+
or not self._markdown_endpoint_token
|
|
315
|
+
):
|
|
314
316
|
self.logger.error(
|
|
315
317
|
'API is not enabled, please export "SPACELIFT_API_TOKEN" and "TF_VAR_spacelift_graphql_endpoint".'
|
|
316
318
|
)
|
|
317
319
|
return False
|
|
318
320
|
|
|
319
|
-
headers = {"Authorization": f"Bearer {self.
|
|
321
|
+
headers = {"Authorization": f"Bearer {self._markdown_endpoint_token}"}
|
|
320
322
|
body = {
|
|
321
323
|
"plugin_name": self.__plugin_name__,
|
|
322
324
|
}
|
|
@@ -2,11 +2,11 @@ spaceforge/README.md,sha256=8o1Nuyasb4OxX3E7ZycyducOrR4J19bZcHrLvFeoFNg,7730
|
|
|
2
2
|
spaceforge/__init__.py,sha256=TU-vvm15dK1ucixNW0V42eTT72x3_hmKSyxP4MC1Occ,589
|
|
3
3
|
spaceforge/__main__.py,sha256=c3nAw4WBnHXIcfMlRV6Ja7r87pEhSeK-SAqiSYIasIY,643
|
|
4
4
|
spaceforge/_version.py,sha256=RP_LfUd4ODnrfwn9nam8wB6bR3lM4VwmoRxK08Tkiiw,2155
|
|
5
|
-
spaceforge/_version_scm.py,sha256=
|
|
5
|
+
spaceforge/_version_scm.py,sha256=YDX9ERYoOeE60PulkdUCy2JxmS89Xb_igX2wwbidLMQ,706
|
|
6
6
|
spaceforge/cls.py,sha256=8jZ0noS-kIBQWHp7pWHOX6yzs5N30gIEm6-slWgBaKI,6182
|
|
7
7
|
spaceforge/conftest.py,sha256=U-xCavCsgRAQXqflIIOMeq9pcGbeqRviUNkEXgZol8g,2141
|
|
8
8
|
spaceforge/generator.py,sha256=7tt0zpqrD2pZsoVxQa0BfzBH1ZtGr6o3r_LmpBjrOJk,16739
|
|
9
|
-
spaceforge/plugin.py,sha256=
|
|
9
|
+
spaceforge/plugin.py,sha256=fuATKzkkev2hNKWpQYMwJs1ZHgYKxEXGdlqHQ_wmpZ4,16057
|
|
10
10
|
spaceforge/runner.py,sha256=aBQQLG8MFVrqCzM0X8HgERYbhLKbmlOHUPKjV7-xvpA,3163
|
|
11
11
|
spaceforge/schema.json,sha256=F0STokM3YYT0xzcNdtnELZJJgpyi49mwk9Oj8ueD39s,10631
|
|
12
12
|
spaceforge/test_cls.py,sha256=nXAgbnFnGdFxrtA7vNXiePjNUASuoYW-lEuQGx9WMGs,468
|
|
@@ -25,9 +25,9 @@ spaceforge/test_runner_core.py,sha256=eNR9YOwJwv7LsMtNQ4WXXMPIW6RE_A7hUp4bCpzz1R
|
|
|
25
25
|
spaceforge/test_runner_execution.py,sha256=BRlOApCmlpjE9YYvqHc8creSRu2vyPubzOCVXv-on0w,5335
|
|
26
26
|
spaceforge/templates/binary_install.sh.j2,sha256=UjP_kAdvkkATKds2nqk4ouqLhuIfCgM_x0WQIl1hbIo,477
|
|
27
27
|
spaceforge/templates/ensure_spaceforge_and_run.sh.j2,sha256=g5BldIEve0IkZ-mCzTXfB_rFvyWqUJqymRRaaMrpp0s,550
|
|
28
|
-
spaceforge-0.0.
|
|
29
|
-
spaceforge-0.0.
|
|
30
|
-
spaceforge-0.0.
|
|
31
|
-
spaceforge-0.0.
|
|
32
|
-
spaceforge-0.0.
|
|
33
|
-
spaceforge-0.0.
|
|
28
|
+
spaceforge-0.0.14.dist-info/licenses/LICENSE,sha256=wyljRrfnWY2ggQKkSCg3Nw2hxwPMmupopaKs9Kpgys8,1065
|
|
29
|
+
spaceforge-0.0.14.dist-info/METADATA,sha256=zT9cFLQOwMjkHyrXeUDN4a0Pm_elJI2dpMhrvWetjZc,16804
|
|
30
|
+
spaceforge-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
31
|
+
spaceforge-0.0.14.dist-info/entry_points.txt,sha256=qawuuKBSNTGg-njnQnhxxFldFvXYAPej6bF_f3iyQ48,56
|
|
32
|
+
spaceforge-0.0.14.dist-info/top_level.txt,sha256=eVw-Lw4Th0oHM8Gx1Y8YetyNgbNbMBU00yWs-kwGeSs,11
|
|
33
|
+
spaceforge-0.0.14.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|