fix #575 Downgrade restore of vars

voxpupuli · Jul 13, 2019 · 2ddfaa6 · 2ddfaa6
1 parent ce1e783
commit 2ddfaa6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/lib/puppet_x/icinga2/utils.rb b/lib/puppet_x/icinga2/utils.rb
@@ -324,9 +324,8 @@ def self.process_hash(attrs, indent=2, level=3, prefix=' '*indent)
                 end
               end
             else
-              if value =~ /^\+\s+/
-                config += "%s%s += %s\n" % [ ' ' * indent, attr, value.sub(/^\+\s+/, '') ]
-              end
+              op = '+' if value =~ /^\+\s+/
+              config += "%s%s #{op}= %s\n" % [ ' ' * indent, attr, parse(value.sub(/^\+\s+/, '')) ]
             end
           else
             if value.is_a?(Hash)

diff --git a/spec/functions/attributes_spec.rb b/spec/functions/attributes_spec.rb
@@ -460,19 +460,24 @@
   end
 
 
-  # vars = +config1
   it 'assign multiple custom attributes' do
+    # vars += config1
     is_expected.to run.with_params({
       'vars' => '+ config',
-    }).and_return("vars += config\n")
-
-  # vars += config1
-  # vars += {}
-  # vars.foo = "some string"
-  # vars.bar += [ 42, 3.141, -42, -3.141, ]
-  # vars.baz["number"] -= 42
-  # vars.baz["floating"] += 3.141
-  # vars += config2
+    }, 0, ['config']).and_return("vars += config\n")
+
+    # vars = vars + config1
+    is_expected.to run.with_params({
+      'vars' => 'vars + config',
+    }, 0, ['vars','config']).and_return("vars = vars + config\n")
+
+    # vars += config1
+    # vars += {}
+    # vars.foo = "some string"
+    # vars.bar += [ 42, 3.141, -42, -3.141, ]
+    # vars.baz["number"] -= 42
+    # vars.baz["floating"] += 3.141
+    # vars += config2
     is_expected.to run.with_params({
       'vars' => [
         '+ config1',