From 1e91314f5a5d0af27c43d9b2b4710ca92489a77c Mon Sep 17 00:00:00 2001 From: Graham Weldon Date: Mon, 5 Jul 2021 14:55:33 +0900 Subject: [PATCH 1/3] Suppress CLI STDOUT for the service unless explicityly enabled Signed-off-by: Graham Weldon --- scaffolding-chef-inspec/lib/scaffolding.ps1 | 2 +- scaffolding-chef-inspec/lib/scaffolding.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scaffolding-chef-inspec/lib/scaffolding.ps1 b/scaffolding-chef-inspec/lib/scaffolding.ps1 index 9dee506d..28d63ab2 100644 --- a/scaffolding-chef-inspec/lib/scaffolding.ps1 +++ b/scaffolding-chef-inspec/lib/scaffolding.ps1 @@ -198,7 +198,7 @@ function Invoke-DefaultInstall { "target_id": "{{ sys.member_id }}", "reporter": { "cli": { - "stdout": true + {{#if cfg.cli.stdout}}"stdout": true{{/if}} }{{#if cfg.output.json}}, "json" : { "file" : "c:/hab/svc/$pkg_name/results.json", diff --git a/scaffolding-chef-inspec/lib/scaffolding.sh b/scaffolding-chef-inspec/lib/scaffolding.sh index a9421ee7..6fddf6c2 100644 --- a/scaffolding-chef-inspec/lib/scaffolding.sh +++ b/scaffolding-chef-inspec/lib/scaffolding.sh @@ -220,7 +220,7 @@ EOF "target_id": "{{ sys.member_id }}", "reporter": { "cli": { - "stdout": true + {{#if cfg.cli.stdout}}"stdout": true{{/if}} }{{#if cfg.output.json}}, "json" : { "file" : "{{pkg.svc_path}}/results.json", From dd5187d4adef538a8890cd0b62e04dee0fab4b22 Mon Sep 17 00:00:00 2001 From: Graham Weldon Date: Wed, 21 Jul 2021 13:45:33 +0900 Subject: [PATCH 2/3] Ensure false is properly set to disable CLI output Signed-off-by: Graham Weldon --- scaffolding-chef-inspec/lib/scaffolding.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaffolding-chef-inspec/lib/scaffolding.sh b/scaffolding-chef-inspec/lib/scaffolding.sh index 6fddf6c2..67a4ff0e 100644 --- a/scaffolding-chef-inspec/lib/scaffolding.sh +++ b/scaffolding-chef-inspec/lib/scaffolding.sh @@ -220,7 +220,7 @@ EOF "target_id": "{{ sys.member_id }}", "reporter": { "cli": { - {{#if cfg.cli.stdout}}"stdout": true{{/if}} + {{#if cfg.cli.stdout}}"stdout": {{cfg.cli.stdout}}{{/if}} }{{#if cfg.output.json}}, "json" : { "file" : "{{pkg.svc_path}}/results.json", From 131b5485c3fab7ed9f3ec633d1cfef70a30b68f0 Mon Sep 17 00:00:00 2001 From: Graham Weldon Date: Wed, 21 Jul 2021 14:15:39 +0900 Subject: [PATCH 3/3] Enforce CLI STDOUT output disabled Signed-off-by: Graham Weldon --- scaffolding-chef-inspec/lib/scaffolding.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaffolding-chef-inspec/lib/scaffolding.sh b/scaffolding-chef-inspec/lib/scaffolding.sh index 67a4ff0e..da948946 100644 --- a/scaffolding-chef-inspec/lib/scaffolding.sh +++ b/scaffolding-chef-inspec/lib/scaffolding.sh @@ -220,7 +220,7 @@ EOF "target_id": "{{ sys.member_id }}", "reporter": { "cli": { - {{#if cfg.cli.stdout}}"stdout": {{cfg.cli.stdout}}{{/if}} + "stdout": {{#if cfg.cli.stdout}}true{{else}}false{{/if}} }{{#if cfg.output.json}}, "json" : { "file" : "{{pkg.svc_path}}/results.json",