split host and scheme config.

4 files changed, 24 insertions, 14 deletions

diff --git a/lib/ats/amp4e/api.rb b/lib/ats/amp4e/api.rb
index 4bdaefb..9495a8d 100644
--- a/lib/ats/amp4e/api.rb
+++ b/lib/ats/amp4e/api.rb
@@ -44,19 +44,23 @@ module ATS
       private
 
       def build_uri(relative_url, version:)
-        URI.parse("#{api_host}/v#{version}/#{relative_url}")
+        URI::Generic.build(host: host, scheme: scheme, path: "/v#{version}/#{relative_url}")
       end
 
       def client_id
-        configuration[profile]['amp4e']['client_id']
+        configuration[profile][:amp4e][:client_id]
       end
 
       def client_secret
-        configuration[profile]['amp4e']['client_secret']
+        configuration[profile][:amp4e][:client_secret]
       end
 
-      def api_host
-        configuration[profile]['amp4e']['api_host']
+      def host
+        configuration[profile][:amp4e][:host]
+      end
+
+      def scheme
+        configuration[profile][:amp4e][:scheme]
       end
 
       def headers
diff --git a/lib/ats/cli.rb b/lib/ats/cli.rb
index 0a39d1a..86d807d 100644
--- a/lib/ats/cli.rb
+++ b/lib/ats/cli.rb
@@ -43,13 +43,15 @@ module ATS
         yaml = YAML.dump({
           default: {
             amp4e: {
-              api_host: 'https://api.amp.cisco.com',
               client_id: '',
               client_secret: '',
+              host: 'api.amp.cisco.com',
+              scheme: 'https',
             },
             threat_grid: {
-              api_host: 'https://example.com',
-              api_key: 'secret'
+              api_key: '',
+              host: 'panacea.threatgrid.com',
+              scheme: 'https',
             },
           }
         })
diff --git a/lib/ats/configuration.rb b/lib/ats/configuration.rb
index 66ebe27..9b86545 100644
--- a/lib/ats/configuration.rb
+++ b/lib/ats/configuration.rb
@@ -15,7 +15,7 @@ module ATS
     end
 
     def [](key)
-      @configuration[key]
+      @configuration[key.to_sym]
     end
 
     def load_configuration(files = config_files)
diff --git a/lib/ats/threat_grid/api.rb b/lib/ats/threat_grid/api.rb
index 474b547..160f797 100644
--- a/lib/ats/threat_grid/api.rb
+++ b/lib/ats/threat_grid/api.rb
@@ -16,7 +16,7 @@ module ATS
         configuration: ATS.configuration
       )
         @http = api
-        @profile = profile.to_s
+        @profile = profile.to_sym
         @configuration = configuration
       end
 
@@ -53,15 +53,19 @@ module ATS
       end
 
       def build_uri(relative_url, version:)
-        URI.parse("#{api_host}/api/v#{version}/#{relative_url}")
+        URI::Generic.build(host: host, scheme: scheme, path: "/api/v#{version}/#{relative_url}")
       end
 
       def api_key
-        configuration[profile]['threat_grid']['api_key']
+        configuration[profile][:threat_grid][:api_key]
       end
 
-      def api_host
-        configuration[profile]['threat_grid']['api_host']
+      def host
+        configuration[profile][:threat_grid][:host]
+      end
+
+      def scheme
+        configuration[profile][:threat_grid][:scheme]
       end
     end
   end