gooddata 1.3.6-java → 2.0.0-java

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

@@ -187,7 +187,8 @@ module GoodData
             ignore_failures: ignore_failures,  
             remove_users_from_project: remove_users_from_project,  
             do_not_touch_users_that_are_not_mentioned: do_not_touch_users_that_are_not_mentioned,  
-            create_non_existing_user_groups: create_non_existing_user_groups
+            create_non_existing_user_groups: create_non_existing_user_groups,
+            user_groups_cache: nil
           }
           results = case mode
                     when 'add_to_organization'

data/lib/gooddata/lcm/helpers/check_helper.rb

@@ -22,19 +22,11 @@ module GoodData
                   GoodData.logger.warn "WARNING: Default value for parameter '#{param_name}' was not filled because deprecated parameter is used instead."
                 end
               elsif specification[param_name][:opts][:required]
-                if ENV['RSPEC_ENV'] == 'test'
-                  fail "Mandatory parameter '#{param_name}' of type '#{type}' is not specified"
-                else
-                  GoodData.logger.error("Mandatory parameter '#{param_name}' of type '#{type}' is not specified")
-                end
+                fail_if_development "Mandatory parameter '#{param_name}' of type '#{type}' is not specified"
               end
             else
               if type.class.const_get(:CATEGORY) == :complex && !value.is_a?(Hash)
-                if ENV['RSPEC_ENV'] == 'test'
-                  fail "Expected parameter '#{param_name}' to be kind of '#{type}', got '#{value.class.name}'"
-                else
-                  GoodData.logger.error("Expected parameter '#{param_name}' to be kind of '#{type}', got '#{value.class.name}'")
-                end
+                fail_if_development "Expected parameter '#{param_name}' to be kind of '#{type}', got '#{value.class.name}'"
               end
 
               if specification[param_name][:opts][:deprecated]
@@ -42,11 +34,7 @@ module GoodData
               end
 
               unless type.check(value)
-                if ENV['RSPEC_ENV'] == 'test'
-                  fail "Parameter '#{param_name}' has invalid type, expected: #{type}, got #{value.class}"
-                else
-                  GoodData.logger.error("Parameter '#{param_name}' has invalid type, expected: #{type}, got #{value.class}")
-                end
+                fail_if_development "Parameter '#{param_name}' has invalid type, expected: #{type}, got #{value.class}"
               end
             end
           end

data/lib/gooddata/lcm/helpers/safe_failure_helper.rb

@@ -0,0 +1,19 @@
+# Copyright (c) 2010-2019 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+module GoodData
+  module LCM2
+    class Helpers
+      class << self
+        def fail_if_development(msg)
+          if ENV['RSPEC_ENV'] == 'test'
+            fail msg
+          else
+            GoodData.logger.error msg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gooddata/lcm/lcm2.rb

@@ -268,6 +268,8 @@ module GoodData
       def perform(mode, params = {})
         params = convert_params(params)
 
+        GoodData.gd_logger.brick = mode
+
         # Get actions for mode specified
         actions = get_mode_actions(mode)
 
@@ -353,21 +355,30 @@ module GoodData
           success: errors.empty?
         }
 
-        has_errors = errors.any?
-        # Fail whole execution if there is any failed action
-        fail(JSON.pretty_generate(errors)) if strict_mode && has_errors
+        if errors.any?
+          error_message = JSON.pretty_generate(errors)
+          GoodData.logger.error(error_message)
+
+          # Fail whole execution if there is any failed action
+          fail(error_message) if strict_mode
+        end
 
         result
       end
 
       def run_action(action, params)
-        GoodData.logger.info("Running #{action.name} action ...")
-        params.clear_filters
-        # Check if all required parameters were passed
-        BaseAction.check_params(action.const_get('PARAMS'), params)
-        params.setup_filters(action.const_get('PARAMS'))
-        out = action.send(:call, params)
-        params.clear_filters
+        begin
+          GoodData.gd_logger.start_action action, GoodData.gd_logger
+          GoodData.logger.info("Running #{action.name} action ...")
+          params.clear_filters
+          # Check if all required parameters were passed
+          BaseAction.check_params(action.const_get('PARAMS'), params)
+          params.setup_filters(action.const_get('PARAMS'))
+          out = action.send(:call, params)
+        ensure
+          params.clear_filters
+          GoodData.gd_logger.end_action GoodData.gd_logger
+        end
         out
       end
 

data/lib/gooddata/mixins/property_accessor.rb

@@ -0,0 +1,30 @@
+# Copyright (c) 2010-2018 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+module GoodData
+  module Mixin
+    module PropertyAccessor
+      def property_reader(where, *props)
+        props.each do |prop|
+          define_method(prop, proc {
+            instance_variable_get(where)[prop]
+          })
+        end
+      end
+
+      def property_writer(where, *props)
+        props.each do |prop|
+          define_method("#{prop}=", proc { |val|
+            instance_variable_get(where)[prop] = val
+          })
+        end
+      end
+
+      def property_accessor(*args)
+        property_reader(*args)
+        property_writer(*args)
+      end
+    end
+  end
+end

data/lib/gooddata/models/execution.rb

@@ -92,7 +92,12 @@ module GoodData
     #
     # @return [GoodData::Execution] Execution result
     def wait_for_result(options = {})
+      start_time = Time.now
+      timeout = options[:timeout]
       res = client.poll_on_response(uri, options) do |body|
+        timeout_exceeded = timeout && (start_time + timeout) < Time.now
+        fail 'Waiting for schedule execution timed out.' if timeout_exceeded
+
         body['execution'] && (body['execution']['status'] == 'RUNNING' || body['execution']['status'] == 'SCHEDULED')
       end
       @json = res

data/lib/gooddata/models/project.rb

@@ -1606,7 +1606,7 @@ module GoodData
       whitelisted_new_users, whitelisted_users = whitelist_users(new_users.map(&:to_hash), users_list, options[:whitelists])
 
       # First check that if groups are provided we have them set up
-      check_groups(new_users.map(&:to_hash).flat_map { |u| u[:user_group] || [] }.uniq, options)
+      options[:user_groups_cache] = check_groups(new_users.map(&:to_hash).flat_map { |u| u[:user_group] || [] }.uniq, options[:user_groups_cache], options)
 
       # conform the role on list of new users so we can diff them with the users coming from the project
       diffable_new_with_default_role = whitelisted_new_users.map do |u|
@@ -1706,7 +1706,7 @@ module GoodData
           user_groups(g).set_members(remote_users)
         end
         mentioned_groups = mappings.map(&:last).uniq
-        groups_to_cleanup = user_groups.reject { |g| mentioned_groups.include?(g.name) }
+        groups_to_cleanup = options[:user_groups_cache].reject { |g| mentioned_groups.include?(g.name) }
         # clean all groups not mentioned with exception of whitelisted users
         groups_to_cleanup.each do |g|
           g.set_members(whitelist_users(g.members.map(&:to_hash), [], options[:whitelists], :include).first.map { |x| x[:uri] })
@@ -1744,8 +1744,9 @@ module GoodData
       end
     end
 
-    def check_groups(specified_groups, options = {})
-      groups = user_groups.map(&:name)
+    def check_groups(specified_groups, user_groups_cache = nil, options = {})
+      user_groups_cache = user_groups if user_groups_cache.nil? || user_groups_cache.empty?
+      groups = user_groups_cache.map(&:name)
       missing_groups = specified_groups - groups
       if options[:create_non_existing_user_groups]
         missing_groups.each do |g|
@@ -1758,6 +1759,7 @@ module GoodData
             "#{groups.join(',')} and you asked for #{missing_groups.join(',')}"
         end
       end
+      user_groups_cache
     end
 
     # Update user

data/lib/gooddata/rest/client.rb

@@ -67,6 +67,17 @@ module GoodData
         # @param password [String] Password to be used for authentication
         # @return [GoodData::Rest::Client] Client
         def connect(username, password = 'aaaa', opts = {})
+          execution_id = ""
+          if username.is_a?(Hash) && username.key?(:execution_id)
+            execution_id = username[:execution_id]
+            username.delete(:execution_id)
+          end
+
+          if opts.key?(:execution_id)
+            execution_id = opts[:execution_id]
+            opts.delete(:execution_id)
+          end
+
           if username.nil? && password.nil?
             username = ENV['GD_GEM_USER']
             password = ENV['GD_GEM_PASSWORD']
@@ -88,7 +99,7 @@ module GoodData
             new_opts[:password] = password
           end
 
-          new_opts = { verify_ssl: true }.merge(new_opts)
+          new_opts = { verify_ssl: true, execution_id: execution_id }.merge(new_opts)
           if username.is_a?(Hash) && username[:cookies]
             new_opts[:sst_token] = username[:cookies]['GDCAuthSST']
             new_opts[:cookies] = username[:cookies]
@@ -195,7 +206,7 @@ module GoodData
       def disconnect
         if stats_on?
           GoodData.logger.info("API call statistics to server #{@connection.server}")
-          GoodData.logger.info(@connection.stats_table)
+          GoodData.logger.info(@connection.stats_table.to_s)
         end
         @connection.disconnect
       end
@@ -256,14 +267,14 @@ module GoodData
       #
       # @param uri [String] Target URI
       def delete(uri, opts = {})
-        @connection.delete uri, opts
+        @connection.delete uri, opts.merge(stats_on: stats_on?)
       end
 
       # HTTP GET
       #
       # @param uri [String] Target URI
       def get(uri, opts = {}, & block)
-        @connection.get uri, opts, & block
+        @connection.get uri, opts.merge(stats_on: stats_on?), & block
       end
 
       def project_webdav_path(opts = { project: GoodData.project })
@@ -349,14 +360,14 @@ module GoodData
       #
       # @param uri [String] Target URI
       def put(uri, data, opts = {})
-        @connection.put uri, data, opts
+        @connection.put uri, data, opts.merge(stats_on: stats_on?)
       end
 
       # HTTP POST
       #
       # @param uri [String] Target URI
       def post(uri, data, opts = {})
-        @connection.post uri, data, opts
+        @connection.post uri, data, opts.merge(stats_on: stats_on?)
       end
 
       # Uploads file to staging

data/lib/gooddata/rest/connection.rb

@@ -131,6 +131,7 @@ module GoodData
       def initialize(opts)
         super()
         @stats = ThreadSafe::Hash.new
+        @execution_id = opts[:execution_id]
 
         headers = opts[:headers] || {}
         @webdav_headers = DEFAULT_WEBDAV_HEADERS.merge(headers)
@@ -328,10 +329,12 @@ module GoodData
       def request(method, uri, data, options = {}, &user_block)
         request_id = options[:request_id] || generate_request_id
         log_info(options.merge(request_id: request_id))
+        stats_on = options[:stats_on]
+
         payload = data.is_a?(Hash) ? data.to_json : data
 
         GoodData.rest_logger.info "#{method.to_s.upcase}: #{@server.url}#{uri}, #{scrub_params(data, KEYS_TO_SCRUB)}"
-        profile "#{method.to_s.upcase} #{uri}" do
+        profile method.to_s.upcase, uri, request_id, stats_on do
           b = proc do
             params = fresh_request_params(request_id).merge(options)
             begin
@@ -452,7 +455,7 @@ module GoodData
       end
 
       def generate_request_id
-        "#{session_id}:#{call_id}"
+        "#{@execution_id}:#{session_id}:#{call_id}"
       end
 
       private
@@ -591,13 +594,13 @@ ERR
         raise $ERROR_INFO
       end
 
-      def profile(title, &block)
+      def profile(method, path, request_id, stats_on, &block)
         t1 = Time.now
         res = block.call
         t2 = Time.now
         delta = t2 - t1
 
-        update_stats title, delta
+        add_stat_record method, path, delta, t1, request_id if stats_on
         res
       end
 
@@ -617,9 +620,10 @@ ERR
         new_params
       end
 
-      def update_stats(title, delta)
+      def add_stat_record(method, path, delta, time_stamp, request_id)
         synchronize do
-          orig_title = title
+          orig_title = "#{method.to_s.upcase} #{path}"
+          title = "#{method.to_s.upcase} #{path}"
 
           placeholders = true
 
@@ -648,6 +652,16 @@ ERR
           stat[:entries] << orig_title if placeholders
 
           stats[title] = stat
+
+          endpoint = self.class.map_placeholders path.clone
+          duration = delta
+          time_stamp = time_stamp.utc.strftime "%Y-%m-%dT%H:%M:%S.%L"
+          domain = server_url.gsub %r{http://|https://}, ""
+          execution_id = request_id
+
+          GoodData.gd_logger.update_store(domain, method, duration, endpoint)
+          GoodData.gd_logger.add Logger::INFO, { endpoint: endpoint, duration: duration, domain: domain,
+                                                 execution_id: execution_id, time_stamp: time_stamp }, "rest_call"
         end
       end
 

data/lib/gooddata/rest/rest_aggregator.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+module GoodData
+  module Rest
+    # class is responsible for storage and aggregation of REST calls information
+    module Aggregator
+      attr_reader :store
+
+      def initialize_store
+        @store = {}
+      end
+
+      def clear_store
+        @store.clear
+      end
+
+      def update_store(domain, method, duration, endpoint)
+        domain = domain.to_sym
+        method = method.to_sym
+        endpoint = endpoint.to_sym
+        @store[domain] = {} unless @store.key?(domain)
+        @store[domain][method] = {} unless @store[domain].key?(method)
+        if @store[domain][method].key?(endpoint)
+          record = @store[domain][method][endpoint]
+          record[:min] = [duration, record[:min]].min
+          record[:max] = [duration, record[:max]].max
+          record[:avg] = (record[:avg] * record[:count] + duration).to_f / (record[:count] + 1)
+          record[:count] += 1
+          @store[domain][method][endpoint] = record
+        else
+          @store[domain][method][endpoint] = {
+            :min => duration,
+            :max => duration,
+            :avg => duration,
+            :count => 1,
+            :method => method.to_s,
+            :endpoint => endpoint.to_s,
+            :domain => domain.to_s
+          }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 2.0.0
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -502,6 +502,7 @@ files:
 - Gemfile
 - Guardfile
 - Jenkinsfile
+- Jenkinsfile-chart
 - LICENSE
 - LICENSE.rb
 - README.md
@@ -532,6 +533,8 @@ files:
 - docker-compose.yml
 - gooddata
 - gooddata.gemspec
+- k8s/charts/lcm-bricks/Chart.yaml
+- k8s/charts/lcm-bricks/templates/prometheus/alertingRules.yaml
 - lcm.rake
 - lib/gooddata.rb
 - lib/gooddata/app/app.rb
@@ -544,6 +547,8 @@ files:
 - lib/gooddata/bricks/middleware/base_middleware.rb
 - lib/gooddata/bricks/middleware/bench_middleware.rb
 - lib/gooddata/bricks/middleware/bulk_salesforce_middleware.rb
+- lib/gooddata/bricks/middleware/context_logger_decorator.rb
+- lib/gooddata/bricks/middleware/context_manager.rb
 - lib/gooddata/bricks/middleware/decode_params_middleware.rb
 - lib/gooddata/bricks/middleware/dwh_middleware.rb
 - lib/gooddata/bricks/middleware/fs_download_middleware.rb
@@ -587,10 +592,12 @@ files:
 - lib/gooddata/commands/user.rb
 - lib/gooddata/connection.rb
 - lib/gooddata/core/core.rb
+- lib/gooddata/core/gd_logger.rb
 - lib/gooddata/core/logging.rb
 - 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/user.rb
 - lib/gooddata/data/data.rb
 - lib/gooddata/data/guesser.rb
@@ -685,6 +692,7 @@ files:
 - lib/gooddata/lcm/helpers/check_helper.rb
 - lib/gooddata/lcm/helpers/helpers.rb
 - lib/gooddata/lcm/helpers/release_table_helper.rb
+- lib/gooddata/lcm/helpers/safe_failure_helper.rb
 - lib/gooddata/lcm/helpers/tags_helper.rb
 - lib/gooddata/lcm/lcm.rb
 - lib/gooddata/lcm/lcm2.rb
@@ -754,6 +762,7 @@ files:
 - lib/gooddata/mixins/not_label.rb
 - lib/gooddata/mixins/not_metric.rb
 - lib/gooddata/mixins/obj_id.rb
+- lib/gooddata/mixins/property_accessor.rb
 - lib/gooddata/mixins/rest_getters.rb
 - lib/gooddata/mixins/rest_resource.rb
 - lib/gooddata/mixins/root_key_getter.rb
@@ -849,6 +858,7 @@ files:
 - lib/gooddata/rest/phmap.rb
 - lib/gooddata/rest/resource.rb
 - lib/gooddata/rest/rest.rb
+- lib/gooddata/rest/rest_aggregator.rb
 - lib/gooddata/version.rb
 - lib/templates/bricks/brick.rb.erb
 - lib/templates/bricks/main.rb.erb