gooddata 2.1.4-java → 2.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc6d23e8d5782c1029093532c6fd7fac954dfa06a0a9561f8da795994910c8c
-  data.tar.gz: aac2cf531bca16aaf63f2f82f2387ba396add858bc67a589d4bf667702143a3b
+  metadata.gz: 21a6a64e1b857a14c7aaee8321bcca8bc00d08cde4ec54dd99513473300eecce
+  data.tar.gz: bd670fba31e8b2d8786d8b3a466a631358ead58391a21b34b95804030299cbe1
 SHA512:
-  metadata.gz: d4045b2f4401856b1181ad93640ae09a516cae09577632b99ad3a13f532a9528767141340a6e9aecd3f6792e3f8ff709179eb51080685f9ab25c2461bb154629
-  data.tar.gz: 97107dbf36d4ad5b3becd478b39b7c2a8cd32172a44e8e74b09fcc8174d1e5a9d379dc412ff0a3d46e8b38ad6938c15c389a69c31f8a24f0000f96bbcba3a044
+  metadata.gz: c959946c389237dd0b65199aa75e5de3b1a5476084d14496e0695e265436cb0ee8e2b57138d8e4fcc5d9089058b33ee40a90d092cabd66218df0f3d85090f567
+  data.tar.gz: 9232b3314fdf4a28a98c31a71b5929efd751f829ccc859836a54ae869baebe424b85a10c90c7e9467c5ffcc13478ece434309dff8de562f81fbd223e80665c65

data/.gdc-ii-config.yaml

@@ -15,3 +15,7 @@ integratedTests:
     repo_mount_dir: /src
     microservices:
       - lcm-bricks
+
+configFilesForUpdate:
+  - '.gdc-ii-config.yaml'
+  - '.gdc-ii-config-chart.yaml'

data/.travis.yml

@@ -256,7 +256,7 @@ jobs:
     script: bundle exec rake test:unit
     os: osx
     osx_image: xcode9.3
-    rvm: 2.4
+    rvm: 2.4.3
 
   - name: unit tests 2.5
     stage: after-merge

data/CHANGELOG.md

@@ -1,4 +1,14 @@
 # GoodData Ruby SDK Changelog
+## 2.1.5
+ - BUGFIX: TMA-1534 LCM Dynamic Params do not work correctly for secure params
+ - BUGFIX: TMA-1520 fix NPE when given client does not exist in data product
+ - BUGFIX: TMA-1361 Allow user see all values of one label when set MUF on multiple labels
+ - BUGFIX: TMA-1521 update datasource payload to new json format
+ - BUGFIX: TMA-1506 fixing unit tests 2.4 failed on xcode9.3
+ - II-371: Handle multitple configuration files
+ - FEATURE: TMA-1275 release bricks 3.7.2
+ - Bump version to 2.1.4
+
 ## 2.1.4
  - BUGFIX: TMA-906 LCM Rollout/Provisioning does not set dynamic params in case apply for all schedules on client
  - BUGFIX: TMA-1519 Add limit param when get all projects

data/SDK_VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/VERSION

@@ -1 +1 @@
-3.7.2
+3.7.3

data/lib/gooddata/helpers/global_helpers.rb

@@ -230,6 +230,17 @@ module GoodData
         Base64.encode64(random_iv + encrypted)
       end
 
+      # Simple encrypt data with given key
+      def simple_encrypt(data, key)
+        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher.encrypt
+        cipher.key = key
+        encrypted = cipher.update(data)
+        encrypted << cipher.final
+
+        Base64.encode64(encrypted)
+      end
+
       def decrypt(database64, key)
         if key.nil? || key.empty?
           GoodData.logger.warn('WARNING: No encryption key provided.')
@@ -248,6 +259,23 @@ module GoodData
         decrypted << cipher.final
         decrypted
       end
+
+      # Simple decrypt data with given key
+      def simple_decrypt(database64, key)
+        if key.nil? || key.empty?
+          GoodData.logger.warn('WARNING: No encryption key provided.')
+          return 'no_key_provided'
+        end
+
+        data = Base64.decode64(database64)
+
+        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher.decrypt
+        cipher.key = key
+        decrypted = cipher.update(data)
+        decrypted << cipher.final
+        decrypted
+      end
     end
   end
 

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

@@ -29,6 +29,9 @@ module GoodData
 
         description 'Should the param be hidden?'
         param :param_secure_column, instance_of(Type::StringType), required: false
+
+        description 'Dynamic params encryption key'
+        param :dynamic_params_encryption_key, instance_of(Type::StringType), required: false
       end
 
       class << self
@@ -40,6 +43,10 @@ module GoodData
           param_name_column = params.param_name_column || 'param_name'
           param_value_column = params.param_value_column || 'param_value'
           param_secure_column = params.param_secure_column || 'param_secure'
+
+          encryption_key = params.dynamic_params_encryption_key || ''
+          exist_encryption_key = encryption_key.blank? ? false : true
+
           results = []
 
           input_source = params.dynamic_params.input_source
@@ -49,9 +56,14 @@ module GoodData
           end
 
           schedule_params = {}
+          schedule_hidden_params = {}
+          exist_param_secure = false
 
           CSV.foreach(input_data, :headers => true, :return_headers => false, encoding: 'utf-8') do |row|
             is_param_secure = row[param_secure_column] == 'true'
+            is_decrypt_secure_value = is_param_secure && exist_encryption_key ? true : false
+            exist_param_secure = true if is_param_secure
+
             safe_to_print_row = row.to_hash
             safe_to_print_row[param_value_column] = '******' if is_param_secure
             GoodData.logger.debug("Processing row: #{safe_to_print_row}")
@@ -63,19 +75,31 @@ module GoodData
             schedule_title_column_value = row[schedule_title_column]
             schedule_name = schedule_title_column_value.blank? ? :all_schedules : schedule_title_column_value
 
-            schedule_params[client_id] ||= {}
-            schedule_params[client_id][schedule_name] ||= {}
+            param_name = row[param_name_column]
+            param_value = row[param_value_column]
+            param_value = GoodData::Helpers.simple_decrypt(param_value, encryption_key) if is_decrypt_secure_value
 
-            schedule_params[client_id][schedule_name].merge!(row[param_name_column] => row[param_value_column])
+            add_dynamic_param(is_param_secure ? schedule_hidden_params : schedule_params, client_id, schedule_name, param_name, param_value)
           end
 
+          GoodData.logger.warn("dynamic_params_encryption_key parameter doesn't exist") if exist_param_secure && !exist_encryption_key
+
           {
             results: results,
             params: {
-              schedule_params: schedule_params
+              schedule_params: schedule_params,
+              schedule_hidden_params: schedule_hidden_params
             }
           }
         end
+
+        private
+
+        def add_dynamic_param(params, client_id, schedule_name, param_name, param_value)
+          params[client_id] ||= {}
+          params[client_id][schedule_name] ||= {}
+          params[client_id][schedule_name].merge!(param_name => param_value)
+        end
       end
     end
   end

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

@@ -33,6 +33,9 @@ module GoodData
         description 'Schedule Parameters'
         param :schedule_params, instance_of(Type::HashType), required: false, default: {}
 
+        description 'Schedule Hidden Parameters'
+        param :schedule_hidden_params, instance_of(Type::HashType), required: false, default: {}
+
         description 'DataProduct to manage'
         param :data_product, instance_of(Type::GDDataProductType), required: false
 
@@ -98,10 +101,16 @@ module GoodData
           end
 
           delete_extra_process_schedule = GoodData::Helpers.to_boolean(params.delete_extra_process_schedule)
+
           schedule_params = params.schedule_params || {}
+          schedule_hidden_params = params.schedule_hidden_params || {}
+
           params_for_all_projects = schedule_params[:all_clients] || {}
           params_for_all_schedules_in_all_projects = params_for_all_projects[:all_schedules]
 
+          hidden_params_for_all_projects = schedule_hidden_params[:all_clients] || {}
+          hidden_params_for_all_schedules_in_all_projects = hidden_params_for_all_projects[:all_schedules]
+
           params.synchronize.peach do |info|
             from_project_etl_names = get_process_n_schedule_names(client, info.from) if delete_extra_process_schedule
 
@@ -122,9 +131,13 @@ module GoodData
               end
 
               client_id = entry[:client_id]
+
               params_for_this_client = schedule_params[client_id] || {}
               params_for_all_schedules_in_this_client = params_for_this_client[:all_schedules]
 
+              hidden_params_for_this_client = schedule_hidden_params[client_id] || {}
+              hidden_params_for_all_schedules_in_this_client = hidden_params_for_this_client[:all_schedules]
+
               to_project.set_metadata('GOODOT_CUSTOM_PROJECT_ID', client_id) # TMA-210
 
               to_project.schedules.each do |schedule|
@@ -136,13 +149,17 @@ module GoodData
                 end
 
                 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_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_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
+                schedule.update_hidden_params(hidden_params_for_all_projects[schedule.name]) if hidden_params_for_all_projects[schedule.name]
+                schedule.update_hidden_params(hidden_params_for_all_schedules_in_this_client) if hidden_params_for_all_schedules_in_this_client
+                schedule.update_hidden_params(hidden_params_for_this_client[schedule.name]) if hidden_params_for_this_client[schedule.name]
+
                 schedule.enable
                 schedule.save
               end

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

@@ -262,6 +262,8 @@ module GoodData
                         fail "Client id cannot be empty" if client_id.blank?
 
                         c = domain_clients.detect { |specific_client| specific_client.id == client_id }
+                        fail "The client \"#{client_id}\" does not exist in data product \"#{data_product.data_product_id}\"" if c.nil?
+
                         if params.segments && !segment_uris.include?(c.segment_uri)
                           GoodData.logger.info("Client #{client_id} is outside segments_filter #{params.segments}")
                           next

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

@@ -199,6 +199,16 @@ module GoodData
       attr_cache
     end
 
+    def self.create_muf_expression_cache(filters)
+      filters.reduce({}) do |a, e|
+        a[e[:login]] = e[:filters].reduce({}) do |h, filter|
+          h[filter[:label]] = :none
+          h
+        end
+        a
+      end
+    end
+
     # Walks over provided labels and picks those that have fewer than certain amount of values
     # This tries to balance for speed when working with small datasets (like users)
     # so it precaches the values and still be able to function for larger ones even
@@ -215,6 +225,7 @@ module GoodData
       values = filter[:values]
       label = labels_cache[filter[:label]]
       errors = []
+      muf_expression_cache = options[:muf_expression_cache]
 
       element_uris_by_values = Hash[values.map do |v|
         if lookups_cache.key?(label.uri)
@@ -238,12 +249,17 @@ module GoodData
       # 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
+      expression = if no_values && options[:restrict_if_missing_all_values]
                      # 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'
+                       muf_expression_cache[filter[:label]] = :all
+                       if muf_expression_cache.value?(:none) || muf_expression_cache.value?(:restrict)
+                         'TRUE'
+                       else
+                         '1 <> 1'
+                       end
                      when :variable
                        nil
                      end
@@ -251,13 +267,14 @@ module GoodData
                      # create a filter that is always true to ensure the user can see all data
                      'TRUE'
                    elsif filter[:over] && filter[:to]
+                     muf_expression_cache[filter[:label]] = :restrict
                      over = attr_cache[filter[:over]]
                      to = attr_cache[filter[:to]]
                      "([#{label.attribute_uri}] IN (#{element_uris.sort.map { |e| '[' + e + ']' }.join(', ')})) OVER [#{over && over.uri}] TO [#{to && to.uri}]"
                    else
+                     muf_expression_cache[filter[:label]] = :restrict
                      "[#{label.attribute_uri}] IN (#{element_uris.sort.map { |e| '[' + e + ']' }.join(', ')})"
                    end
-
       [expression, errors]
     end
 
@@ -288,8 +305,9 @@ module GoodData
       small_labels = get_small_labels(labels_cache)
       lookups_cache = create_lookups_cache(small_labels)
       attrs_cache = create_attrs_cache(filters, options)
+      muf_expression_cache = create_muf_expression_cache(filters)
       create_filter_proc = proc do |login, f|
-        expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
+        expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options.merge(muf_expression_cache: muf_expression_cache[login]))
         safe_login = login.downcase
         profiles_uri = if options[:type] == :muf
                          project_user = project_users.find { |u| u.login == safe_login }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement