Skip to content

Commit f42f9ac

Browse files
committed
Merge pull request #2003 from ad2games/non-explicit-ca-info-config
Don't force explicit configuration of CA cert location
2 parents 59a7507 + f85f885 commit f42f9ac

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

modules/swagger-codegen/src/main/resources/ruby/api_client.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ module {{moduleName}}
7575
:ssl_verifypeer => @config.verify_ssl,
7676
:sslcert => @config.cert_file,
7777
:sslkey => @config.key_file,
78-
:cainfo => @config.ssl_ca_cert,
7978
:verbose => @config.debugging
8079
}
8180

81+
req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
82+
8283
if [:post, :patch, :put, :delete].include?(http_method)
8384
req_body = build_request_body(header_params, form_params, opts[:body])
8485
req_opts.update :body => req_body

samples/client/petstore/ruby/lib/petstore/api_client.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ def build_request(http_method, path, opts = {})
7575
:ssl_verifypeer => @config.verify_ssl,
7676
:sslcert => @config.cert_file,
7777
:sslkey => @config.key_file,
78-
:cainfo => @config.ssl_ca_cert,
7978
:verbose => @config.debugging
8079
}
8180

81+
req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
82+
8283
if [:post, :patch, :put, :delete].include?(http_method)
8384
req_body = build_request_body(header_params, form_params, opts[:body])
8485
req_opts.update :body => req_body

0 commit comments

Comments
 (0)