gooddata 2.0.0-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd55acee57a6b34e84f26e00ef644f3d4315b1440d97c25bf98d9d85b172afee
-  data.tar.gz: bce2fb11bada9f728c0ebde2416270ab83ecb7622ab1b34ad08c42d2f564864c
+  metadata.gz: 28bd0cc29052ece07bb8eb9abfa0e1034bfa78da004bfd439832274c662faecc
+  data.tar.gz: b383f1201f65f1e58aa94148a783481825b40fb093bf17bc17eaf4ae88df490b
 SHA512:
-  metadata.gz: a1efa783034e1d21cabfa3c9e04de178083e8b7ccc21fd1e77eab4d93bb8d2d84c52dc5fe7512e6e0c1d17b109768b41fcb6ffb01e733793d100445358e6f23c
-  data.tar.gz: 92df93195c2328f1a58653b0f81d98424a8769bed933a462785a509ad87c335d7e550ca6513d0f234adcaf05fc83de17d4d0659a7112c4598bf1de7a1e17e20a
+  metadata.gz: 9fce66e49b9823b0e2301bd6c29453b47522ce7ebaf234fd34f48c4245e5aeeab8ba201a4e629628a2e9364f668345f91e1f348c64792d7b87f1494726b66614
+  data.tar.gz: 94a17567a2dea77d431abd89c7ce7cd1754f08bbe847f87621eb0a5eb838b08ce7021ea12ca7b1240ea71f53b025386aa6e3a9a5d8294c9c5dd3a9ed8c6c45c0

data/.gdc-ii-config.yaml

@@ -0,0 +1,17 @@
+microservices:
+  lcm-bricks:
+    docker:
+      dockerfile: './Dockerfile'
+      argumentsFromFiles:
+        BRICKS_VERSION: 'VERSION'
+
+integratedTests:
+  - env: bash
+    path: .
+    vault:
+      GD_SPEC_PASSWORD: secret/v1/ruby/test/bia_encryption_key
+    command: ./bin/run_smoke_tests.sh
+    image: harbor.intgdc.com/staging/lcm-bricks:GIT_REV
+    repo_mount_dir: /src
+    microservices:
+      - lcm-bricks

data/.travis.yml

@@ -20,41 +20,41 @@ jobs:
     stage: before-merge
     script: |
       git remote add upstream https://github.com/gooddata/gooddata-ruby.git
-      git fetch upstream master
-      bundle exec pronto run -c upstream/master --exit-code
-
-  # - name: unit tests
-  #   stage: before-merge
-  #   script: bundle exec rake test:unit
-  #   rvm:
-  #   - 2.2
-  #   - 2.3
-  #   - 2.4
-  #   - 2.5
-  #   - jruby-1.7.19
-  #   - jruby-9.1.5
-  #   - jruby-9.1.7
-  #   - jruby-9.1.14
-  #
-  # - name: sdk integration (vcr) tests - base
-  #   stage: before-merge
-  #   script: bundle exec rake test:sdk
-  #   env: VCR_RECORD_MODE=none
-  #   rvm: 2.3
-  #
-  # - name: sdk integration (vcr) tests - project
-  #   stage: before-merge
-  #   script: bundle exec rake test:project
-  #   env: VCR_RECORD_MODE=none
-  #   rvm: 2.3
-  #
-  # - name: lcm integration (vcr) tests - e2e
-  #   stage: before-merge
-  #   script: bundle exec rspec spec/lcm/integration/lcm_end_to_end_spec.rb
-  #   env:
-  #   - VCR_RECORD_MODE=none
-  #   - GD_ENV=development
-  #   rvm: 2.3
+      git fetch upstream develop
+      bundle exec pronto run -c upstream/develop --exit-code
+
+  - name: unit tests
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm:
+    - 2.2
+    - 2.3
+    - 2.4
+    - 2.5
+    - jruby-1.7.19
+    - jruby-9.1.5
+    - jruby-9.1.7
+    - jruby-9.1.14
+
+  - name: sdk integration (vcr) tests - base
+    stage: before-merge
+    script: bundle exec rake test:sdk
+    env: VCR_RECORD_MODE=none
+    rvm: 2.3
+
+  - name: sdk integration (vcr) tests - project
+    stage: before-merge
+    script: bundle exec rake test:project
+    env: VCR_RECORD_MODE=none
+    rvm: 2.3
+
+  - name: lcm integration (vcr) tests - e2e
+    stage: before-merge
+    script: bundle exec rspec spec/lcm/integration/lcm_end_to_end_spec.rb
+    env:
+    - VCR_RECORD_MODE=none
+    - GD_ENV=development
+    rvm: 2.3
 
   #  AFTER MERGE
   #  staging 1
@@ -200,10 +200,20 @@ jobs:
   - stage: gem-release
     name: deploy JRuby gem
     rvm: jruby-9.1.14
-    script:
-      - 'echo -e "---\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials'
-      - chmod 0600 ~/.gem/credentials
-      - bundle exec rake gem:release
+    script: |
+      echo -e "---\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+      chmod 0600 ~/.gem/credentials
+      bundle exec rake gem:release
+  - &gem-smoke-test
+    stage: gem-release
+    name: smoke test MRI gem
+    rvm: 2.3
+    script: |
+      gem install gooddata
+      ruby -e "require 'gooddata';GoodData.version"
+  - <<: *gem-smoke-test
+    name: smoke test JRuby gem
+    rvm: jruby-9.1.14
 
 notifications:
   email:

data/CHANGELOG.md

@@ -1,4 +1,18 @@
 # GoodData Ruby SDK Changelog
+## 2.0.1
+ - Fix pronto branch
+ - Fix requiring version.rb
+ - TMA-693 fixed problem with logout after timeout
+ - fixup! TMA-807: splunk in k8s
+ - Revert "Revert "TMA-807: splunkLogger in bricks forwards messages to RemoteSyslogLogger""
+ - TMA-807: splunk in k8s
+ - Deploy jruby gem automatically
+ - Fix code style issue
+ - Revert "Fix splunk test"
+ - Revert "TMA-807: splunkLogger in bricks forwards messages to RemoteSyslogLogger"
+ - Fix splunk test
+ - TMA-807: splunkLogger in bricks forwards messages to RemoteSyslogLogger
+
 ## 2.0.0
 
 This is a major version release because the method `.release_info` has been hard-deprecated.

data/Jenkinsfile

@@ -5,17 +5,4 @@
 @Library('pipelines-shared-libs')
 import com.gooddata.pipeline.Pipeline
 
-def config = [
-        'microservices': [
-                'lcm-bricks': [
-                        'docker': [
-                                'dockerfile': './Dockerfile',
-                                'arguments': [
-                                        'BRICKS_VERSION': { readFile('./VERSION').trim() }
-                                ]
-                        ]
-                ]
-        ]
-]
-
-Pipeline.get(this, config).run()
+Pipeline.resolve(this).run()

data/SDK_VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/bin/run_brick.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'remote_syslog_logger'
 require_relative '../lib/gooddata'
 
 DEFAULT_BRICK = 'hello_world_brick'
@@ -9,34 +8,19 @@ HIDDEN_BRICK_PARAMS_PREFIX = 'HIDDEN_BRICK_PARAM_'
 
 brick_type = !ARGV.empty? ? ARGV[0] : DEFAULT_BRICK
 
-syslog_node = ENV['NODE_NAME']
-log = RemoteSyslogLogger.new(syslog_node, 514, :program => "ruby_#{brick_type}", :facility => 'local2')
-
-log.info "action=#{brick_type}_execution status=init"
-
 def get_brick_params(prefix)
   ENV.select { |k,| k.to_s.match(/^#{prefix}.*/) }.map { |k, v| [k.slice(prefix.length..-1), v] }.to_h
 end
 
-begin
-  brick_pipeline = GoodData::Bricks::Pipeline.send("#{brick_type}_pipeline")
-  normal_params = get_brick_params(BRICK_PARAM_PREFIX)
-  hidden_params = get_brick_params(HIDDEN_BRICK_PARAMS_PREFIX)
-  params = normal_params.merge(hidden_params)
-
-  params['values_to_mask'] = hidden_params.values
-  commit_hash = ENV['GOODDATA_RUBY_COMMIT'] || ''
-  execution_id = ENV['GDC_EXECUTION_ID']
-  params['gooddata_ruby_commit'] = commit_hash
-  params['GDC_LOG_DIRECTORY'] = ENV['GDC_LOG_DIRECTORY'] || '/tmp/'
-  params['GDC_EXECUTION_ID'] = execution_id
-  log.info "action=#{brick_type}_execution status=start commit_hash=#{commit_hash} execution_id=#{execution_id}"
-  @brick_result = brick_pipeline.call(params)
-  log.info "action=#{brick_type}_execution status=finished"
-rescue NoMethodError => e
-  log.info "action=#{brick_type}_execution status=error Invalid brick type '#{brick_type}', #{e.message}"
-  raise e
-rescue StandardError => e
-  log.info "action=#{brick_type}_execution status=error #{e.message}"
-  raise e
-end
+brick_pipeline = GoodData::Bricks::Pipeline.send("#{brick_type}_pipeline")
+normal_params = get_brick_params(BRICK_PARAM_PREFIX)
+hidden_params = get_brick_params(HIDDEN_BRICK_PARAMS_PREFIX)
+params = normal_params.merge(hidden_params)
+
+params['values_to_mask'] = hidden_params.values
+commit_hash = ENV['GOODDATA_RUBY_COMMIT'] || ''
+execution_id = ENV['GDC_EXECUTION_ID']
+params['gooddata_ruby_commit'] = commit_hash
+params['GDC_LOG_DIRECTORY'] = ENV['GDC_LOG_DIRECTORY'] || '/tmp/'
+params['GDC_EXECUTION_ID'] = execution_id
+brick_pipeline.call(params)

data/bin/run_smoke_tests.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export LCM_BRICKS_IMAGE_TAG=$GOODDATA_RUBY_COMMIT
+/bin/bash -l -c ". /usr/local/rvm/scripts/rvm && bundle exec rake -f lcm.rake test:smoke"

data/lib/gooddata/bricks/middleware/context_manager.rb

@@ -4,6 +4,7 @@
 
 require_relative '../../mixins/property_accessor'
 require_relative '../../lcm/helpers/helpers'
+require_relative '../../version'
 
 module GoodData
   module ContextManager

data/lib/gooddata/bricks/middleware/logger_middleware.rb

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'logger'
-require 'gooddata/core/splunk_logger'
+require 'gooddata/core/splunk_logger_decorator'
 
 require 'gooddata/extensions/true'
 require 'gooddata/extensions/false'
@@ -13,6 +13,8 @@ require 'gooddata/extensions/integer'
 require 'gooddata/extensions/string'
 require 'gooddata/extensions/nil'
 
+require 'remote_syslog_logger'
+
 using TrueExtensions
 using FalseExtensions
 using IntegerExtensions
@@ -47,20 +49,20 @@ module GoodData
         params['GDC_LOGGER'] = logger
         GoodData.logging_http_on if params['HTTP_LOGGING'] && params['HTTP_LOGGING'].to_b
 
-        # Initialize splunk logger
-        if params['SPLUNK_LOGGING'] && params['SPLUNK_LOGGING'].to_b
+        unless params['NO_SPLUNK_LOGGING'] && params['NO_SPLUNK_LOGGING'].to_b
           GoodData.logger.info "Statistics collecting is turned ON. All the data is anonymous."
-          splunk_logger = SplunkLogger.new params['SPLUNK_LOG_PATH'] || GoodData::DEFAULT_SPLUNKLOG_OUTPUT
+          # NODE_NAME is set up by k8s execmgr
+          syslog_node = ENV['NODE_NAME']
+          splunk_file_logger = syslog_node ? RemoteSyslogLogger.new(syslog_node, 514, program: "lcm_ruby_brick", facility: 'local2') : Logger.new(STDOUT)
+          splunk_logger = SplunkLoggerDecorator.new splunk_file_logger
           splunk_logger.level = params['SPLUNK_LOG_LEVEL'] || GoodData::DEFAULT_SPLUNKLOG_LEVEL
           splunk_logger = splunk_logger.extend(ContextLoggerDecorator)
           splunk_logger.context_source = GoodData.gd_logger
           values_to_mask = params['values_to_mask'] || []
           values_to_mask.concat MaskLoggerDecorator.extract_values params
           splunk_logger = MaskLoggerDecorator.new(splunk_logger, values_to_mask) if values_to_mask.any?
-        else
-          splunk_logger = NilLogger.new
+          GoodData.splunk_logging_on splunk_logger
         end
-        GoodData.splunk_logging_on splunk_logger
 
         # Initialize context: Execution ID
         GoodData.gd_logger.execution_id = params['GDC_EXECUTION_ID'] || SecureRandom.urlsafe_base64(16)

data/lib/gooddata/connection.rb

@@ -42,12 +42,9 @@ module GoodData
       Rest::Client.disconnect
     end
 
-    def with_connection(options = nil, second_options = nil, third_options = {}, &bl)
-      connection = connect(options, second_options, third_options)
-      bl.call(connection)
-    rescue Exception => e # rubocop:disable RescueException
-      GoodData.logger.error(e.message)
-      raise e
+    def with_connection(options = nil, second_options = nil, third_options = {}, &block)
+      client = connect(options, second_options, third_options)
+      block.call(client)
     ensure
       disconnect
     end

data/lib/gooddata/core/logging.rb

@@ -7,7 +7,7 @@
 require 'rest-client'
 
 require_relative 'nil_logger'
-require_relative 'splunk_logger'
+require_relative 'splunk_logger_decorator'
 require_relative 'gd_logger'
 
 module GoodData
@@ -21,7 +21,6 @@ module GoodData
 
   DEFAULT_SPLUNKLOG_LEVEL = Logger::INFO
   DEFAULT_SPLUNKLOG_OUTPUT = STDERR
-  DEFAULT_SPLUNKLOGGER_CLASS = SplunkLogger
 
   class << self
     attr_accessor :logger, :rest_logger, :gd_logger
@@ -46,12 +45,6 @@ module GoodData
       @logger
     end
 
-    # Turn logging on
-    #
-    # ### Example
-    #
-    #     GoodData.logging_off
-    #
     def logging_off
       @logger = NilLogger.new
     end
@@ -60,24 +53,12 @@ module GoodData
       !@logger.instance_of?(NilLogger)
     end
 
-    # Turn logging on with HTTP included
-    #
-    # ### Example
-    #
-    #     GoodData.logging_http_on
-    #
     def logging_http_on(level = DEFAULT_RESTLOG_LEVEL, output = DEFAULT_RESTLOG_OUTPUT, klass = DEFAULT_RESTLOGGER_CLASS)
       @rest_logger = klass.new(output)
       @rest_logger.level = level
       @rest_logger
     end
 
-    # Turn logging on
-    #
-    # ### Example
-    #
-    #     GoodData.logging_http_off
-    #
     def logging_http_off
       @rest_logger = NilLogger.new
     end
@@ -86,17 +67,10 @@ module GoodData
       !@rest_logger.instance_of?(NilLogger)
     end
 
-    # Turn splunk logging on
     def splunk_logging_on(logger)
       gd_logger.logging_on :splunk, logger
     end
 
-    # Turn splunk logging off
-    #
-    # ### Example
-    #
-    #     GoodData.logging_splunk_off
-    #
     def splunk_logging_off
       gd_logger.logging_off :splunk
     end

data/lib/gooddata/core/{splunk_logger.rb → splunk_logger_decorator.rb}

@@ -6,7 +6,11 @@ require 'logger'
 
 module GoodData
   # Logger that process given message to format readable by splunk
-  class SplunkLogger < Logger
+  class SplunkLoggerDecorator < Logger
+    def initialize(logger = Logger)
+      @logger = logger
+    end
+
     def hash_to_string(hash)
       hash.map { |pair| " #{pair[0]}=#{pair[1]}" }.join ""
     end
@@ -17,7 +21,7 @@ module GoodData
     def add(severity, message = nil, progname = nil)
       message = hash_to_string(message) if message.is_a? Hash
       progname = hash_to_string(progname) if progname.is_a? Hash
-      super(severity, message, progname) unless (progname && progname.include?("\n")) || (message && message.include?("\n"))
+      @logger.add(severity, message, progname) unless (progname && progname.chomp == '') || (message && message.chomp == '')
     end
   end
 end

data/lib/gooddata/helpers/global_helpers.rb

@@ -33,7 +33,7 @@ module GoodData
       include Hashie::Extensions::DeepMerge
     end
 
-    set_const :GD_MAX_RETRY, (ENV['GD_MAX_RETRY'] && ENV['GD_MAX_RETRY'].to_i) || 3
+    set_const :GD_MAX_RETRY, (ENV['GD_MAX_RETRY'] && ENV['GD_MAX_RETRY'].to_i) || 12
 
     class << self
       def error(msg)

data/lib/gooddata/lcm/lcm2.rb

@@ -369,7 +369,7 @@ module GoodData
       def run_action(action, params)
         begin
           GoodData.gd_logger.start_action action, GoodData.gd_logger
-          GoodData.logger.info("Running #{action.name} action ...")
+          GoodData.gd_logger.info("Running #{action.name} action ...")
           params.clear_filters
           # Check if all required parameters were passed
           BaseAction.check_params(action.const_get('PARAMS'), params)

data/lib/gooddata/rest/connection.rb

@@ -57,7 +57,6 @@ module GoodData
         Timeout::Error
       ]
 
-      RETRIES_ON_TOO_MANY_REQUESTS_ERROR = 12
       RETRY_TIME_INITIAL_VALUE = 1
       RETRY_TIME_COEFFICIENT = 1.5
       RETRYABLE_ERRORS << Net::ReadTimeout if Net.const_defined?(:ReadTimeout)
@@ -86,11 +85,10 @@ module GoodData
 
         # Retry block if exception thrown
         def retryable(options = {}, &_block)
-          opts = { :tries => 1, :on => RETRYABLE_ERRORS }.merge(options)
+          opts = { :tries => 12, :on => RETRYABLE_ERRORS }.merge(options)
 
           retry_exception = opts[:on]
           retries = opts[:tries]
-          too_many_requests_tries = RETRIES_ON_TOO_MANY_REQUESTS_ERROR
 
           unless retry_exception.is_a?(Array)
             retry_exception = [retry_exception]
@@ -102,17 +100,23 @@ module GoodData
           rescue RestClient::Unauthorized, RestClient::Forbidden => e # , RestClient::Unauthorized => e
             raise e unless options[:refresh_token]
             raise e if options[:dont_reauth]
+
             options[:refresh_token].call # (dont_reauth: true)
-            retry if (retries -= 1) > 0
-          rescue RestClient::TooManyRequests, RestClient::ServiceUnavailable
-            GoodData.logger.warn "Too many requests, retrying in #{retry_time} seconds"
+            if (retries -= 1) > 0
+              retry
+            else
+              fail e
+            end
+          rescue RestClient::TooManyRequests, RestClient::ServiceUnavailable, *retry_exception => e
+            GoodData.logger.warn "#{e.message}, retrying in #{retry_time} seconds"
             sleep retry_time
             retry_time *= RETRY_TIME_COEFFICIENT
             # 10 requests with 1.5 coefficent should take ~ 3 mins to finish
-            retry if (too_many_requests_tries -= 1) > 1
-          rescue *retry_exception => e
-            GoodData.logger.warn e.inspect
-            retry if (retries -= 1) > 1
+            if (retries -= 1) > 0
+              retry
+            else
+              fail e
+            end
           end
           yield
         end
@@ -212,9 +216,14 @@ module GoodData
 
         begin
           clear_session_id
-          delete(url, :x_gdc_authsst => sst_token) if url
+          delete(url, :x_gdc_authsst => sst_token, :tries => 0) if url
         rescue RestClient::Unauthorized
-          GoodData.logger.info 'Already disconnected'
+          begin
+            refresh_token
+            delete(url, :x_gdc_authsst => sst_token, :tries => 0) if url
+          rescue RestClient::Unauthorized
+            GoodData.logger.info 'Already disconnected'
+          end
         end
 
         @auth = nil
@@ -337,20 +346,15 @@ module GoodData
         profile method.to_s.upcase, uri, request_id, stats_on do
           b = proc do
             params = fresh_request_params(request_id).merge(options)
-            begin
-              case method
-              when :get
-                @server[uri].get(params, &user_block)
-              when :put
-                @server[uri].put(payload, params)
-              when :delete
-                @server[uri].delete(params)
-              when :post
-                @server[uri].post(payload, params)
-              end
-            rescue RestClient::Exception => e
-              log_error(e, uri, params, options)
-              raise e
+            case method
+            when :get
+              @server[uri].get(params, &user_block)
+            when :put
+              @server[uri].put(payload, params)
+            when :delete
+              @server[uri].delete(params)
+            when :post
+              @server[uri].post(payload, params)
             end
           end
           process_response(options, &b)
@@ -589,9 +593,6 @@ ERR
           fail "Unsupported response content type '%s':\n%s" % [content_type, response.to_str[0..127]]
         end
         result
-      rescue RestClient::Exception => e
-        GoodData.logger.error "Response: #{e.response}"
-        raise $ERROR_INFO
       end
 
       def profile(method, path, request_id, stats_on, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -474,6 +474,7 @@ executables:
 - release.sh
 - rollout.sh
 - run_brick.rb
+- run_smoke_tests.sh
 - test_projects_cleanup.rb
 - user_filters.sh
 - users.sh
@@ -486,6 +487,7 @@ files:
 - ".document"
 - ".editorconfig"
 - ".flayignore"
+- ".gdc-ii-config.yaml"
 - ".gitignore"
 - ".pronto.yml"
 - ".rspec"
@@ -520,6 +522,7 @@ files:
 - bin/release.sh
 - bin/rollout.sh
 - bin/run_brick.rb
+- bin/run_smoke_tests.sh
 - bin/test_projects_cleanup.rb
 - bin/user_filters.sh
 - bin/users.sh
@@ -597,7 +600,7 @@ files:
 - lib/gooddata/core/nil_logger.rb
 - lib/gooddata/core/project.rb
 - lib/gooddata/core/rest.rb
-- lib/gooddata/core/splunk_logger.rb
+- lib/gooddata/core/splunk_logger_decorator.rb
 - lib/gooddata/core/user.rb
 - lib/gooddata/data/data.rb
 - lib/gooddata/data/guesser.rb