From cd8fbf28183b60b5f2fac4a70648578eb091e4ca Mon Sep 17 00:00:00 2001 From: gpoblon Date: Fri, 12 Jun 2020 16:13:27 +0200 Subject: [PATCH] fixup! Fixes #17224: error about rudder-lang in logs --- rudder-lang/Makefile | 2 +- rudder-lang/src/translate.rs | 2 -- .../tester/simplest/technique.cf.json | 18 ++++++++++++++++++ .../test_files/tester/simplest/technique.cf.rl | 13 +++++++++++++ .../tester/simplest/technique.cf.rl.cf | 15 +++++++++++++++ .../tester/simplest/technique.cf.rl.cf.json | 18 ++++++++++++++++++ .../test_files/tester/simplest/technique.rl | 3 ++- .../test_files/tester/simplest/technique.rl.cf | 4 ++-- 8 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 rudder-lang/tests/test_files/tester/simplest/technique.cf.json create mode 100644 rudder-lang/tests/test_files/tester/simplest/technique.cf.rl create mode 100644 rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf create mode 100644 rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf.json diff --git a/rudder-lang/Makefile b/rudder-lang/Makefile index 475644f65b6..d27d0419f6d 100644 --- a/rudder-lang/Makefile +++ b/rudder-lang/Makefile @@ -8,7 +8,7 @@ DOC_EXAMPLES := $(wildcard docs/examples/*.rl) dependencies: $(PKG_INSTALLER) perl python3 -install: +install: build mkdir -p $(DESTDIR)/opt/rudder/etc mkdir -p $(DESTDIR)/opt/rudder/bin mkdir -p $(DESTDIR)/opt/rudder/share/python diff --git a/rudder-lang/src/translate.rs b/rudder-lang/src/translate.rs index 530ae957a60..ab881ec2244 100644 --- a/rudder-lang/src/translate.rs +++ b/rudder-lang/src/translate.rs @@ -33,8 +33,6 @@ struct Technique { version: String, bundle_name: String, parameter: Vec, - #[serde(default)] - bundle_args: Vec, method_calls: Vec, } diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.cf.json b/rudder-lang/tests/test_files/tester/simplest/technique.cf.json new file mode 100644 index 00000000000..89a3e3b17ed --- /dev/null +++ b/rudder-lang/tests/test_files/tester/simplest/technique.cf.json @@ -0,0 +1,18 @@ +{ + "name": "simplest", + "description": "rudderlang simplest for a complete loop", + "version": "1.0", + "bundle_name": "simplest", + "bundle_args": [], + "parameter": [], + "method_calls": [ + { + "class_context": "debian", + "component": "File absent", + "method_name": "file_absent", + "args": [ + "tmp" + ] + } + ] +} \ No newline at end of file diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl new file mode 100644 index 00000000000..52586423702 --- /dev/null +++ b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl @@ -0,0 +1,13 @@ +# This file has been generated with rltranslate +@format=0 +@name="simplest" +@description="rudderlang simplest for a complete loop" +@version="1.0" +@parameters= [ +] + +resource simplest() +simplest state technique() { + @component = "File absent" + if debian_family => file("tmp").absent() as file_absent_tmp +} diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf new file mode 100644 index 00000000000..a5552c96ad0 --- /dev/null +++ b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf @@ -0,0 +1,15 @@ +# generated by rudder-lang +# @name simplest +# @description rudderlang simplest for a complete loop +# @version 1.0 + +bundle agent simplest_technique +{ + vars: + "resources_dir" string => "${this.promise_dirname}/resources"; + methods: + "File absent_${report_data.directive_id}_0" usebundle => _method_reporting_context("File absent", "tmp"), + if => concat("debian_family"); + "File absent_${report_data.directive_id}_0" usebundle => file_absent("tmp"), + if => concat("debian_family"); +} diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf.json b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf.json new file mode 100644 index 00000000000..2f591656ead --- /dev/null +++ b/rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf.json @@ -0,0 +1,18 @@ +{ + "name": "simplest", + "description": "rudderlang simplest for a complete loop", + "version": "1.0", + "bundle_name": "simplest_technique", + "bundle_args": [], + "parameter": [], + "method_calls": [ + { + "class_context": "debian_family", + "component": "File absent", + "method_name": "file_absent", + "args": [ + "tmp" + ] + } + ] +} \ No newline at end of file diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.rl b/rudder-lang/tests/test_files/tester/simplest/technique.rl index 8decbb18362..52586423702 100644 --- a/rudder-lang/tests/test_files/tester/simplest/technique.rl +++ b/rudder-lang/tests/test_files/tester/simplest/technique.rl @@ -5,8 +5,9 @@ @version="1.0" @parameters= [ ] + resource simplest() simplest state technique() { @component = "File absent" - if debian => file("tmp").absent() as file_absent_tmp + if debian_family => file("tmp").absent() as file_absent_tmp } diff --git a/rudder-lang/tests/test_files/tester/simplest/technique.rl.cf b/rudder-lang/tests/test_files/tester/simplest/technique.rl.cf index 38a599befb1..a5552c96ad0 100644 --- a/rudder-lang/tests/test_files/tester/simplest/technique.rl.cf +++ b/rudder-lang/tests/test_files/tester/simplest/technique.rl.cf @@ -9,7 +9,7 @@ bundle agent simplest_technique "resources_dir" string => "${this.promise_dirname}/resources"; methods: "File absent_${report_data.directive_id}_0" usebundle => _method_reporting_context("File absent", "tmp"), - if => concat("debian"); + if => concat("debian_family"); "File absent_${report_data.directive_id}_0" usebundle => file_absent("tmp"), - if => concat("debian"); + if => concat("debian_family"); }