gooddata 1.3.0-java → 1.3.1-java

data/lib/gooddata/extensions/integer.rb

@@ -1,5 +1,11 @@
-class Integer
-  def to_b
-    self == 1
+# 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 IntegerExtensions
+  refine Integer do
+    def to_b
+      self == 1
+    end
   end
 end

data/lib/gooddata/extensions/nil.rb

@@ -1,19 +1,11 @@
-# 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.
 
-class NilClass
-  # +nil+ is not duplicable:
-  #
-  #   nil.duplicable? # => false
-  #   nil.dup         # => TypeError: can't dup NilClass
-  def duplicable?
-    false
-  end
-
-  def to_b
-    false
+module NilExtensions
+  refine NilClass do
+    def to_b
+      false
+    end
   end
 end

data/lib/gooddata/extensions/object.rb

@@ -1,9 +1,6 @@
-# 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.
-
 class Object
   class << self
     def set_const(name, val)
@@ -12,14 +9,6 @@ class Object
     end
   end
 
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-
-  def duplicable?
-    true
-  end
-
   def set_const(name, val)
     send(:remove_const, name) if const_defined?(name)
     send(:const_set, name, val)

data/lib/gooddata/extensions/string.rb

@@ -1,7 +1,13 @@
-class String
-  def to_b
-    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
-    return false if self == false || blank? || self =~ (/(false|f|no|n|0)$/i)
-    raise ArgumentError, "invalid value for Boolean: \"#{self}\""
+# 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 StringExtensions
+  refine String do
+    def to_b
+      return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+      return false if self == false || blank? || self =~ (/(false|f|no|n|0)$/i)
+      raise ArgumentError, "invalid value for Boolean: \"#{self}\""
+    end
   end
 end

data/lib/gooddata/extensions/true.rb

@@ -1,23 +1,15 @@
-# 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.
 
-class TrueClass
-  # +true+ is not duplicable:
-  #
-  #   true.duplicable? # => false
-  #   true.dup         # => TypeError: can't dup TrueClass
-  def duplicable?
-    false
-  end
-
-  def to_b
-    true
-  end
+module TrueExtensions
+  refine TrueClass do
+    def to_b
+      true
+    end
 
-  def to_i
-    1
+    def to_i
+      1
+    end
   end
 end

data/lib/gooddata/helpers/global_helpers.rb

@@ -9,9 +9,21 @@ require 'pathname'
 require 'hashie'
 require 'openssl'
 
+require 'active_support/core_ext/object/duplicable'
+
 require_relative '../extensions/object'
 require_relative 'global_helpers_params'
 
+require 'gooddata/extensions/true'
+require 'gooddata/extensions/false'
+require 'gooddata/extensions/integer'
+require 'gooddata/extensions/nil'
+
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using NilExtensions
+
 module GoodData
   module Helpers
     extend Hashie::Extensions::StringifyKeys::ClassMethods

data/lib/gooddata/helpers/global_helpers_params.rb

@@ -1,14 +1,16 @@
-# 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/slice'
+
+require 'gooddata/extensions/hash'
+
+using HashExtensions
 
 module GoodData
   module Helpers
     ENCODED_PARAMS_KEY = 'gd_encoded_params'
     ENCODED_HIDDEN_PARAMS_KEY = 'gd_encoded_hidden_params'
-
     class << self
       # Encodes parameters for passing them to GD execution platform.
       # Core types are kept and complex types (arrays, structures, etc) are

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

@@ -6,6 +6,12 @@
 
 require_relative 'base_action'
 
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using StringExtensions
+using NilExtensions
+
 module GoodData
   module LCM2
     # Applies custom MAQL DDL to all client projects so customized

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

@@ -1,8 +1,14 @@
-# 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 '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 '../dsl/dsl'
 require_relative '../helpers/helpers'

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

@@ -0,0 +1,46 @@
+# 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_relative 'base_action'
+
+module GoodData
+  module LCM2
+    class CollectMultipleProjectsColumn < BaseAction
+      DESCRIPTION = 'Collect multiple_projects_column to be used in user actions'
+
+      PARAMS = define_params(self) do
+        description 'Client Used for Connecting to GD'
+        param :gdc_gd_client, instance_of(Type::GdClientType), required: true
+
+        description 'Identifier of column that identifies the relation to the projects in an user action input'
+        param :multiple_projects_column, instance_of(Type::StringType), required: false
+
+        description 'Synchronization Mode for user action (e.g. sync_one_project_based_on_pid)'
+        param :sync_mode, instance_of(Type::StringType), required: false
+
+        description 'Logger'
+        param :gdc_logger, instance_of(Type::GdLogger), required: true
+      end
+
+      CLIENT_ID_MODES = %w(
+        sync_domain_client_workspaces
+        sync_one_project_based_on_custom_id
+        sync_multiple_projects_based_on_custom_id
+      )
+
+      class << self
+        def call(params)
+          column = params.multiple_projects_column
+          column = CLIENT_ID_MODES.include?(params.sync_mode) ? 'client_id' : 'project_id' unless column
+
+          {
+            results: [{ multiple_projects_column: column }],
+            params: { multiple_projects_column: column }
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,9 @@ module GoodData
                     'deletion of filters for a user that is to be removed.'
         param :users_brick_config, instance_of(Type::UsersBrickConfig), required: true
 
+        description 'Column That Contains Target Project IDs'
+        param :multiple_projects_column, instance_of(Type::StringType), required: true
+
         description 'Input Source'
         param :input_source, instance_of(Type::HashType), required: false
       end
@@ -36,11 +39,15 @@ module GoodData
                       headers: true,
                       return_headers: false,
                       encoding: 'utf-8') do |row|
-            users_brick_users << { login: row[login_column] }
+            users_brick_users << {
+              login: row[login_column],
+              pid: row[params.multiple_projects_column]
+            }
           end
 
           {
-            results: users_brick_users,
+            # TODO; TMA-989 return the real results when print of results is fixed for large sets
+            results: [{ status: 'ok' }],
             params: {
               users_brick_users: users_brick_users
             }

data/lib/gooddata/lcm/actions/execute_schedules.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/lcm/actions/hello_world.rb

@@ -13,7 +13,7 @@ module GoodData
 
       PARAMS = define_params(self) do
         description 'Message to be printed'
-        param :message, instance_of(Type::StringType), required: true
+        param :message, instance_of(Type::StringType), required: false
 
         description 'Number of Iterations'
         param :iterations, instance_of(Type::IntegerType), required: false, default: 1

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

@@ -6,6 +6,12 @@
 
 require_relative 'base_action'
 
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using StringExtensions
+using NilExtensions
+
 module GoodData
   module LCM2
     class SynchronizeComputedAttributes < BaseAction

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

@@ -6,6 +6,12 @@
 
 require_relative 'base_action'
 
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using StringExtensions
+using NilExtensions
+
 module GoodData
   module LCM2
     class SynchronizeLdm < BaseAction

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

@@ -6,6 +6,12 @@
 
 require_relative 'base_action'
 
+using TrueExtensions
+using FalseExtensions
+using IntegerExtensions
+using StringExtensions
+using NilExtensions
+
 module GoodData
   module LCM2
     class SynchronizeUserFilters < BaseAction
@@ -64,7 +70,7 @@ module GoodData
         param :gdc_project_id, instance_of(Type::StringType), required: false
 
         description 'User brick users'
-        param :users_brick_users, instance_of(Type::ObjectType), required: false
+        param :users_brick_users, instance_of(Type::ObjectType), required: false, default: []
 
         description 'Makes the brick run without altering user filters'
         param :dry_run, instance_of(Type::StringType), required: false, default: false
@@ -91,36 +97,19 @@ module GoodData
           fail "Either project or project_id has to be specified in params" unless project
           data_product = params.data_product
 
-          data_source = GoodData::Helpers::DataSource.new(params.input_source)
-
           config = params.filters_config
           fail 'User filters brick requires configuration how the filter should be setup. For this use the param "filters_config"' if config.blank?
           symbolized_config = GoodData::Helpers.deep_dup(config)
           symbolized_config = GoodData::Helpers.symbolize_keys(symbolized_config)
           symbolized_config[:labels] = symbolized_config[:labels].map { |l| GoodData::Helpers.symbolize_keys(l) }
-          headers_in_options = params.csv_headers == 'false' || true
+          multiple_projects_column = params.multiple_projects_column
 
           mode = params.sync_mode
           unless MODES.include?(mode)
             fail "The parameter \"sync_mode\" has to have one of the values #{MODES.map(&:to_s).join(', ')} or has to be empty."
           end
-          filters = []
-
-          csv_with_headers = if GoodData::UserFilterBuilder.row_based?(symbolized_config)
-                               false
-                             else
-                               headers_in_options
-                             end
 
-          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
+          user_filters = load_data(params, symbolized_config)
 
           run_params = {
             restrict_if_missing_all_values: params.restrict_if_missing_all_values == 'true',
@@ -133,85 +122,27 @@ module GoodData
 
           puts "Synchronizing in mode \"#{mode}\""
           case mode
-          when 'sync_project'
-            without_check(PARAMS, params) do
-              CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-                filters << row
-              end
-            end
-            filters_to_load = GoodData::UserFilterBuilder.get_filters(filters, symbolized_config)
-            puts "Synchronizing #{filters_to_load.count} filters"
-            project.add_data_permissions(filters_to_load, run_params)
-          when 'sync_one_project_based_on_pid'
-            without_check(PARAMS, params) do
-              CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-                filters << row if row[multiple_projects_column] == project.pid
-              end
-            end
-            filters_to_load = GoodData::UserFilterBuilder.get_filters(filters, symbolized_config)
-            puts "Synchronizing #{filters_to_load.count} filters"
-            project.add_data_permissions(filters_to_load, run_params)
-          when 'sync_multiple_projects_based_on_pid'
-            without_check(PARAMS, params) do
-              CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-                filters << row.to_hash
-              end
-            end
-            if filters.empty?
-              fail 'The filter set can not be empty when using sync_multiple_projects_* mode as the filters contain \
-                    the project ids in which the permissions should be changed'
-            end
-            filters.group_by { |u| u[multiple_projects_column] }.flat_map do |project_id, new_filters|
-              fail "Project id cannot be empty" if project_id.blank?
-              project = client.projects(project_id)
-              filters_to_load = GoodData::UserFilterBuilder.get_filters(new_filters, symbolized_config)
-              puts "Synchronizing #{filters_to_load.count} filters in project #{project.pid}"
-              project.add_data_permissions(filters_to_load, run_params)
+          when 'sync_project', 'sync_one_project_based_on_pid', 'sync_one_project_based_on_custom_id'
+            if mode == 'sync_one_project_based_on_pid'
+              filter = project.pid
+            elsif mode == 'sync_one_project_based_on_custom_id'
+              filter = UserBricksHelper.resolve_client_id(domain, project, params.data_product)
             end
-          when 'sync_one_project_based_on_custom_id'
-            filter_value = UserBricksHelper.resolve_client_id(domain, project, data_product)
-
-            filepath = without_check(PARAMS, params) do
-              File.open(data_source.realize(params), 'r:UTF-8')
-            end
-            CSV.foreach(filepath, headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-              client_id = row[multiple_projects_column].to_s
-              filters << row if client_id == filter_value
-            end
-
-            if filters.empty?
-              params.gdc_logger.warn "Project \"#{project.pid}\" does not match with any client ids in input source (both GOODOT_CUSTOM_PROJECT_ID and SEGMENT/CLIENT). \
-                                      Unable to get the value to filter users."
-            end
-
-            filters_to_load = GoodData::UserFilterBuilder.get_filters(filters, symbolized_config)
-            puts "Synchronizing #{filters_to_load.count} filters"
-            project.add_data_permissions(filters_to_load, run_params)
-          when 'sync_multiple_projects_based_on_custom_id'
-            without_check(PARAMS, params) do
-              CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-                filters << row.to_hash
+            user_filters = user_filters.select { |f| f[:pid] == filter } if filter
+            sync_user_filters(project, user_filters, run_params, symbolized_config)
+          when 'sync_multiple_projects_based_on_pid', 'sync_multiple_projects_based_on_custom_id'
+            users_by_project = run_params[:users_brick_input].group_by { |u| u[:pid] }
+            user_filters.group_by { |u| u[:pid] }.flat_map.pmap do |id, new_filters|
+              users = users_by_project[id]
+              fail "The #{multiple_projects_column} cannot be empty" if id.blank?
+              if mode == 'sync_multiple_projects_based_on_custom_id'
+                current_project = domain.clients(id, data_product).project
+              elsif mode == 'sync_multiple_projects_based_on_pid'
+                current_project = client.projects(id)
               end
-            end
-            if filters.empty?
-              fail 'The filter set can not be empty when using sync_multiple_projects_* mode as the filters contain \
-                    the project ids in which the permissions should be changed'
-            end
-            filters.group_by { |u| u[multiple_projects_column] }.flat_map do |client_id, new_filters|
-              fail "Client id cannot be empty" if client_id.blank?
-              project = domain.clients(client_id, data_product).project
-              fail "Client #{client_id} does not have project." unless project
-              filters_to_load = GoodData::UserFilterBuilder.get_filters(new_filters, symbolized_config)
-              puts "Synchronizing #{filters_to_load.count} filters in project #{project.pid} of client #{client_id}"
-              project.add_data_permissions(filters_to_load, run_params)
+              sync_user_filters(current_project, new_filters, run_params.merge(users_brick_input: users), symbolized_config)
             end
           when 'sync_domain_client_workspaces'
-            without_check(PARAMS, params) do
-              CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
-                filters << row.to_hash
-              end
-            end
-
             domain_clients = domain.clients(:all, data_product)
             if params.segments
               segment_uris = params.segments.map(&:uri)
@@ -220,20 +151,20 @@ module GoodData
 
             working_client_ids = []
 
+            users_by_project = run_params[:users_brick_input].group_by { |u| u[:pid] }
             results = []
-            filters.group_by { |u| u[multiple_projects_column] }.flat_map do |client_id, new_filters|
+            user_filters.group_by { |u| u[multiple_projects_column] }.flat_map.pmap do |client_id, new_filters|
+              users = users_by_project[client_id]
               fail "Client id cannot be empty" if client_id.blank?
               c = domain.clients(client_id, data_product)
               if params.segments && !segment_uris.include?(c.segment_uri)
                 puts "Client #{client_id} is outside segments_filter #{params.segments}"
                 next
               end
-              project = c.project
-              fail "Client #{client_id} does not have project." unless project
+              current_project = c.project
+              fail "Client #{client_id} does not have project." unless current_project
               working_client_ids << client_id
-              filters_to_load = GoodData::UserFilterBuilder.get_filters(new_filters, symbolized_config)
-              puts "Synchronizing #{filters_to_load.count} filters in project #{project.pid} of client #{client_id}"
-              partial_results = project.add_data_permissions(filters_to_load, run_params)
+              partial_results = sync_user_filters(current_project, new_filters, run_params.merge(users_brick_input: users), symbolized_config)
               results.concat(partial_results[:results])
             end
 
@@ -241,22 +172,23 @@ module GoodData
               domain_clients.each do |c|
                 next if working_client_ids.include?(c.client_id)
                 begin
-                  project = c.project
+                  current_project = c.project
                 rescue => e
                   puts "Error when accessing project of client #{c.client_id}. Error: #{e}"
                   next
                 end
-                unless project
+                unless current_project
                   puts "Client #{c.client_id} has no project."
                   next
                 end
-                if project.deleted?
-                  puts "Project #{project.pid} of client #{c.client_id} is deleted."
+                if current_project.deleted?
+                  puts "Project #{current_project.pid} of client #{c.client_id} is deleted."
                   next
                 end
 
-                puts "Delete all filters in project #{project.pid} of client #{c.client_id}"
-                delete_results = project.add_data_permissions([], run_params)
+                puts "Delete all filters in project #{current_project.pid} of client #{c.client_id}"
+                users = users_by_project[c.client_id]
+                delete_results = current_project.add_data_permissions([], run_params.merge(users_brick_input: users))
                 results.concat(delete_results[:results])
               end
             end
@@ -266,6 +198,37 @@ module GoodData
             }
           end
         end
+
+        def sync_user_filters(project, filters, params, filters_config)
+          # Do not change this line -> can cause paralelisation errors in jRuby viz TMA-963
+          project.add_data_permissions(GoodData::UserFilterBuilder.get_filters(filters, filters_config), params)
+        end
+
+        def load_data(params, symbolized_config)
+          filters = []
+          headers_in_options = params.csv_headers == 'false' || true
+          csv_with_headers = if GoodData::UserFilterBuilder.row_based?(symbolized_config)
+                               false
+                             else
+                               headers_in_options
+                             end
+
+          multiple_projects_column = params.multiple_projects_column
+          data_source = GoodData::Helpers::DataSource.new(params.input_source)
+
+          without_check(PARAMS, params) do
+            CSV.foreach(File.open(data_source.realize(params), 'r:UTF-8'), headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
+              filters << row.to_hash.merge(pid: row[multiple_projects_column])
+            end
+          end
+
+          if filters.empty? && %w(sync_multiple_projects_based_on_pid sync_multiple_projects_based_on_custom_id).include?(params.sync_mode)
+            fail 'The filter set can not be empty when using sync_multiple_projects_* mode as the filters contain \
+                  the project ids in which the permissions should be changed'
+          end
+
+          filters
+        end
       end
     end
   end