warden: Use string keys in unchecked hashes

Change-Id: I4056bea0bcbe673d030747ba25b3f168b81769ad

warden/Rakefile

@@ -26,10 +26,10 @@ namespace :warden do
     require "warden/server"
 
     if args[:config_path]
-      config = VCAP.symbolize_keys(YAML.load_file(args[:config_path]))
+      config = YAML.load_file(args["config_path"])
-      if config[:server] && config[:server][:container_klass]
+      if config["server"] && config["server"]["container_klass"]
-        klass = config[:server][:container_klass]
+        klass = config["server"]["container_klass"]
-        config[:server][:container_klass] = klass.split("::").inject(Kernel) do |prev, cur|
+        config["server"]["container_klass"] = klass.split("::").inject(Kernel) do |prev, cur|
           prev.const_get(cur)
         end
       end

warden/lib/warden/container/features/net.rb

@@ -73,19 +73,19 @@ module Warden
           def setup(config = {})
             super(config)
 
-            allow_networks = []
+            self.allow_networks = []
-            if config[:network]
+            if config["network"]
-              allow_networks = [config[:network][:allow_networks]].flatten.compact
+              self.allow_networks = [config["network"]["allow_networks"]].flatten.compact
             end
 
-            deny_networks = []
+            self.deny_networks = []
-            if config[:network]
+            if config["network"]
-              deny_networks = [config[:network][:deny_networks]].flatten.compact
+              self.deny_networks = [config["network"]["deny_networks"]].flatten.compact
             end
 
             sh *[ %{env},
-                  %{ALLOW_NETWORKS=%s} % allow_networks.join(" "),
+                  %{ALLOW_NETWORKS=%s} % self.allow_networks.join(" "),
-                  %{DENY_NETWORKS=%s} % deny_networks.join(" "),
+                  %{DENY_NETWORKS=%s} % self.deny_networks.join(" "),
                   %{%s/net.sh} % root_path,
                   %{setup} ]
 

warden/lib/warden/server.rb

@@ -61,11 +61,11 @@ module Warden
 
     def self.setup_server(config = nil)
       config ||= {}
-      @unix_domain_path = config.delete(:unix_domain_path) { default_unix_domain_path }
+      @unix_domain_path = config.delete("unix_domain_path") { default_unix_domain_path }
-      @unix_domain_permissions = config.delete(:unix_domain_permissions) { default_unix_domain_permissions }
+      @unix_domain_permissions = config.delete("unix_domain_permissions") { default_unix_domain_permissions }
-      @container_root = config.delete(:container_root) { default_container_root  }
+      @container_root = config.delete("container_root") { default_container_root  }
-      @container_klass = config.delete(:container_klass) { default_container_klass }
+      @container_klass = config.delete("container_klass") { default_container_klass }
-      @container_grace_time = config.delete(:container_grace_time) { default_container_grace_time }
+      @container_grace_time = config.delete("container_grace_time") { default_container_grace_time }
     end
 
     def self.setup_logger(config = nil)
@@ -75,17 +75,17 @@ module Warden
 
     def self.setup_network(config = nil)
       config ||= {}
-      network_start_address = Network::Address.new(config[:pool_start_address] || "10.254.0.0")
+      network_start_address = Network::Address.new(config["pool_start_address"] || "10.254.0.0")
-      network_size = config[:pool_size] || 64
+      network_size = config["pool_size"] || 64
       network_pool = Pool::NetworkPool.new(network_start_address, network_size)
       container_klass.network_pool = network_pool
     end
 
     def self.setup(config = {})
       @config = config
-      setup_server config[:server]
+      setup_server config["server"]
-      setup_logger config[:logging]
+      setup_logger config["logging"]
-      setup_network config[:network]
+      setup_network config["network"]
     end
 
     def self.run!

warden/spec/container/base_spec.rb

@@ -275,7 +275,7 @@ describe Warden::Container::Base do
     context "when nil" do
 
       it "should not fire" do
-        @container = initialize_container(new_connection, :grace_time => nil)
+        @container = initialize_container(new_connection, "grace_time" => nil)
 
         em do
           @container.should_not_receive(:fire_grace_timer)
@@ -289,7 +289,7 @@ describe Warden::Container::Base do
     context "when not nil" do
 
       before(:each) do
-        @container = initialize_container(new_connection, :grace_time => 0.02)
+        @container = initialize_container(new_connection, "grace_time" => 0.02)
       end
 
       it "should fire after grace time" do

warden/spec/spec_helper.rb

@@ -49,9 +49,9 @@ RSpec.configure do |config|
   config.before(:each) do
     config = {
       # Run every logging statement, but discard output
-      :logging => {
+      "logging" => {
-        :level => :debug2,
+        "level" => "debug2",
-        :file  => '/dev/null',
+        "file"  => '/dev/null',
       },
     }
     Warden::Server.setup(config)

warden/spec/support/warden_server.rb

@@ -32,19 +32,19 @@ shared_context :warden_server do
       Signal.trap("TERM") { exit }
 
       Warden::Server.setup \
-        :server => {
+        "server" => {
-          :unix_domain_path => unix_domain_path,
+          "unix_domain_path" => unix_domain_path,
-          :container_root => container_root,
+          "container_root" => container_root,
-          :container_klass => container_klass,
+          "container_klass" => container_klass,
-          :container_grace_time => 1 },
+          "container_grace_time" => 1 },
-        :network => {
+        "network" => {
-          :pool_start_address => start_address,
+          "pool_start_address" => start_address,
-          :pool_size => 64,
+          "pool_size" => 64,
-          :allow_networks => "4.2.2.3/32",
+          "allow_networks" => "4.2.2.3/32",
-          :deny_networks => "4.2.2.0/24" },
+          "deny_networks" => "4.2.2.0/24" },
-        :logging => {
+        "logging" => {
-          :level => :debug,
+          "level" => "debug",
-          :file => File.expand_path("../../../tmp/warden.log", __FILE__) }
+          "file" => File.expand_path("../../../tmp/warden.log", __FILE__) }
 
       colored_test_name = "\033[37;1m%s\033[0m" % example.metadata[:full_description]
       Warden::Logger.logger.info colored_test_name