Merge "sanitize pass but not sanitize 'mysql' for varz" into services…

…-r11
cloudfoundry-attic · Apr 26, 2012 · 2bae26e · 2bae26e
2 parents 349f417 + 627fa3e
commit 2bae26e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/common/lib/vcap/component.rb b/common/lib/vcap/component.rb
@@ -45,7 +45,7 @@ def call(env)
   class Component
 
     # We will suppress these from normal varz reporting by default.
-    CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :mysql, :password])
+    CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass])
 
     class << self
 

diff --git a/common/spec/functional/component_spec.rb b/common/spec/functional/component_spec.rb
@@ -65,8 +65,8 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' }
         }
         VCAP::Component.register(options)
@@ -81,10 +81,10 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :test => 'ok'}
         }
         VCAP::Component.register(options)
         done
@@ -98,20 +98,22 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
+          :mysql => { :user => 'derek', :password => 'sekret!', :pass => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
         }
         VCAP::Component.register(options)
 
         options.should include(:config => {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
+          :mysql => { :user => 'derek', :password => 'sekret!', :pass => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
         })
         done
       end