codeclimate-services 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b11c82863c3fe8d7abd190d5d8d1605232348a2
-  data.tar.gz: 7953aafa98f5ff37f3752d6bc0695b35a265a9d7
+  metadata.gz: 28a587b7b4dfdf431800b17380549e44b0f9c500
+  data.tar.gz: 65102446840ccaa599271b4875a9be8836c95934
 SHA512:
-  metadata.gz: 73330d3bf0e63289bdb9d40a884782ed6bff091bd455168ff9eb8865abe63f5746c4a7f5fc7506bfcaa41367eb0879d63d0c9db4bc83af33b5eb87504181e580
-  data.tar.gz: 0d3a6ba2497993ae7860e7c5772e827c9c48672e7717169459fae0f0c5dee971f320b3207d195ce791cd1d6f8d757d986c2545cb407eb0d1effcdfed1b1fa518
+  metadata.gz: 2a8d21f29a3a24b42f59c47f3edac13a1fdc25736249d58582b7dabf2d47484c36bed3c6d6b0166ecf5e1f26be3b7c763460d3ec1b132fbcd67669e7329afe1e
+  data.tar.gz: e7e3e23b0698d345fb32cf4bd545ca8f8370ee6de25bd8b64c228e5947c0d024beeb90935bbdf31171aa7d30590a0c233c1f87bab935ae041051c1222baf4602

data/lib/cc/service/http.rb

@@ -58,7 +58,10 @@ module CC::Service::HTTP
       CC::Service::SafeWebhook.ensure_safe!(url)
 
       http.send(method) do |req|
-        req.url(url) if url
+        if url
+          req.url(url)
+          req.options.proxy = http.proxy_from_env(url)
+        end
         req.headers.update(headers) if headers
         req.body = body if body
         block.call req if block

data/lib/cc/services/version.rb

@@ -1,5 +1,5 @@
 module CC
   module Services
-    VERSION = "1.10.0".freeze
+    VERSION = "1.10.1".freeze
   end
 end

data/spec/cc/service_spec.rb

@@ -75,4 +75,53 @@ describe CC::Service, type: :service do
 
     expect(services.include?(CC::PullRequests)).not_to eq(true)
   end
+
+  context "with proxy details" do
+    before do
+      @old_no_proxy = ENV["no_proxy"]
+      @old_http_proxy = ENV["http_proxy"]
+      ENV["no_proxy"] = "github.com"
+      ENV["http_proxy"] = "http://127.0.0.2:42"
+    end
+
+    after do
+      ENV["no_proxy"] = @old_no_proxy
+      ENV["http_proxy"] = @old_http_proxy
+    end
+
+    it "uses the proxy when it should" do
+      stub_http("http://proxied.test/my/test/url") do |env|
+        expect(env.request.proxy).to be_instance_of(Faraday::ProxyOptions)
+        expect(env.request.proxy.uri).to eq(URI.parse("http://127.0.0.2:42"))
+        [200, {}, '{"ok": true, "thing": "123"}']
+      end
+
+      response = service_post("http://proxied.test/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
+        body = JSON.parse(inner_response.body)
+        { thing: body["thing"] }
+      end
+
+      expect(response[:ok]).to eq(true)
+      expect(response[:params]).to eq('{"token":"1234"}')
+      expect(response[:endpoint_url]).to eq("http://proxied.test/my/test/url")
+      expect(response[:status]).to eq(200)
+    end
+
+    it "respects proxy exclusions" do
+      stub_http("http://github.com/my/test/url") do |env|
+        expect(env.request.proxy).to be_nil
+        [200, {}, '{"ok": true, "thing": "123"}']
+      end
+
+      response = service_post("http://github.com/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
+        body = JSON.parse(inner_response.body)
+        { thing: body["thing"] }
+      end
+
+      expect(response[:ok]).to eq(true)
+      expect(response[:params]).to eq('{"token":"1234"}')
+      expect(response[:endpoint_url]).to eq("http://github.com/my/test/url")
+      expect(response[:status]).to eq(200)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate-services
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Bryan Helmkamp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday