gooddata 2.1.14-java → 2.2.0-java

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

@@ -12,6 +12,21 @@ module GoodData
 
       class << self
         def latest_master_project_from_ads(release_table_name, ads_client, segment_id)
+          sorted = get_master_project_list_from_ads(release_table_name, ads_client, segment_id)
+          sorted.last
+        end
+
+        def latest_master_project_from_nfs(domain_id, data_product_id, segment_id)
+          file_path = path_to_release_table_file(domain_id, data_product_id, segment_id)
+          sorted = get_master_project_list_from_nfs(domain_id, data_product_id, segment_id)
+          latest_master_project = sorted.last
+
+          version_info = latest_master_project ? "master_pid=#{latest_master_project[:master_project_id]} version=#{latest_master_project[:version]}" : ""
+          GoodData.gd_logger.info "Getting latest master project: file=#{file_path} domain=#{domain_id} data_product=#{data_product_id} segment=#{segment_id} #{version_info}"
+          latest_master_project
+        end
+
+        def get_master_project_list_from_ads(release_table_name, ads_client, segment_id)
           replacements = {
             table_name: release_table_name || DEFAULT_TABLE_NAME,
             segment_id: segment_id
@@ -22,18 +37,27 @@ module GoodData
 
           res = ads_client.execute_select(query)
           sorted = res.sort_by { |row| row[:version] }
-          sorted.last
+          sorted
         end
 
-        def latest_master_project_from_nfs(domain_id, data_product_id, segment_id)
+        def delete_master_project_from_ads(release_table_name, ads_client, segment_id, removal_master_project_ids)
+          replacements = {
+            table_name: release_table_name || DEFAULT_TABLE_NAME,
+            segment_id: segment_id,
+            master_project_ids: removal_master_project_ids.map { |x| "'#{x}'" } * ', '
+          }
+
+          path = File.expand_path('../data/delete_from_lcm_release.sql.erb', __dir__)
+          query = GoodData::Helpers::ErbHelper.template_file(path, replacements)
+
+          ads_client.execute(query)
+        end
+
+        def get_master_project_list_from_nfs(domain_id, data_product_id, segment_id)
           file_path = path_to_release_table_file(domain_id, data_product_id, segment_id)
           data = GoodData::Helpers::Csv.read_as_hash(file_path)
-          latest_master_project = data.sort_by { |master| master[:version] }
-              .reverse.first
-
-          version_info = latest_master_project ? "master_pid=#{latest_master_project[:master_project_id]} version=#{latest_master_project[:version]}" : ""
-          GoodData.gd_logger.info "Getting latest master project: file=#{file_path} domain=#{domain_id} data_product=#{data_product_id} segment=#{segment_id} #{version_info}"
-          latest_master_project
+          sorted = data.sort_by { |master| master[:version] }
+          sorted
         end
 
         def update_latest_master_to_nfs(domain_id, data_product_id, segment_id, master_pid, version)
@@ -46,6 +70,16 @@ module GoodData
           )
         end
 
+        def update_master_project_to_nfs(domain_id, data_product_id, segment_id, data)
+          file_path = path_to_release_table_file(domain_id, data_product_id, segment_id)
+          FileUtils.mkpath(file_path.split('/')[0...-1].join('/'))
+          CSV.open(file_path, 'w', write_headers: true, headers: data.first.keys) do |csv|
+            data.each do |r|
+              csv << r.values
+            end
+          end
+        end
+
         def path_to_release_table_file(domain_id, data_prod_id, segment_id)
           nsf_directory = ENV['RELEASE_TABLE_NFS_DIRECTORY'] || DEFAULT_NFS_DIRECTORY
           [nsf_directory, domain_id, data_prod_id + '-' + segment_id + '.csv'].join('/')

data/lib/gooddata/lcm/lcm2.rb

@@ -13,8 +13,6 @@ 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 'dsl/dsl'
 require_relative 'helpers/helpers'
@@ -98,6 +96,7 @@ module GoodData
         CollectComputedAttributeMetrics,
         ImportObjectCollections,
         SynchronizeComputedAttributes,
+        SynchronizeDataSetMapping,
         SynchronizeProcesses,
         SynchronizeSchedules,
         SynchronizeColorPalette,
@@ -124,9 +123,11 @@ module GoodData
         AssociateClients,
         RenameExistingClientProjects,
         ProvisionClients,
+        UpdateMetricFormats,
         EnsureTechnicalUsersDomain,
         EnsureTechnicalUsersProject,
         CollectDymanicScheduleParams,
+        SynchronizeDataSetMapping,
         SynchronizeETLsInSegment
       ],
 
@@ -138,8 +139,10 @@ module GoodData
         EnsureTechnicalUsersDomain,
         EnsureTechnicalUsersProject,
         SynchronizeLdm,
+        SynchronizeDataSetMapping,
         MigrateGdcDateDimension,
         SynchronizeClients,
+        UpdateMetricFormats,
         SynchronizeComputedAttributes,
         CollectDymanicScheduleParams,
         SynchronizeETLsInSegment

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

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

data/lib/gooddata/mixins/md_object_query.rb

@@ -1,12 +1,14 @@
 # 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.
 
 module GoodData
   module Mixin
     module MdObjectQuery
+      ERROR_MESSAGE_NO_PROJECT = 'No :project specified'
+
       # Method intended to get all objects of that type in a specified project
       #
       # @param options [Hash] the options hash
@@ -38,7 +40,7 @@ module GoodData
         fail ArgumentError, 'No :client specified' if client.nil?
 
         p = options[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
+        fail ArgumentError, ERROR_MESSAGE_NO_PROJECT if p.nil?
 
         project = GoodData::Project[p, options]
         fail ArgumentError, 'Wrong :project specified' if project.nil?
@@ -52,6 +54,7 @@ module GoodData
               y << (klass ? client.create(klass, item, project: project) : item)
             end
             break if result['objects']['paging']['count'] < page_limit
+
             offset += page_limit
           end
         end
@@ -98,10 +101,10 @@ module GoodData
       # Returns which objects uses this MD resource
       def usedby(uri, key = nil, opts = { :client => GoodData.connection, :project => GoodData.project })
         p = opts[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
+        fail ArgumentError, ERROR_MESSAGE_NO_PROJECT if p.nil?
 
         project = GoodData::Project[p, opts]
-        fail ArgumentError, 'No :project specified' if project.nil?
+        fail ArgumentError, ERROR_MESSAGE_NO_PROJECT if project.nil?
 
         dependency("#{project.md['usedby2']}/#{uri_obj_id(uri)}", key, opts)
       end
@@ -111,10 +114,10 @@ module GoodData
       # Returns which objects this MD resource uses
       def using(uri, key = nil, opts = { :client => GoodData.connection, :project => GoodData.project })
         p = opts[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
+        fail ArgumentError, ERROR_MESSAGE_NO_PROJECT if p.nil?
 
         project = GoodData::Project[p, opts]
-        fail ArgumentError, 'No :project specified' if project.nil?
+        fail ArgumentError, ERROR_MESSAGE_NO_PROJECT if project.nil?
 
         dependency("#{project.md['using2']}/#{uri_obj_id(uri)}", key, opts)
       end

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

@@ -2,8 +2,6 @@
 # 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

data/lib/gooddata/models/client.rb

@@ -40,20 +40,22 @@ module GoodData
         if id == :all
           tenants_uri = base_uri(domain, data_product)
           tenants_uri += "?segment=#{CGI.escape(segment.segment_id)}" if segment
-          Enumerator.new do |y|
-            loop do
-              res = client.get tenants_uri
-              res['clients']['paging']['next']
-              res['clients']['items'].each do |i|
-                p = i['client']['project']
-                tenant = client.create(GoodData::Client, i.merge('domain' => domain))
-                tenant.project = p
-                y << tenant
-              end
-              url = res['clients']['paging']['next']
-              break unless url
+
+          all_clients = []
+          loop do
+            res = client.get tenants_uri
+            res['clients']['paging']['next']
+            res['clients']['items'].each do |i|
+              p = i['client']['project']
+              tenant = client.create(GoodData::Client, i.merge('domain' => domain))
+              tenant.project = p
+              all_clients << tenant
             end
+            url = res['clients']['paging']['next']
+            break unless url
           end
+
+          all_clients
         else
           id = id.respond_to?(:client_id) ? id.client_id : id
           tenant_uri = base_uri(domain, data_product)