Skip to content

Commit

Permalink
fixup! Fixes #17224: error about rudder-lang in logs
Browse files Browse the repository at this point in the history
  • Loading branch information
gpoblon committed Jun 12, 2020
1 parent e3a43d8 commit cd8fbf2
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 6 deletions.
2 changes: 1 addition & 1 deletion rudder-lang/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions rudder-lang/src/translate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ struct Technique {
version: String,
bundle_name: String,
parameter: Vec<Value>,
#[serde(default)]
bundle_args: Vec<String>,
method_calls: Vec<MethodCall>,
}

Expand Down
18 changes: 18 additions & 0 deletions rudder-lang/tests/test_files/tester/simplest/technique.cf.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
]
}
13 changes: 13 additions & 0 deletions rudder-lang/tests/test_files/tester/simplest/technique.cf.rl
Original file line number Diff line number Diff line change
@@ -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
}
15 changes: 15 additions & 0 deletions rudder-lang/tests/test_files/tester/simplest/technique.cf.rl.cf
Original file line number Diff line number Diff line change
@@ -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");
}
Original file line number Diff line number Diff line change
@@ -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"
]
}
]
}
3 changes: 2 additions & 1 deletion rudder-lang/tests/test_files/tester/simplest/technique.rl
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions rudder-lang/tests/test_files/tester/simplest/technique.rl.cf
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

0 comments on commit cd8fbf2

Please sign in to comment.