gooddata 2.3.2-java → 2.3.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ddc9926aa4a0086f27e92a25d85009eb838775aa41cb1db0702f558a59e2ec
-  data.tar.gz: 0b21751001c9ed764f67c13e227dfc4a61459e8029d9defb1155ca56db2310f7
+  metadata.gz: 72ae4a4589edafb5e1b47e9fc62742f94f2b345507eca1db4d9ebad2e1ac6169
+  data.tar.gz: 27ced931546ce5d069e34457c9eb421b7728bffab2478ff90cc69545b9d792c7
 SHA512:
-  metadata.gz: b693d17a3198dfa61b50a92ee015283ffeccc8514f42aaee86dcbae0a90acff86edabb06c3e053125c195f806d02107152ab652f3c7c352e11cdcf56ee4eaa70
-  data.tar.gz: 34ebeeb6e70158403fd902c5c6f4b5eb926c1b1bd57f1fbac2c7a84e2de65b4edb480855e2bd8d426c8248285ef1b08dbf9450d8374f73d6fc0064fb5eddab32
+  metadata.gz: 6a815c2f8312242265fd0bfd91c3f79ffd941f10befa23c9ea342bcf9c4e7ffd891126191bcbadc07ff6b319add8aa58efdd34244d7b79bb612e938aa90701ee
+  data.tar.gz: c624292d7984a608c05e0d1944bb42bb92aeb082930500e465e919e0a0c81bde7d185fe09b44fc8616c7e3d27a6d46e0113d328dbec96e77fdf1395941657eaf

data/.gdc-ii-config.yaml

@@ -1,7 +1,7 @@
 microservices:
   lcm-bricks:
     docker:
-      dockerfile: './Dockerfile'
+      dockerfile: './DockerfileOldImage'
       # specifies whether promote image to M3 image tag when release LCM. Default always promote image. Don't remote
       # image when promoteImage configure false
       promoteImage: false

data/.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: jruby-9.4.1
+          ruby-version: jruby-9.4.12.1
           bundler-cache: true
       - uses: actions/setup-java@v4
         with:
@@ -41,7 +41,7 @@ jobs:
     needs: [jruby-gem-release, rubygems-release]
     strategy:
       matrix:
-        ruby-version: [3.2.1, jruby-9.4.1]
+        ruby-version: [3.2.1, jruby-9.4.12.1]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

data/.github/workflows/pre-merge.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        ruby-version: [2.5, 2.6, 2.7.6, 3.2.1, jruby-9.2.21, jruby-9.3.14, jruby-9.4.1]
+        ruby-version: [2.5, 2.6, 2.7.6, 3.2.1, jruby-9.2.21, jruby-9.3.14, jruby-9.4.12.1]
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # GoodData Ruby SDK Changelog
 
+## 2.3.3
+ - FEATURE: GRIF-312 Support Snowflake key paid authentication 
+
 ## 2.3.2
  - CONFIG: Support new version of activesupport library
 

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202501070635.05b6a77
 
 ARG RVM_VERSION=stable
-ARG JRUBY_VERSION=9.4.1.0
+ARG JRUBY_VERSION=9.4.12.1
 
 LABEL image_name="GDC LCM Bricks"
 LABEL maintainer="LCM <lcm@gooddata.com>"
@@ -9,7 +9,7 @@ LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
 LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202501070635.05b6a77"
 
 # which is required by RVM
-RUN yum install -y which patch make unzip gnupg git maven procps gzip \
+RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip \
     && yum clean all \
     && rm -rf /var/cache/yum
 

data/Dockerfile.jruby

@@ -1,4 +1,4 @@
-FROM jruby:9.4.1.0
+FROM jruby:9.4.12.1
 
 MAINTAINER Tomas Korcak <korczis@gmail.com>
 

data/DockerfileOldImage

@@ -0,0 +1,88 @@
+FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202501070635.05b6a77
+
+ARG RVM_VERSION=stable
+ARG JRUBY_VERSION=9.2.20.0
+
+LABEL image_name="GDC LCM Bricks"
+LABEL maintainer="LCM <lcm@gooddata.com>"
+LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
+LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202501070635.05b6a77"
+
+# which is required by RVM
+RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make git maven procps \
+    && yum clean all \
+    && rm -rf /var/cache/yum
+
+# Install + verify RVM with gpg (https://rvm.io/rvm/security)
+RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - \
+    && curl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import - \
+    && curl -sSL https://get.rvm.io | bash -s ${RVM_VERSION} \
+    && curl -sSL https://raw.githubusercontent.com/rvm/rvm/${RVM_VERSION}/binscripts/rvm-installer -o rvm-installer \
+    && curl -sSL https://raw.githubusercontent.com/rvm/rvm/${RVM_VERSION}/binscripts/rvm-installer.asc -o rvm-installer.asc \
+    && gpg2 --verify rvm-installer.asc rvm-installer \
+    && bash rvm-installer \
+    && rm rvm-installer rvm-installer.asc \
+    && echo "bundler" >> /usr/local/rvm/gemsets/global.gems \
+    && echo "rvm_silence_path_mismatch_check_flag=1" >> /etc/rvmrc \
+    && echo "install: --no-document" > /etc/gemrc
+
+# Switch to a bash login shell to allow simple 'rvm' in RUN commands
+SHELL ["/bin/bash", "-l", "-c"]
+
+RUN rvm install jruby-${JRUBY_VERSION} \
+    && gem update --system 3.3.26 \
+    && gem install bundler -v 2.3.27 \
+    && gem install rake -v 11.3.0
+
+WORKDIR /src
+
+RUN groupadd -g 48 apache \
+    && groupadd -g 65065 gdcshare \
+    && useradd -u 48 -m --no-log-init -r -g apache -G rvm apache \
+    && usermod -a -G gdcshare apache \
+    && chown apache: /src
+
+USER apache
+
+ADD ./bin ./bin
+ADD --chown=apache:apache ./ci ./ci
+ADD --chown=apache:apache ./lib ./lib
+ADD ./SDK_VERSION .
+ADD ./VERSION .
+ADD ./Gemfile .
+ADD ./gooddata.gemspec .
+
+#build redshift dependencies
+RUN mvn -f ci/redshift/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/redshift/target/*.jar ./lib/gooddata/cloud_resources/redshift/drivers/
+
+#build snowflake dependencies
+RUN mvn -f ci/snowflake/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/snowflake/target/*.jar ./lib/gooddata/cloud_resources/snowflake/drivers/
+
+#build bigquery dependencies
+RUN mvn -f ci/bigquery/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/bigquery/target/*.jar ./lib/gooddata/cloud_resources/bigquery/drivers/
+
+#build postgresql dependencies
+RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/
+
+#build mssql dependencies
+RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/
+
+#build mysql dependencies
+RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/
+
+RUN bundle install
+
+ARG GIT_COMMIT=unspecified
+ARG BRICKS_VERSION=unspecified
+LABEL git_commit=$GIT_COMMIT
+LABEL bricks_version=$BRICKS_VERSION
+
+ENV GOODDATA_RUBY_COMMIT=$GIT_COMMIT
+
+CMD [ "./bin/help.sh" ]

data/SDK_VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/VERSION

@@ -1 +1 @@
-3.7.80
+3.7.95

data/bin/provision.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export JRUBY_OPTS=-J-Xmx2560m
+export JRUBY_OPTS=-J-XX:MaxRAMPercentage=75
 
 /bin/bash -l -c "bundle exec ./bin/run_brick.rb provisioning_brick"

data/bin/release.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export JRUBY_OPTS=-J-Xmx2560m
+export JRUBY_OPTS=-J-XX:MaxRAMPercentage=75
 
 /bin/bash -l -c "bundle exec ./bin/run_brick.rb release_brick"

data/bin/rollout.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export JRUBY_OPTS=-J-Xmx2560m
+export JRUBY_OPTS=-J-XX:MaxRAMPercentage=75
 
 /bin/bash -l -c "bundle exec ./bin/run_brick.rb rollout_brick"

data/bin/user_filters.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export JRUBY_OPTS=-J-Xmx2560m
+export JRUBY_OPTS=-J-XX:MaxRAMPercentage=75
 
 /bin/bash -l -c "bundle exec ./bin/run_brick.rb user_filters_brick"

data/bin/users.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export JRUBY_OPTS=-J-Xmx2560m
+export JRUBY_OPTS=-J-XX:MaxRAMPercentage=75
 
 /bin/bash -l -c "bundle exec ./bin/run_brick.rb users_brick"

data/ci/snowflake/pom.xml

@@ -12,13 +12,23 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.19.0</version>
+            <version>3.24.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.80</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.80</version>
+        </dependency>
     </dependencies>
 
     <profiles>

data/gooddata.gemspec

@@ -27,16 +27,33 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   # s.add_development_dependency 'bundler', "~> 1.14"
   s.add_development_dependency 'license_finder', '~> 2.0'
-  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'redcarpet', '~> 3.1' if RUBY_PLATFORM != 'java'
-  s.add_development_dependency 'rspec', '~> 3.12.0'
-  s.add_development_dependency 'rspec-expectations', '~> 3.12'
-  s.add_development_dependency 'rspec_junit_formatter', '~> 0.6.0'
   if RUBY_VERSION >= '2.6'
+    s.add_development_dependency 'rake', '~> 13.0'
     s.add_development_dependency 'rubocop', '>= 1.28'
     s.add_development_dependency 'rubocop-ast', '>= 1.24.1', '<= 1.42.0'
+    s.add_development_dependency 'rspec', '~> 3.12.0'
+    s.add_development_dependency 'rspec-expectations', '~> 3.12'
+    s.add_development_dependency 'rspec_junit_formatter', '~> 0.6.0'
+
+    s.add_dependency 'azure-storage-blob', '~> 2.0'
+    s.add_dependency 'nokogiri', '~> 1', '>= 1.10.8'
+    s.add_dependency 'json_pure', '~> 2.6'
+    s.add_dependency 'restforce', '>= 2.4'
+    s.add_dependency 'rubyzip'
   else
+    s.add_development_dependency 'rake', '~> 11.1'
     s.add_development_dependency 'rubocop', '~> 0.81'
+    s.add_development_dependency 'rspec', '~> 3.5.0'
+    s.add_development_dependency 'rspec-expectations', '~> 3.5'
+    s.add_development_dependency 'rspec_junit_formatter', '~> 0.3.0'
+
+    s.add_dependency 'azure-storage-blob', '~> 1.1.0'
+    s.add_dependency 'nokogiri', '~> 1.10.0'
+    s.add_dependency 'json_pure', '~> 1.8'
+    s.add_dependency 'restforce', '>= 2.4', '< 4.0'
+    s.add_dependency 'rubyzip', '~> 1.2', '>= 1.2.1'
+    s.add_dependency 'unf', '~> 0.1.4'
   end
   s.add_development_dependency 'simplecov', '~> 0.12'
   s.add_development_dependency 'webmock', '~> 2.3.1'
@@ -75,21 +92,16 @@ Gem::Specification.new do |s|
   else
     s.add_dependency 'docile', '> 1.1', '< 1.4.0'
   end
-  s.add_dependency 'azure-storage-blob', '~> 2.0'
-  s.add_dependency 'nokogiri', '~> 1', '>= 1.10.8'
   s.add_dependency 'gli', '~> 2.15'
   s.add_dependency 'gooddata_datawarehouse', '~> 0.0.12' if RUBY_PLATFORM == 'java'
   s.add_dependency 'highline', '= 2.0.0.pre.develop.14'
-  s.add_dependency 'json_pure', '~> 2.6'
   s.add_dependency 'multi_json', '~> 1.12'
   s.add_dependency 'parseconfig', '~> 1.0'
   s.add_dependency 'path_expander', '< 1.1.2'
   s.add_dependency 'pmap', '~> 1.1'
   s.add_dependency 'sequel', '< 5.72.0'
   s.add_dependency 'remote_syslog_logger', '~> 1.0.3'
-  s.add_dependency 'restforce', '>= 2.4'
   s.add_dependency 'rest-client', '~> 2.0'
-  s.add_dependency 'rubyzip'
   s.add_dependency 'terminal-table', '~> 1.7'
   s.add_dependency 'thread_safe'
   s.add_dependency 'backports'

data/lib/gooddata/cloud_resources/snowflake/snowflake_client.rb

@@ -15,6 +15,14 @@ Dir.glob(base + 'drivers/*.jar').each do |file|
   require file unless file.start_with?('lcm-snowflake-driver')
 end
 
+java_import 'java.io.StringReader'
+java_import 'org.bouncycastle.openssl.PEMParser'
+java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
+java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
+java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
+java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
+java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
+
 module GoodData
   module CloudResources
     class SnowflakeClient < CloudResourceClient
@@ -75,11 +83,19 @@ module GoodData
         GoodData.logger.info "Setting up connection to Snowflake #{@url}"
 
         prop = java.util.Properties.new
-        prop.setProperty('user', @authentication['basic']['userName'])
-        prop.setProperty('password', @authentication['basic']['password'])
         prop.setProperty('schema', @schema)
         prop.setProperty('warehouse', @warehouse)
         prop.setProperty('db', @database)
+
+        if @authentication['keyPair']
+          prop.setProperty('user', @authentication['keyPair']['userName'])
+          private_key_str = build_private_key(@authentication['keyPair']['privateKey'], @authentication['keyPair']['passPhrase'])
+          prop.setProperty('private_key_base64', private_key_str)
+        else
+          prop.setProperty('user', @authentication['basic']['userName'])
+          prop.setProperty('password', @authentication['basic']['password'])
+        end
+
         # Add JDBC_QUERY_RESULT_FORMAT parameter to fix unsafe memory issue of Snowflake JDBC driver
         prop.setProperty('JDBC_QUERY_RESULT_FORMAT', 'JSON')
 
@@ -99,6 +115,42 @@ module GoodData
 
         url
       end
+
+      private
+
+      def build_private_key(private_key_string, pass_phrase)
+        java.security.Security.removeProvider("BC")
+        java.security.Security.addProvider(BouncyCastleProvider.new)
+
+        begin
+          pem_parser = PEMParser.new(StringReader.new(private_key_string))
+          pem_object = pem_parser.readObject
+
+          if pem_object.is_a?(PKCS8EncryptedPrivateKeyInfo)
+            builder = JceOpenSSLPKCS8DecryptorProviderBuilder.new
+            decryptor = builder.build(pass_phrase.to_java.to_char_array)
+            private_key_info = pem_object.decryptPrivateKeyInfo(decryptor)
+          elsif pem_object.is_a?(PrivateKeyInfo)
+            private_key_info = pem_object
+          end
+
+        ensure
+          pem_parser&.close
+        end
+
+        converter = JcaPEMKeyConverter.new
+        private_key = converter.getPrivateKey(private_key_info)
+        pem_str = convert_private_key(private_key)
+        java.util.Base64.getEncoder.encodeToString(pem_str.encode('UTF-8').bytes)
+      end
+
+      def convert_private_key(private_key)
+        pem = "-----BEGIN PRIVATE KEY-----\n"
+        encoder = java.util.Base64.getMimeEncoder(64, "\n".to_java_bytes)
+        base64 = encoder.encodeToString(private_key.getEncoded)
+        "#{pem}#{base64}\n-----END PRIVATE KEY-----"
+      end
+
     end
   end
 end

data/lib/gooddata/lcm/actions/import_object_collections.rb

@@ -29,6 +29,7 @@ module GoodData
         def call(params)
           results = []
 
+          GoodData.logger.info 'Starting ImportObjectCollections action'
           client = params.gdc_gd_client
           development_client = params.development_client
           number_of_threads = Integer(params.number_of_threads || '8')
@@ -45,7 +46,9 @@ module GoodData
               to_project = client.projects(pid) || fail("Invalid 'to' project specified - '#{pid}'")
 
               if transfer_uris.any?
+                logging_data(from, pid, transfer_uris, true)
                 from_project.partial_md_export(transfer_uris, project: to_project)
+                logging_data(from, pid, transfer_uris, false)
               end
 
               results << {
@@ -58,6 +61,20 @@ module GoodData
 
           results
         end
+
+        private
+
+        def logging_data(from_project, to_project, transfer_uris, start_action)
+          if start_action
+            # Logging to execution log
+            GoodData.logger.info "Starting import objects, from_project: #{from_project}, to_project: #{to_project}"
+            # Logging to Splunk log
+            GoodData.gd_logger.info "Starting import objects, action=objects_import, from_project=#{from_project}, to_project=#{to_project}, transfer_uris=#{transfer_uris}"
+          else
+            GoodData.logger.info "Success import objects, from_project: #{from_project}, to_project: #{to_project}"
+            GoodData.gd_logger.info "Success import objects, action=objects_import, from_project=#{from_project}, to_project=#{to_project}"
+          end
+        end
       end
     end
   end

data/lib/gooddata/lcm/actions/synchronize_clients.rb

@@ -50,6 +50,9 @@ module GoodData
 
         description 'Sync failed list'
         param :sync_failed_list, instance_of(Type::HashType), required: false
+
+        description 'Synchronize clients time limit'
+        param :sync_clients_timeout, instance_of(Type::StringType), required: false
       end
 
       RESULT_HEADER = [
@@ -61,6 +64,7 @@ module GoodData
 
       class << self
         def call(params)
+          GoodData.logger.info 'Starting SynchronizeClients action'
           client = params.gdc_gd_client
 
           domain_name = params.organization || params.domain
@@ -69,6 +73,8 @@ module GoodData
           data_product = params.data_product
           domain_segments = domain.segments(:all, data_product)
           keep_only_previous_masters_count = Integer(params.keep_only_previous_masters_count || "-1")
+          sync_clients_options = {}
+          sync_clients_options = sync_clients_options.merge(:time_limit => Integer(params.sync_clients_timeout)) if params.sync_clients_timeout
 
           segments = params.segments.map do |seg|
             domain_segments.find do |s|
@@ -91,7 +97,9 @@ module GoodData
             segment.master_project = master
             segment.save
 
-            res = segment.synchronize_clients
+            GoodData.logger.info "Starting synchronize clients for segment: '#{segment.segment_id}' with master workspace: '#{current_master[:master_project_id]}'"
+            res = segment.synchronize_clients(sync_clients_options)
+            GoodData.logger.info "Finish synchronize clients for segment: '#{segment.segment_id}'"
 
             sync_result = res.json['synchronizationResult']
             failed_count = sync_result['failedClients']['count']

data/lib/gooddata/lcm/actions/synchronize_etls_in_segment.rb

@@ -179,10 +179,10 @@ module GoodData
                 hidden_params_for_this_client_schedule_name = hidden_params_for_this_client[schedule_name]
 
                 schedule.update_params(schedule_additional_params) if schedule_additional_params
-                schedule.update_params(**params_for_all_schedules_in_all_projects) if params_for_all_schedules_in_all_projects
-                schedule.update_params(**params_for_all_projects_schedule_name) if params_for_all_projects_schedule_name
+                schedule.update_params(params_for_all_schedules_in_all_projects) if params_for_all_schedules_in_all_projects
+                schedule.update_params(params_for_all_projects_schedule_name) if params_for_all_projects_schedule_name
                 schedule.update_params(params_for_all_schedules_in_this_client) if params_for_all_schedules_in_this_client
-                schedule.update_params(**params_for_this_client_schedule_name) if params_for_this_client_schedule_name
+                schedule.update_params(params_for_this_client_schedule_name) if params_for_this_client_schedule_name
 
                 schedule.update_hidden_params(schedule_additional_hidden_params) if schedule_additional_hidden_params
                 schedule.update_hidden_params(hidden_params_for_all_schedules_in_all_projects) if hidden_params_for_all_schedules_in_all_projects

data/lib/gooddata/models/model.rb

@@ -166,7 +166,7 @@ module GoodData
 
         dir = Dir.mktmpdir
         begin
-          Zip::File.open("#{dir}/upload.zip", Zip::File::CREATE) do |zip|
+          Zip::File.open("#{dir}/upload.zip", create: true) do |zip|
             # TODO: make sure schema columns match CSV column names
             zip.get_output_stream('upload_info.json') { |f| f.puts JSON.pretty_generate(manifest) }
 

data/lib/gooddata/models/project.rb

@@ -1437,7 +1437,8 @@ module GoodData
       export_uri = "/gdc/md/#{pid}/maintenance/partialmdexport"
       GoodData.gd_logger.info("Project export action=objects_export, project_id=#{pid}, uri=#{export_uri}, export_status=start, export_objs=#{export_payload}") if GoodData.gd_logger
 
-      result = client.post(export_uri, export_payload)
+      # Export api will take time to finish So increasing timeout during calling the api
+      result = client.post(export_uri, export_payload, :timeout => 10)
       polling_url = result['partialMDArtifact']['status']['uri']
       token = result['partialMDArtifact']['token']
       GoodData.gd_logger.info("Project export action=objects_export, project_id=#{pid}, uri=#{polling_url}, export_status=polling") if GoodData.gd_logger

data/lib/gooddata/models/segment.rb

@@ -193,13 +193,14 @@ module GoodData
 
     # Runs async process that walks through segments and provisions projects if necessary.
     #
+    # @param options [Hash] Options
     # @return [Array] Returns array of results
-    def synchronize_clients
+    def synchronize_clients(options = {})
       sync_uri = SYNCHRONIZE_URI % [domain.obj_id, data_product.data_product_id, id]
       res = client.post sync_uri, nil
 
       # wait until the instance is created
-      res = client.poll_on_response(res['asyncTask']['links']['poll'], :sleep_interval => 1) do |r|
+      res = client.poll_on_response(res['asyncTask']['links']['poll'], options.merge(:sleep_interval => 1)) do |r|
         r['synchronizationResult'].nil?
       end
 

data/lib/gooddata/models/user_filters/user_filter_builder.rb

@@ -51,7 +51,7 @@ module GoodData
     end
 
     def self.read_file(file, options = {})
-      memo = Hash[]
+      memo = {}
       if row_based?(options)
         read_data_without_header(file, memo, options)
       else

data/lib/gooddata/rest/client.rb

@@ -25,7 +25,7 @@ module GoodData
       # Constants
       #################################
       DEFAULT_CONNECTION_IMPLEMENTATION = GoodData::Rest::Connection
-      DEFAULT_SLEEP_INTERVAL = 10
+      DEFAULT_SLEEP_INTERVAL = 10 # 10 seconds
       DEFAULT_POLL_TIME_LIMIT = 5 * 60 * 60 # 5 hours
 
       #################################
@@ -353,6 +353,11 @@ module GoodData
           end
           sleep retry_time
           retry_time *= GoodData::Rest::Connection::RETRY_TIME_COEFFICIENT
+          # Polling response will wait result from calling APIs. So don't need wait a long time for each polling
+          if retry_time > DEFAULT_SLEEP_INTERVAL
+            retry_time = DEFAULT_SLEEP_INTERVAL
+          end
+
           GoodData::Rest::Client.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { connection.refresh_token }) do
             response = get(link, process: process)
           end

data/lib/gooddata/rest/connection.rb

@@ -58,6 +58,8 @@ module GoodData
       RETRYABLE_ERRORS = [
         Net::HTTPBadResponse,
         RestClient::InternalServerError,
+        RestClient::Exceptions::OpenTimeout,
+        RestClient::Exceptions::ReadTimeout,
         RestClient::RequestTimeout,
         RestClient::MethodNotAllowed,
         SystemCallError,
@@ -110,30 +112,37 @@ module GoodData
             raise e unless options[:refresh_token]
             raise e if options[:dont_reauth]
 
+            logging_retry_error(e, retry_time)
             options[:refresh_token].call # (dont_reauth: true)
             if (retries -= 1) > 0
               retry
             else
-              process_retry_error(e, retry_time)
+              fail e
             end
           rescue RestClient::TooManyRequests, RestClient::ServiceUnavailable, *retry_exception => e
+            logging_retry_error(e, retry_time)
             sleep retry_time
+            if OpenSSL::SSL.const_defined?(:SSLErrorWaitReadable) && e.is_a?(OpenSSL::SSL::SSLErrorWaitReadable)
+              GoodData.gd_logger.warn "Refresh token status=start retry_time=#{retry_time}. Error: #{e.message}"
+              options[:refresh_token].call # (dont_reauth: true)
+              GoodData.gd_logger.warn "Refresh token status=success retry_time=#{retry_time}. Error: #{e.message}"
+            end
+
             # Total 10 retry requests with 1.5 coefficent should take ~ 2 mins to finish
             if (retries -= 1) > 0
               retry_time *= RETRY_TIME_COEFFICIENT
               retry
             else
-              process_retry_error(e, retry_time)
+              fail e
             end
           end
           yield
         end
 
-        def process_retry_error(e, retry_time)
+        def logging_retry_error(e, retry_time)
           error_message =  "#{e.message}, retrying in #{retry_time} seconds"
           GoodData.logger.warn error_message
           GoodData.gd_logger.warn error_message
-          fail e
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -13,7 +13,7 @@ authors:
 - Jakub Mahnert
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: license_finder
@@ -43,6 +43,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.28'
+- !ruby/object:Gem::Dependency
+  name: rubocop-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.42.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,39 +120,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: azure-storage-blob
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :development
+        version: 1.10.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
-  name: rubocop-ast
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.1
-    - - "<="
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.0
-  type: :development
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: restforce
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.1
-    - - "<="
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -301,40 +377,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: azure-storage-blob
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -377,20 +419,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0.pre.develop.14
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -475,20 +503,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: restforce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -503,20 +517,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -617,6 +617,7 @@ files:
 - Dockerfile
 - Dockerfile.jruby
 - Dockerfile.ruby
+- DockerfileOldImage
 - Gemfile
 - Guardfile
 - Jenkinsfile