From 12cb9ee4dd54a596fad9954d4557c65526c89588 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Sun, 27 Oct 2019 21:42:18 +0100 Subject: [PATCH 1/3] shard.yml: targets removed --- shard.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/shard.yml b/shard.yml index 8053bc9..3df3584 100644 --- a/shard.yml +++ b/shard.yml @@ -7,12 +7,6 @@ authors: description: | Services management tool. -targets: - service: - main: src/service.cr - status: - main: src/status.cr - dependencies: specparser: git: https://git.karchnu.fr/WeirdOS/recipes-parser From ff4c1cc08d4587e23487acf39c66fe8549ff675d Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Sun, 27 Oct 2019 22:11:07 +0100 Subject: [PATCH 2/3] WIP consumers in gen-config. --- src/gen-config.cr | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/gen-config.cr b/src/gen-config.cr index 5ea81c1..3047ef0 100644 --- a/src/gen-config.cr +++ b/src/gen-config.cr @@ -50,6 +50,7 @@ class GenConfig::Context def generate(template, target : String, options : Hash(String, Variables)) ServiceDefinition.load SERVICES_DIRECTORY Service.load RC_DIRECTORY + Environment.load ENVIRONMENTS_DIRECTORY target_file = File.open target, "w" @@ -99,6 +100,18 @@ class GenConfig::Context end end options["providers"] = providers + + consumers = Hash(String, Variables).new + service.provides.each do |provider_data| + token = provider_data.token + + consumers[token] = Service.all.select do |s2| + s2.providers.each do |t2, id| + token == t2 && id == service.id + end + end.map &.full_id + end + options["consumers"] = consumers end end From 19f825dba42c69efb98fac51828ba5894c3c4be7 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Sun, 27 Oct 2019 22:14:11 +0100 Subject: [PATCH 3/3] Fixes service loading issue in gen-config. --- src/gen-config.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gen-config.cr b/src/gen-config.cr index 3047ef0..cb6079a 100644 --- a/src/gen-config.cr +++ b/src/gen-config.cr @@ -48,9 +48,9 @@ class GenConfig::Context end def generate(template, target : String, options : Hash(String, Variables)) + Environment.load ENVIRONMENTS_DIRECTORY ServiceDefinition.load SERVICES_DIRECTORY Service.load RC_DIRECTORY - Environment.load ENVIRONMENTS_DIRECTORY target_file = File.open target, "w"