Skip to content

Commit eb22d22

Browse files
committed
Disable Variable Sets support for now
1 parent 006a0ac commit eb22d22

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ select = [
110110
task-tags = ["KLUDGE", "TODO"]
111111

112112
[tool.ruff.lint.per-file-ignores]
113+
"spacemk/exporters/terraform.py" = [
114+
"ERA001",
115+
] # KLUDGE: Ignored until we re-enable support for Variable Sets
113116
"tests/*" = ["S101"]
114117

115118
[tool.ruff.lint.pydocstyle]

spacemk/exporters/terraform.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ def expand_relationship(entity_data) -> None:
530530

531531
# KLUDGE: Context and context variable relationships need to be expanded after stacks'
532532
# so that the stack migration ID is present
533-
expand_relationship(data.get("contexts"))
534-
expand_relationship(data.get("context_variables"))
533+
# expand_relationship(data.get("contexts"))
534+
# expand_relationship(data.get("context_variables"))
535535

536536
logging.info("Stop expanding relationships")
537537

@@ -566,11 +566,11 @@ def _extract_data(self) -> list[dict]:
566566
data["providers"].extend(self._extract_providers_data(organization))
567567
data["tasks"].extend(self._extract_tasks_data(organization))
568568
data["teams"].extend(self._extract_teams_data(organization))
569-
data["variable_sets"].extend(self._extract_variable_sets_data(organization))
569+
# data["variable_sets"].extend(self._extract_variable_sets_data(organization))
570570
data["workspaces"].extend(self._extract_workspaces_data(organization))
571571

572-
for variable_set in data.variable_sets:
573-
data["variable_set_variables"].extend(self._extract_variable_set_variables_data(variable_set))
572+
# for variable_set in data.variable_sets:
573+
# data["variable_set_variables"].extend(self._extract_variable_set_variables_data(variable_set))
574574

575575
for workspace in data.workspaces:
576576
data["workspace_variables"].extend(self._extract_workspace_variables_data(workspace))
@@ -1316,10 +1316,12 @@ def _map_data(self, src_data: dict) -> dict:
13161316
data = benedict(
13171317
{
13181318
"spaces": self._map_spaces_data(src_data), # Must be first due to dependency
1319-
"contexts": self._map_contexts_data(src_data),
1320-
"context_variables": self._map_context_variables_data(
1321-
src_data
1322-
), # Must be after contexts due to dependency
1319+
"contexts": [],
1320+
"context_variables": [],
1321+
# "contexts": self._map_contexts_data(src_data),
1322+
# "context_variables": self._map_context_variables_data(
1323+
# src_data
1324+
# ), # Must be after contexts due to dependency
13231325
"modules": self._map_modules_data(src_data),
13241326
"stacks": self._map_stacks_data(src_data),
13251327
"stack_variables": self._map_stack_variables_data(src_data), # Must be after stacks due to dependency

spacemk/templates/base.tf.jinja

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ resource "spacelift_environment_variable" "{{ variable._relationships.space._mig
192192
{% for context in contexts %}
193193
resource "spacelift_context" "{{ context._relationships.space._migration_id }}_{{ context._migration_id }}" {
194194
{{ argument("description", context.description) }}
195+
{{ argument("labels", context.labels, default=[]) }}
195196
{{ argument("name", context.name, required=True) }}
196197
{% block context_arguments_extra scoped %}{% endblock %}
197198
}

0 commit comments

Comments
 (0)