Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion DockerfileOldImage
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b

ARG RVM_VERSION=stable

# We must use JRuby9.2.20.0 to fix Read Would Block issue on GRIF-177
ARG JRUBY_VERSION=9.2.20.0

LABEL image_name="GDC LCM Bricks"
Expand Down Expand Up @@ -29,8 +31,12 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \
# Switch to a bash login shell to allow simple 'rvm' in RUN commands
SHELL ["/bin/bash", "-l", "-c"]

# Do NOT 'gem update --system' here. JRuby 9.2.20.0 ships RubyGems 3.1.6, which already
# satisfies bundler 2.3.27 (needs >= 2.5.2). Replacing it breaks the default-gem activation
# that jruby-openssl relies on to load its BouncyCastle jars, leaving OpenSSL with only its
# Java half (SSLContext without #set_params) - which kills every later HTTPS gem fetch.
RUN rvm install jruby-${JRUBY_VERSION} \
Comment thread
coderabbitai[bot] marked this conversation as resolved.
&& gem update --system 3.3.26 \
&& ruby -ropenssl -e 'raise "jruby-openssl Ruby layer not loaded" unless OpenSSL::SSL::SSLContext.method_defined?(:set_params)' \
&& gem install bundler -v 2.3.27 \
&& gem install rake -v 11.3.0

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.106
3.7.107
6 changes: 5 additions & 1 deletion lib/gooddata/rest/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def process_response(options = {}, &block)
merge_headers! response.headers
content_type = response.headers[:content_type]
return response if process == false
if content_type == 'application/json' || content_type == 'application/json;charset=UTF-8'
if content_type == 'application/json' || content_type == 'application/json;charset=UTF-8' || content_type_with_version(content_type)
result = response.to_str == '""' ? {} : MultiJson.load(response.to_str)
GoodData.rest_logger.debug "Request ID: #{response.headers[:x_gdc_request]} - Response: #{result.inspect}"
elsif ['text/plain;charset=UTF-8', 'text/plain; charset=UTF-8', 'text/plain'].include?(content_type)
Expand Down Expand Up @@ -647,6 +647,10 @@ def process_response(options = {}, &block)
result
end

def content_type_with_version(content_type)
!content_type.nil? && content_type.include?('application/json') && content_type.include?('version=')
end
Comment thread
coderabbitai[bot] marked this conversation as resolved.

def profile(method, path, request_id, stats_on, &block)
t1 = Time.now
res = block.call
Expand Down
Loading