add seconds as unit for timeout setting

Author: kart2bc

jobs/bbs/spec

@@ -103,13 +103,13 @@ properties:
     default: 200
   diego.bbs.sql.db_connection_timeout: 
     description: "Timeout in seconds for a db client to wait for a connection to be established"
-    default: "30s"
+    default: "30"
   diego.bbs.sql.db_read_timeout: 
     description: "Timeout in seconds for a db client to wait for data to be received from the server"
-    default: "600s"
+    default: "600"
   diego.bbs.sql.db_write_timeout: 
     description: "Timeout in seconds for a db client to wait for data to be sent to the server"
-    default: "600s"
+    default: "600"
   diego.bbs.sql.require_ssl:
     description: "Whether to require SSL for BBS communication to the SQL backend"
     default: false

spec/bbs_template_spec.rb

@@ -94,9 +94,9 @@
 
     describe 'Database timeout configurations' do 
       it 'includes db timeout settings when specified' do 
-        deployment_manifest_fragment['diego']['bbs']['sql']['db_connection_timeout'] = '30s'
-        deployment_manifest_fragment['diego']['bbs']['sql']['db_read_timeout'] = '60s'
-        deployment_manifest_fragment['diego']['bbs']['sql']['db_write_timeout'] = '45s'
+        deployment_manifest_fragment['diego']['bbs']['sql']['db_connection_timeout'] = '30'
+        deployment_manifest_fragment['diego']['bbs']['sql']['db_read_timeout'] = '60'
+        deployment_manifest_fragment['diego']['bbs']['sql']['db_write_timeout'] = '45'
         rendered_template_json = JSON.parse(rendered_template) 
         expect(rendered_template_json['db_connection_timeout']).to eq('30s') 
         expect(rendered_template_json['db_read_timeout']).to eq('60s')