Merge pull request #61 from travis-ci/ha-feature-prefer-https

Put oauth_token only when config demands it
travis-ci · Feb 14, 2017 · 2fc79fa · 2fc79fa
2 parents 32dd13f + 557b033
commit 2fc79fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/travis/scheduler/serialize/worker.rb b/lib/travis/scheduler/serialize/worker.rb
@@ -11,7 +11,7 @@ class Worker < Struct.new(:job, :config)
         require 'travis/scheduler/serialize/worker/ssh_key'
 
         def data
-          {
+          value = {
             type: :test,
             vm_type: repo.vm_type,
             queue: job.queue,
@@ -23,8 +23,9 @@ def data
             ssh_key: ssh_key,
             timeouts: repo.timeouts,
             cache_settings: cache_settings,
-            oauth_token: github_oauth_token
           }
+          value[:oauth_token] = github_oauth_token if Travis.config.prefer_https?
+          value
         end
 
         private

diff --git a/spec/travis/scheduler/serialize/worker_spec.rb b/spec/travis/scheduler/serialize/worker_spec.rb
@@ -89,8 +89,7 @@ def encrypted(value)
           hard_limit: 180 * 60, # worker handles timeouts in seconds
           log_silence: 20 * 60
         },
-        cache_settings: s3,
-        oauth_token: 'token'
+        cache_settings: s3
       )
     end
 
@@ -246,8 +245,7 @@ def encrypted(value)
           hard_limit: 180 * 60, # worker handles timeouts in seconds
           log_silence: 20 * 60
         },
-        cache_settings: s3,
-        oauth_token: 'token'
+        cache_settings: s3
       )
     end