Merge pull request 'cli vars: remove get_all from baseclass' (#2535) from lassulus/clan-core:vars_get_all into main

This commit is contained in:
clan-bot
2024-12-02 10:51:01 +00:00
2 changed files with 10 additions and 13 deletions

View File

@@ -107,18 +107,6 @@ class StoreBase(ABC):
) )
return new_file return new_file
def get_all(self) -> list["Var"]:
all_vars = []
for generator in self.machine.vars_generators:
for var in generator.files:
# only handle vars compatible to this store
if self.is_secret_store != var.secret:
continue
var.store(self)
var.generator(generator)
all_vars.append(var)
return all_vars
def get_validation(self, generator: "Generator") -> str | None: def get_validation(self, generator: "Generator") -> str | None:
""" """
Return the invalidation hash that indicates if a generator needs to be re-run Return the invalidation hash that indicates if a generator needs to be re-run

View File

@@ -28,7 +28,16 @@ def secret_store(machine: Machine) -> SecretStoreBase:
def get_vars(machine: Machine) -> list[Var]: def get_vars(machine: Machine) -> list[Var]:
pub_store = public_store(machine) pub_store = public_store(machine)
sec_store = secret_store(machine) sec_store = secret_store(machine)
return pub_store.get_all() + sec_store.get_all() all_vars = []
for generator in machine.vars_generators:
for var in generator.files:
if var.secret:
var.store(sec_store)
else:
var.store(pub_store)
var.generator(generator)
all_vars.append(var)
return all_vars
def _get_previous_value( def _get_previous_value(