Backport PR #13481 to 8.0: Fix: delegating from deprecated setting (#…

…13486)

logstash-core/lib/logstash/settings.rb

@@ -790,7 +790,7 @@ def value
 
       def validate_value
         # bypass deprecation warning
-        validate(wrapped.value) if set?
+        wrapped.validate_value if set?
       end
     end
 

logstash-core/spec/logstash/settings/setting_with_deprecated_alias_spec.rb

@@ -56,19 +56,45 @@
   end
 
   context "when only the deprecated alias is set" do
+
+    let(:value) { "crusty_value" }
+
     before(:each) do
-      settings.set(deprecated_setting_name, "crusty_value")
+      settings.set(deprecated_setting_name, value)
     end
 
     it 'resolves to the value provided for the deprecated alias' do
-      expect(settings.get(canonical_setting_name)).to eq("crusty_value")
+      expect(settings.get(canonical_setting_name)).to eq(value)
     end
 
     it 'logs a deprecation warning' do
       expect(LogStash::Settings.deprecation_logger).to have_received(:deprecated).with(a_string_including(deprecated_setting_name))
     end
 
     include_examples '#validate_value success'
+
+    it 'validates deprecated alias' do
+      expect { settings.get_setting(canonical_setting_name).deprecated_alias.validate_value }.to_not raise_error
+    end
+
+    context 'using a boolean setting' do
+
+      let(:value) { true }
+      let(:default_value) { false }
+
+      let(:canonical_setting) { LogStash::Setting::Boolean.new(canonical_setting_name, default_value, true) }
+
+      it 'resolves to the value provided for the deprecated alias' do
+        expect(settings.get(canonical_setting_name)).to eq(true)
+      end
+
+      include_examples '#validate_value success'
+
+      it 'validates deprecated alias' do
+        expect { settings.get_setting(canonical_setting_name).deprecated_alias.validate_value }.to_not raise_error
+      end
+
+    end
   end
 
   context "when only the canonical setting is set" do