gooddata 2.1.12-java → 2.1.19-java

data/lib/gooddata/commands/scaffold.rb

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-require 'erubis'
+require 'erb'
 require 'fileutils'
 require 'pathname'
 
@@ -18,15 +18,14 @@ module GoodData
         # TODO: Add option for custom output dir
         def project(name)
           fail ArgumentError, 'No name specified' if name.nil?
-
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             FileUtils.mkdir('model')
             FileUtils.cd('model') do
               input = File.read(TEMPLATES_PATH + 'project/model/model.rb.erb')
-              eruby = Erubis::Eruby.new(input)
+              erb = ERB.new(input)
               File.open('model.rb', 'w') do |f|
-                f.write(eruby.result(:name => name))
+                f.write(erb.result_with_hash(:name => name))
               end
             end
 
@@ -36,9 +35,9 @@ module GoodData
             end
 
             input = File.read(TEMPLATES_PATH + 'project/Goodfile.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('Goodfile', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end
@@ -51,15 +50,15 @@ module GoodData
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             input = File.read(TEMPLATES_PATH + 'bricks/brick.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('brick.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
 
             input = File.read(TEMPLATES_PATH + 'bricks/main.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('main.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end

data/lib/gooddata/core/nil_logger.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# frozen_string_literal: true
+# Copyright (c) 2010-2021 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.
 
@@ -11,6 +12,7 @@ module GoodData
       @level = nil
     end
 
+    # No body define need for dummy logger
     def debug(*_args)
     end
 

data/lib/gooddata/helpers/data_helper.rb

@@ -44,9 +44,8 @@ module GoodData
           realize_link
         when 's3'
           realize_s3(params)
-        when 'redshift', 'snowflake', 'bigquery'
+        when 'redshift', 'snowflake', 'bigquery', 'postgresql'
           raise GoodData::InvalidEnvError, "DataSource does not support type \"#{source}\" on the platform #{RUBY_PLATFORM}" unless RUBY_PLATFORM =~ /java/
-
           require_relative '../cloud_resources/cloud_resources'
           realize_cloud_resource(source, params)
         else

data/lib/gooddata/helpers/global_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2021 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.
 
@@ -34,6 +34,7 @@ module GoodData
     end
 
     set_const :GD_MAX_RETRY, (ENV['GD_MAX_RETRY'] && ENV['GD_MAX_RETRY'].to_i) || 12
+    AES_256_CBC_CIPHER = 'aes-256-cbc'
 
     class << self
       def error(msg)
@@ -222,7 +223,7 @@ module GoodData
       # encrypts data with the given key. returns a binary data with the
       # unhashed random iv in the first 16 bytes
       def encrypt(data, key)
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.encrypt
         cipher.key = key = Digest::SHA256.digest(key)
         random_iv = cipher.random_iv
@@ -236,7 +237,7 @@ module GoodData
 
       # Simple encrypt data with given key
       def simple_encrypt(data, key)
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.encrypt
         cipher.key = key
         encrypted = cipher.update(data)
@@ -253,7 +254,7 @@ module GoodData
 
         data = Base64.decode64(database64)
 
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.decrypt
         cipher.key = cipher_key = Digest::SHA256.digest(key)
         random_iv = data[0..15] # extract iv from first 16 bytes
@@ -273,7 +274,7 @@ module GoodData
 
         data = Base64.decode64(database64)
 
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.decrypt
         cipher.key = key
         decrypted = cipher.update(data)

data/lib/gooddata/helpers/global_helpers_params.rb

@@ -242,7 +242,7 @@ module GoodData
 
       def resolve_reference_params(data_params, params)
         reference_values = []
-        regexps = Regexp.union(/\\\\/, /\\\$/, /\$\{(\w+)\}/)
+        regexps = Regexp.union(/\\\\/, /\\\$/, /\$\{([^\n\{\}]+)\}/)
         resolve_reference = lambda do |v|
           if v.is_a? Hash
             Hash[
@@ -262,7 +262,7 @@ module GoodData
                 data_params.is_a?(Hash) ? '\\' : '\\\\' # rubocop: disable Metrics/BlockNesting
               elsif match =~ /\\\$/
                 '$'
-              elsif match =~ /\$\{(\w+)\}/
+              elsif match =~ /\$\{([^\n\{\}]+)\}/
                 val = params["#{$1}"]
                 if val
                   reference_values << val

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

@@ -43,7 +43,7 @@ module GoodData
       RESULT_HEADER = [
         :id,
         :status,
-        :originalProject,
+        :project,
         :client,
         :type
       ]
@@ -102,7 +102,13 @@ module GoodData
           options = { delete_projects: delete_projects }
           options.merge!(delete_extra_option(params, delete_extra)) if delete_extra
 
-          domain.update_clients(params.clients, options)
+          results = domain.update_clients(params.clients, options)
+          # Update status to CREATED if the client has no project
+          results&.each do |r|
+            r[:status] = 'CREATED' if r[:originalProject].nil?
+            r[:project] = r[:originalProject]
+          end
+          results
         end
 
         private

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

@@ -8,8 +8,6 @@ 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'
 require_relative '../types/types'

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

@@ -50,7 +50,8 @@ module GoodData
             if transfer_all
               vizs = MdObject.query('visualizationObject', MdObject, client: development_client, project: from_project)
               viz_widgets = MdObject.query('visualizationWidget', MdObject, client: development_client, project: from_project)
-              objects = (from_project.reports.to_a + from_project.metrics.to_a + from_project.variables.to_a + vizs.to_a + viz_widgets.to_a).map(&:uri)
+              theme = MdObject.query('theme', MdObject, client: development_client, project: from_project)
+              objects = (from_project.reports.to_a + from_project.metrics.to_a + from_project.variables.to_a + vizs.to_a + viz_widgets.to_a + theme.to_a).map(&:uri)
             elsif production_tags.any?
               objects = from_project.find_by_tag(production_tags)
             end

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

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+# (C) 2019-2020 GoodData Corporation
+require_relative 'base_action'
+
+# Migrate date dimension urn:gooddata:date or urn:custom:date to urn:custom_v2:date
+module GoodData
+  module LCM2
+    class MigrateGdcDateDimension < BaseAction
+      DESCRIPTION = 'Migrate Gdc Date Dimension'
+      DATE_DIMENSION_CUSTOM_V2 = 'urn:custom_v2:date'
+      DATE_DIMENSION_OLD = %w[urn:gooddata:date urn:custom:date]
+
+      PARAMS = define_params(self) do
+        description 'Client Used for Connecting to GD'
+        param :gdc_gd_client, instance_of(Type::GdClientType), required: true
+
+        description 'Specifies how to synchronize LDM and resolve possible conflicts'
+        param :synchronize_ldm, instance_of(Type::SynchronizeLDM), required: false, default: 'diff_against_master_with_fallback'
+
+        description 'Synchronization Info'
+        param :synchronize, array_of(instance_of(Type::SynchronizationInfoType)), required: true, generated: true
+      end
+
+      RESULT_HEADER = %i[from to status]
+
+      class << self
+        def call(params)
+          results = []
+          params.synchronize.map do |segment_info|
+            result = migrate_date_dimension(params, segment_info)
+            results.concat(result)
+          end
+
+          {
+            results: results
+          }
+        end
+
+        def migrate_date_dimension(params, segment_info)
+          results = []
+          client = params.gdc_gd_client
+          latest_blueprint = segment_info[:from_blueprint]
+          # don't migrate when latest master doesn't contain custom v2 date.
+          return results unless contain_v2?(latest_blueprint)
+
+          previous_blueprint = segment_info[:previous_master]&.blueprint
+          # check latest master and previous master
+          master_upgrade_datasets = get_upgrade_dates(latest_blueprint, previous_blueprint) if params[:synchronize_ldm].downcase == 'diff_against_master' && previous_blueprint
+          unless master_upgrade_datasets&.empty?
+            segment_info[:to].pmap do |entry|
+              pid = entry[:pid]
+              to_project = client.projects(pid) || fail("Invalid 'to' project specified - '#{pid}'")
+              to_blueprint = to_project.blueprint
+              upgrade_datasets = get_upgrade_dates(latest_blueprint, to_blueprint)
+              next if upgrade_datasets.empty?
+
+              message = get_upgrade_message(upgrade_datasets)
+
+              results << {
+                from: segment_info[:from],
+                to: pid,
+                status: to_project.upgrade_custom_v2(message)
+              }
+            end
+          end
+
+          results
+        end
+
+        def get_upgrade_dates(src_blueprint, dest_blueprint)
+          dest_dates = get_date_dimensions(dest_blueprint) if dest_blueprint
+          src_dates = get_date_dimensions(src_blueprint) if src_blueprint
+
+          return false if dest_dates.empty? || src_dates.empty?
+
+          upgrade_datasets = []
+          dest_dates.each do |dest|
+            src_dim = get_date_dimension(src_blueprint, dest[:id])
+            next unless src_dim
+
+            upgrade_datasets << src_dim[:identifier] if upgrade?(src_dim, dest) && src_dim[:identifier]
+          end
+
+          upgrade_datasets
+        end
+
+        def get_upgrade_message(upgrade_datasets)
+          {
+            upgrade: {
+              dateDatasets: {
+                upgrade: "exact",
+                datasets: upgrade_datasets
+              }
+            }
+          }
+        end
+
+        def upgrade?(src_dim, dest_dim)
+          src_dim[:urn] == DATE_DIMENSION_CUSTOM_V2 && DATE_DIMENSION_OLD.any? { |e| dest_dim[:urn] == e }
+        end
+
+        def contain_v2?(blueprint)
+          get_date_dimensions(blueprint).any? { |e| e[:urn] == DATE_DIMENSION_CUSTOM_V2 }
+        end
+
+        def get_date_dimension(blueprint, id)
+          GoodData::Model::ProjectBlueprint.find_date_dimension(blueprint, id)
+        end
+
+        def get_date_dimensions(blueprint)
+          GoodData::Model::ProjectBlueprint.date_dimensions(blueprint)
+        end
+      end
+    end
+  end
+end

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

@@ -48,7 +48,8 @@ module GoodData
           domain_name = params.organization || params.domain
           fail "Either organisation or domain has to be specified in params" unless domain_name
           domain = client.domain(domain_name) || fail("Invalid domain name specified - #{domain_name}")
-
+          error_message = nil
+          invalid_client_ids = []
           begin
             results = params.segments.map do |segment|
               segment_object = domain.segments(segment.segment_id, data_product)
@@ -57,33 +58,53 @@ module GoodData
               end
 
               unless tmp.empty?
-                synchronize_projects << {
+                synchronize_project = {
                   segment_id: segment.segment_id,
                   from: segment.development_pid,
                   to: tmp.map do |entry|
                     unless entry[:project_uri]
-                      raise "Provisioning project for client id #{entry[:id]} has error: #{entry[:error]}"
+                      error_message = "There was error during provisioning clients: #{entry[:error]}" unless error_message
+                      invalid_client_ids << entry[:id]
+                      next
                     end
                     {
                       pid: entry[:project_uri].split('/').last,
                       client_id: entry[:id]
                     }
-                  end
+                  end.compact
                 }
+
+                synchronize_projects << synchronize_project unless synchronize_project[:to].empty?
+              end
+
+              if error_message
+                params.gdc_logger.debug "#{error_message}. Purge all invalid clients now ..."
+                deleted_client_ids = []
+
+                segment_object.clients.map do |segment_client|
+                  project = segment_client.project
+                  if (project.nil? || project.deleted?)
+                    client_id =  segment_client.client_id
+                    if invalid_client_ids.include?(client_id)
+                      segment_client.delete
+                      deleted_client_ids << client_id
+                    end
+                  end
+                end
+
+                params.gdc_logger.debug "Deleted clients: #{deleted_client_ids.join(', ')}"
+                raise error_message unless error_message['TooManyProjectsCreatedException'] || error_message['Max number registered projects']
+                break tmp
               end
 
               tmp
             end
           rescue => e
-            params.gdc_logger.error "Problem occurs when provisioning clients. Purge all invalid clients now ..."
-            res = LCM2.run_action PurgeClients, params
-            params.gdc_logger.debug "Purge clients result: #{res}"
-            deleted_client_ids = res[:results].select { |r| r[:status] == 'purged' }.map { |r| r[:client_id] }
-            params.gdc_logger.error "Deleted clients: #{deleted_client_ids.join(', ')}"
+            params.gdc_logger.error "Problem occurs when provisioning clients."
             raise e
           end
 
-          results.flatten!
+          results.flatten! if results
 
           # Return results
           {

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

@@ -49,6 +49,8 @@ module GoodData
         param :include_deprecated, instance_of(Type::BooleanType), required: false, default: false
       end
 
+      RESULT_HEADER = %i[from to status]
+
       class << self
         def call(params)
           results = []
@@ -76,9 +78,9 @@ module GoodData
           include_deprecated = params.include_deprecated.to_b
           from_pid = segment_info[:from]
           from = params.development_client.projects(from_pid) || fail("Invalid 'from' project specified - '#{from_pid}'")
-
           GoodData.logger.info "Creating Blueprint, project: '#{from.title}', PID: #{from_pid}"
           blueprint = from.blueprint(include_ca: params.include_computed_attributes.to_b)
+          segment_info[:from_blueprint] = blueprint
           maql_diff = nil
           previous_master = segment_info[:previous_master]
           diff_against_master = %w(diff_against_master_with_fallback diff_against_master)

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

@@ -167,6 +167,10 @@ module GoodData
               fail "Client id cannot be empty" if client_id.blank?
 
               c = all_clients.detect { |specific_client| specific_client.id == client_id }
+              if c.nil?
+                params.gdc_logger.warn "Client #{client_id} is not found"
+                next
+              end
               if params.segments && !segment_uris.include?(c.segment_uri)
                 params.gdc_logger.warn "Client #{client_id} is outside segments_filter #{params.segments}"
                 next

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

@@ -182,11 +182,11 @@ module GoodData
           #     value of a project id in the data since he does not know it upfront
           #     and we cannot influence its value.
           common_params = {
-            domain: domain, 
-            whitelists: whitelists,  
-            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,  
+            domain: domain,
+            whitelists: whitelists,
+            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,
             user_groups_cache: nil
           }
@@ -198,7 +198,8 @@ module GoodData
                       domain.create_users(new_users.uniq { |u| u[:login] || u[:email] })
                     when 'remove_from_organization'
                       user_ids = new_users.uniq { |u| u[:login] || u[:email] }.map { |u| u[:login] || u[:email] }
-                      users = user_ids.map { |u| domain.users(u, client: client) }
+                      users = user_ids.map { |u| domain.users(u, client: client) }.reject(&:nil?)
+                      params.gdc_logger.info "#{user_ids.count - users.count} users were not found (or were deleted) in domain #{domain_name}" if user_ids.count > users.count
                       params.gdc_logger.warn "Deleting #{users.count} users from domain #{domain_name}"
 
                       GoodData.gd_logger.info("Synchronizing in mode=#{mode}, domain=#{domain_name}, data_rows=#{users.count}")