gooddata 1.3.0-java → 1.3.1-java

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

@@ -201,7 +201,6 @@ module GoodData
                       new_users.group_by { |u| u[:pid] }.flat_map do |project_id, users|
                         begin
                           project = client.projects(project_id)
-                          fail "You (user executing the script - #{client.user.login}) is not admin in project \"#{project_id}\"." unless project.am_i_admin?
                           project.import_users(users,
                                                domain: domain,
                                                whitelists: whitelists,
@@ -371,21 +370,10 @@ module GoodData
           country_column              = params.country_column || 'country'
           phone_column                = params.phone_column || 'phone'
           ip_whitelist_column         = params.ip_whitelist_column || 'ip_whitelist'
-          mode                        = params.sync_mode
 
           sso_provider = params.sso_provider
           authentication_modes = params.authentication_modes || []
 
-          multiple_projects_column = params.multiple_projects_column
-          unless multiple_projects_column
-            client_modes = %w(sync_domain_client_workspaces sync_one_project_based_on_custom_id sync_multiple_projects_based_on_custom_id)
-            multiple_projects_column = if client_modes.include?(mode)
-                                         'client_id'
-                                       else
-                                         'project_id'
-                                       end
-          end
-
           dwh = params.ads_client
           if dwh
             data = dwh.execute_select(params.input_source.query)
@@ -423,7 +411,7 @@ module GoodData
               :sso_provider => sso_provider || row[sso_provider_column] || row[sso_provider_column.to_sym],
               :authentication_modes => modes,
               :user_group => user_group,
-              :pid => multiple_projects_column.nil? ? nil : (row[multiple_projects_column] || row[multiple_projects_column.to_sym]),
+              :pid => params.multiple_projects_column.nil? ? nil : (row[params.multiple_projects_column] || row[params.multiple_projects_column.to_sym]),
               :language => row[language_column] || row[language_column.to_sym],
               :company => row[company_column] || row[company_column.to_sym],
               :position => row[position_column] || row[position_column.to_sym],

data/lib/gooddata/lcm/brick_logger.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+#
+# 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
+  # Simple file logger.
+  class BrickFileLogger
+    # entry-point
+    # @param [String] log_directory directory to create log files
+    # @param [String] mode - brick mode (short name if brick)
+    def initialize(log_directory, mode)
+      @log_directory = log_directory
+      @mode = mode
+    end
+
+    # Creates file in log directory with given content. Logging is disabled when log_directory is nil.
+    #
+    # @param [String] status brick phase/status (start, finished, error,...)
+    # @param [String] content log file content
+    def log_action(status, content)
+      File.write("#{@log_directory}/#{@mode}_#{status}.json", content)
+    end
+  end
+end

data/lib/gooddata/lcm/lcm2.rb

@@ -6,10 +6,26 @@
 
 require 'terminal-table'
 
+require 'gooddata/extensions/class'
+require 'gooddata/extensions/true'
+require 'gooddata/extensions/false'
+require 'gooddata/extensions/integer'
+require 'gooddata/extensions/string'
+require 'gooddata/extensions/nil'
+
+require 'active_support/core_ext/hash/compact'
+
 require_relative 'actions/actions'
+require_relative 'brick_logger'
 require_relative 'dsl/dsl'
 require_relative 'helpers/helpers'
 
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using StringExtensions
+using NilExtensions
+
 module GoodData
   module LCM2
     class SmartHash < Hash
@@ -139,12 +155,14 @@ module GoodData
 
       users: [
         CollectDataProduct,
+        CollectMultipleProjectsColumn,
         CollectSegments,
         SynchronizeUsers
       ],
 
       user_filters: [
         CollectDataProduct,
+        CollectMultipleProjectsColumn,
         CollectUsersBrickUsers,
         CollectSegments,
         SynchronizeUserFilters
@@ -152,6 +170,10 @@ module GoodData
 
       schedules_execution: [
         ExecuteSchedules
+      ],
+
+      hello_world: [
+        HelloWorld
       ]
     }
 
@@ -269,6 +291,16 @@ module GoodData
 
         # Get actions for mode specified
         actions = get_mode_actions(mode)
+
+        if params.key?('log_directory')
+          brick_logger = BrickFileLogger.new(params['log_directory'], mode)
+          logging_enabled = true
+        else
+          logging_enabled = false
+        end
+        if logging_enabled
+          brick_logger.log_action('start', JSON.pretty_generate(params))
+        end
         if params.actions
           actions = params.actions.map do |action|
             "GoodData::LCM2::#{action}".split('::').inject(Object) do |o, c|
@@ -283,8 +315,6 @@ module GoodData
 
         # TODO: Check all action params first
 
-        new_params = params
-
         fail_early = if params.key?(:fail_early)
                        params.fail_early.to_b
                      else
@@ -321,6 +351,7 @@ module GoodData
               backtrace: e.backtrace
             }
             break if fail_early
+            results << nil
           end
 
           # in case fail_early = false, we need to execute another action
@@ -342,19 +373,27 @@ module GoodData
           results << res
         end
 
-        # Fail whole execution if there is any failed action
-        fail(JSON.pretty_generate(errors)) if strict_mode && errors.any?
-
         brick_results = {}
         actions.each_with_index do |action, index|
           brick_results[action.short_name] = results[index]
         end
 
-        {
+        result = {
           actions: actions.map(&:short_name),
           results: brick_results,
-          params: params
+          params: params,
+          success: errors.empty?
         }
+
+        # Fail whole execution if there is any failed action
+        fail(JSON.pretty_generate(errors)) if strict_mode && errors.any?
+
+        result
+
+      ensure
+        if logging_enabled
+          brick_logger.log_action('finished', JSON.pretty_generate(result))
+        end
       end
 
       def run_action(action, params)

data/lib/gooddata/lcm/types/base_type.rb

@@ -8,6 +8,10 @@
 require_relative '../dsl/dsl'
 require_relative '../helpers/helpers'
 
+require 'active_support/core_ext/hash/compact'
+
+require 'gooddata/extensions/class'
+
 module GoodData
   module LCM2
     module Type

data/lib/gooddata/lcm/types/class/class.rb

@@ -6,6 +6,8 @@
 
 require_relative '../base_type'
 
+require 'gooddata/extensions/class'
+
 module GoodData
   module LCM2
     module Type

data/lib/gooddata/lcm/types/complex/complex.rb

@@ -6,6 +6,8 @@
 
 require_relative '../base_type'
 
+require 'gooddata/extensions/class'
+
 module GoodData
   module LCM2
     module Type

data/lib/gooddata/lcm/types/special/array.rb

@@ -4,6 +4,8 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+require 'gooddata/extensions/class'
+
 module GoodData
   module LCM2
     module Type

data/lib/gooddata/models/blueprint/project_blueprint.rb

@@ -1,9 +1,9 @@
-# encoding: UTF-8
-#
 # 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.
 
+require 'active_support/core_ext/hash/compact'
+
 module GoodData
   module Model
     class ProjectBlueprint
@@ -125,7 +125,7 @@ module GoodData
       def self.dataset?(project, name, options = {})
         find_dataset(project, name, options)
         true
-      rescue
+      rescue StandardError
         false
       end
 
@@ -163,7 +163,7 @@ module GoodData
       def self.date_dimension?(project, name)
         find_date_dimension(project, name)
         true
-      rescue
+      rescue StandardError
         false
       end
 
@@ -766,7 +766,7 @@ module GoodData
         errors.concat datasets.reduce([]) { |acc, elem| acc.concat(elem.validate) }
         errors.concat datasets.reduce([]) { |acc, elem| acc.concat(elem.validate_gd_data_type_errors) }
         errors
-      rescue
+      rescue StandardError
         raise GoodData::ValidationError
       end
 

data/lib/gooddata/models/blueprint/to_manifest.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 # 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.

data/lib/gooddata/models/domain.rb

@@ -5,6 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'cgi'
+require 'active_support/core_ext/hash/compact'
 
 require_relative 'profile'
 require_relative '../extensions/enumerable'

data/lib/gooddata/models/from_wire.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 # 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.

data/lib/gooddata/models/profile.rb

@@ -214,7 +214,7 @@ module GoodData
     #
     # @return [String] Email address
     def email
-      @json['accountSetting']['email'] || ''
+      @json['accountSetting']['email'].is_a?(String) ? @json['accountSetting']['email'].downcase : ''
     end
 
     # Set the email

data/lib/gooddata/models/project.rb

@@ -12,6 +12,10 @@ require 'pmap'
 require 'zip'
 require 'net/smtp'
 
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/compact'
+require 'active_support/core_ext/hash/slice'
+
 require_relative '../exceptions/no_project_error'
 
 require_relative '../helpers/auth_helpers'
@@ -1813,6 +1817,7 @@ module GoodData
     alias_method :create_users, :set_users_roles
 
     def add_data_permissions(filters, options = {})
+      GoodData.logger.info("Synchronizing #{filters.count} filters in project #{pid}")
       GoodData::UserFilterBuilder.execute_mufs(filters, { client: client, project: self }.merge(options))
     end
 

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

@@ -5,7 +5,18 @@
 # LICENSE file in the root directory of this source tree.
 
 require_relative '../project_log_formatter'
+
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/compact'
+
+require 'gooddata/extensions/true'
+require 'gooddata/extensions/false'
+require 'gooddata/extensions/integer'
+
+using FalseExtensions
+using TrueExtensions
+using IntegerExtensions
+using NilExtensions
 
 module GoodData
   module UserFilterBuilder
@@ -199,47 +210,53 @@ module GoodData
     # Creates a MAQL expression(s) based on the filter defintion.
     # Takes the filter definition looks up any necessary values and provides API executable MAQL
     def self.create_expression(filter, labels_cache, lookups_cache, attr_cache, options = {})
-      errors = []
       values = filter[:values]
       label = labels_cache[filter[:label]]
-      element_uris = values.map do |v|
-        begin
-          if lookups_cache.key?(label.uri)
-            if lookups_cache[label.uri].key?(v)
-              lookups_cache[label.uri][v]
-            else
-              fail
-            end
-          else
-            label.find_value_uri(v)
-          end
-        rescue
-          errors << {
-            type: :error,
-            label: label.title,
-            value: v
-          }
-          nil
+      errors = []
+
+      element_uris_by_values = Hash[values.map do |v|
+        if lookups_cache.key?(label.uri)
+          [v, lookups_cache[label.uri][v]]
+        else
+          [v, label.find_value_uri(v)]
         end
+      end]
+
+      missing_value_errors = element_uris_by_values.select { |_, v| v.nil? }.map do |k, _|
+        {
+          type: :error,
+          label: label.title,
+          value: k,
+          reason: 'Can not find the value of the attribute referenced in the MUF'
+        }
       end
-      expression = if element_uris.compact.empty? && options[:restrict_if_missing_all_values] && options[:type] == :muf
-                     '1 <> 1'
-                   elsif element_uris.compact.empty? && options[:restrict_if_missing_all_values] && options[:type] == :variable
-                     nil
-                   elsif element_uris.compact.empty?
+      errors += missing_value_errors unless options[:ignore_missing_values]
+
+      element_uris = element_uris_by_values.values.compact
+      # happens when data is not yet loaded in the project
+      no_values = element_uris.empty?
+
+      expression = if no_values && options[:restrict_if_missing_all_values] && options[:type] == :muf
+                     # create a filter that is always false to ensure the user can not see any data
+                     # as the proper MUF can not be constructed yet
+                     case options[:type]
+                     when :muf
+                       '1 <> 1'
+                     when :variable
+                       nil
+                     end
+                   elsif no_values
+                     # create a filter that is always true to ensure the user can see all data
                      'TRUE'
                    elsif filter[:over] && filter[:to]
                      over = attr_cache[filter[:over]]
                      to = attr_cache[filter[:to]]
-                     "([#{label.attribute_uri}] IN (#{element_uris.compact.sort.map { |e| '[' + e + ']' }.join(', ')})) OVER [#{over && over.uri}] TO [#{to && to.uri}]"
+                     "([#{label.attribute_uri}] IN (#{element_uris.sort.map { |e| '[' + e + ']' }.join(', ')})) OVER [#{over && over.uri}] TO [#{to && to.uri}]"
                    else
-                     "[#{label.attribute_uri}] IN (#{element_uris.compact.sort.map { |e| '[' + e + ']' }.join(', ')})"
+                     "[#{label.attribute_uri}] IN (#{element_uris.sort.map { |e| '[' + e + ']' }.join(', ')})"
                    end
-      if options[:ignore_missing_values]
-        [expression, []]
-      else
-        [expression, errors]
-      end
+
+      [expression, errors]
     end
 
     # Encapuslates the creation of filter
@@ -273,7 +290,7 @@ module GoodData
         expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
         safe_login = login.downcase
         profiles_uri = if options[:type] == :muf
-                         project_user = project_users.find { |u| u.login == login }
+                         project_user = project_users.find { |u| u.login == safe_login }
                          project_user.nil? ? ('/gdc/account/profile/' + safe_login) : project_user.profile_url
                        elsif options[:type] == :variable
                          (users_cache[login] && users_cache[login].uri)

data/lib/gooddata/models/user_group.rb

@@ -12,6 +12,9 @@ require_relative '../mixins/links'
 require_relative '../mixins/rest_resource'
 require_relative '../mixins/uri_getter'
 
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/compact'
+
 module GoodData
   # Representation of User Group
   #

data/lib/gooddata/rest/client.rb

@@ -314,27 +314,27 @@ module GoodData
       # Generalizaton of poller. Since we have quite a variation of how async proceses are handled
       # this is a helper that should help you with resources where the information about "Are we done"
       # is inside the response. It expects the URI as an input where it can poll and a block that should
-      # return either true -> 'meaning we are done' or false -> meaning sleep and repeat. It returns the
+      # return either true (meaning sleep and repeat) or false (meaning we are done). It returns the
       # value of last poll. In majority of cases these are the data that you need
       #
       # @param link [String] Link for polling
       # @param options [Hash] Options
       # @return [Hash] Result of polling
       def poll_on_response(link, options = {}, &bl)
-        sleep_interval = options[:sleep_interval] || DEFAULT_SLEEP_INTERVAL
         time_limit = options[:time_limit] || DEFAULT_POLL_TIME_LIMIT
         process = options[:process] == false ? false : true
 
         # get the first status and start the timer
         response = get(link, process: process)
         poll_start = Time.now
-
+        retry_time = GoodData::Rest::Connection::RETRY_TIME_INITIAL_VALUE
         while bl.call(response)
           limit_breached = time_limit && (Time.now - poll_start > time_limit)
           if limit_breached
             fail ExecutionLimitExceeded, "The time limit #{time_limit} secs for polling on #{link} is over"
           end
-          sleep sleep_interval
+          sleep retry_time
+          retry_time *= GoodData::Rest::Connection::RETRY_TIME_COEFFICIENT
           GoodData::Rest::Client.retryable(:tries => Helpers::GD_MAX_RETRY, :refresh_token => proc { connection.refresh_token }) do
             response = get(link, process: process)
           end