gooddata 0.6.51 → 0.6.52

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

@@ -20,9 +20,6 @@ module GoodData
 
       class << self
         def call(params)
-          # Check if all required parameters were passed
-          BaseAction.check_params(PARAMS, params)
-
           client = params.gdc_gd_client
 
           domain_name = params.organization || params.domain

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

@@ -0,0 +1,35 @@
+# 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
+  module LCM2
+    class Helpers
+      class << self
+        # @param Array of segments as in release brick parameters
+        # @return Hash of segments and production tags
+        # @example { { segment: 'tag1, tag1' } }
+        def segment_production_tags(segments)
+          return {} unless segments
+          segments
+            .reject { |s| s.production_tag.nil? }
+            .map { |s| [s.segment_id, s.production_tag] }
+            .to_h
+        end
+
+        # @param production_tags Global production tags
+        # @param segment_production_tags Segment-specific production tags
+        # @return Array of production tags
+        # @example ['tag1', 'tag2']
+        def parse_production_tags(production_tags, segment_production_tags)
+          separator = ','
+          tags = segment_production_tags || production_tags
+          return [] unless tags
+          tags.split(separator).map(&:strip)
+        end
+      end
+    end
+  end
+end

data/lib/gooddata/lcm/lcm.rb

@@ -259,20 +259,22 @@ module GoodData
         attributes = source_project.attributes
 
         # Generate transfer table
-        drill_paths = attributes.map do |attribute|
+        drill_paths = attributes.pmap do |attribute|
           drill_label_uri = attribute.content['drillDownStepAttributeDF']
           if drill_label_uri
             drill_label = source_project.labels(drill_label_uri)
-            [attribute.meta['identifier'], drill_label.identifier]
+            [attribute.uri, attribute.meta['identifier'], drill_label_uri, drill_label.identifier]
           else
             []
           end
         end
-        transfer = Hash[*drill_paths.flatten].compact
+        drill_paths.reject!(&:empty?)
 
         # Transfer to target projects
         targets.peach do |target|
-          transfer.peach do |attr_identifier, drill_path_identifier|
+          drill_paths.peach do |drill_path_info|
+            src_attr_uri, attr_identifier, drill_label_uri, drill_path_identifier = drill_path_info
+
             attr_uri = GoodData::MdObject.identifier_to_uri({ project: target, client: target.client }, attr_identifier)
             next unless attr_uri
 
@@ -284,6 +286,22 @@ module GoodData
 
               if !attribute.content['drillDownStepAttributeDF'] || attribute.content['drillDownStepAttributeDF'] != drill_path
                 semaphore.synchronize do
+                  GoodData.logger.debug <<-DEBUG
+Transfer from:
+{
+  attr_uri: #{src_attr_uri},
+  attr_identifier: #{attr_identifier},
+  drill_label_uri: #{drill_label_uri},
+  drill_label_identifier: #{drill_path_identifier}
+}
+To:
+{
+  attr_uri: #{attr_uri},
+  attr_identifier: #{attr_identifier},
+  drill_label_uri: #{drill_path},
+  drill_label_identifier: #{drill_path_identifier}
+}
+DEBUG
                   GoodData.logger.info "Updating drill path of #{attr_identifier} -> #{drill_path} in '#{target.title}'"
                 end
 

data/lib/gooddata/lcm/lcm2.rb

@@ -85,9 +85,12 @@ module GoodData
         EnsureTechnicalUsersDomain,
         EnsureTechnicalUsersProject,
         SynchronizeLdm,
-        SynchronizeMeta,
-        SynchronizeLabelTypes,
-        SynchronizeAttributeDrillpath,
+        CollectAttributes,
+        CollectMeta,
+        CollectTaggedObjects,
+        CollectComputedAttributeMetrics,
+        ImportObjectCollections,
+        SynchronizeComputedAttributes,
         SynchronizeProcesses,
         SynchronizeSchedules,
         SynchronizeColorPalette,
@@ -98,31 +101,25 @@ module GoodData
       provision: [
         EnsureReleaseTable,
         CollectSegments,
-        SegmentsFilter,
         PurgeClients,
         CollectClients,
         AssociateClients,
         ProvisionClients,
         EnsureTechnicalUsersDomain,
         EnsureTechnicalUsersProject,
-        SynchronizeAttributeDrillpath,
-        SynchronizeETLsInSegment,
-        SynchronizeColorPalette
+        SynchronizeETLsInSegment
       ],
 
       rollout: [
         EnsureReleaseTable,
         CollectSegments,
-        SegmentsFilter,
         CollectSegmentClients,
         EnsureTechnicalUsersDomain,
         EnsureTechnicalUsersProject,
         SynchronizeLdm,
-        # SynchronizeLabelTypes,
-        SynchronizeAttributeDrillpath,
         ApplyCustomMaql,
-        SynchronizeColorPalette,
         SynchronizeClients,
+        SynchronizeComputedAttributes,
         SynchronizeETLsInSegment
       ]
     }
@@ -198,6 +195,10 @@ module GoodData
         headings = keys.map(&:upcase)
 
         rows = messages && messages.map do |message|
+          unless message
+            GoodData.logger.warn("Found an empty message in the results of the #{action.name} action")
+            next
+          end
           row = []
           keys.each do |heading|
             row << message[heading]
@@ -206,10 +207,11 @@ module GoodData
         end
 
         rows ||= []
+        rows.compact!
 
         table = Terminal::Table.new :title => title, :headings => headings do |t|
           rows.each_with_index do |row, index|
-            t << row
+            t << (row || [])
             t.add_separator if index < rows.length - 1
           end
         end
@@ -242,6 +244,8 @@ module GoodData
           end
         end
 
+        check_unused_params(actions, params)
+
         # Print name of actions to be performed for debug purposes
         print_action_names(mode, actions)
 
@@ -261,6 +265,11 @@ module GoodData
                         true
                       end
 
+        skip_actions = (params.skip_actions || [])
+        actions = actions.reject do |action|
+          skip_actions.include?(action.to_s)
+        end
+
         # Run actions
         errors = []
         results = []
@@ -269,15 +278,22 @@ module GoodData
 
           # Invoke action
           begin
+            # Check if all required parameters were passed
+            BaseAction.check_params(action.const_get('PARAMS'), params)
+
             out = action.send(:call, params)
           rescue => e
             errors << {
               action: action,
-              err: e
+              err: e,
+              backtrace: e.backtrace
             }
             break if fail_early
           end
 
+          # in case fail_early = false, we need to execute another action
+          next unless out
+
           # Handle output results and params
           res = out.is_a?(Array) ? out : out[:results]
           out_params = out.is_a?(Hash) ? out[:params] || {} : {}
@@ -317,6 +333,43 @@ module GoodData
           params: params
         }
       end
+
+      def check_unused_params(actions, params)
+        default_params = [
+          :client_gdc_hostname,
+          :client_gdc_protocol,
+          :fail_early,
+          :gdc_logger,
+          :gdc_password,
+          :gdc_username,
+          :strict
+        ]
+
+        action_params = actions.map do |action|
+          action.const_get(:PARAMS).keys.map(&:downcase)
+        end
+
+        action_params.flatten!.uniq!
+
+        param_names = params.keys.map(&:downcase)
+
+        unused_params = param_names - (action_params + default_params)
+
+        if unused_params.any?
+          GoodData.logger.warn("Following params are not used by any action: #{JSON.pretty_generate(unused_params)}")
+
+          rows = []
+          actions.each do |action|
+            action_params = action.const_get(:PARAMS)
+            action_params.each do |_k, v|
+              rows << [action.short_name, v[:name], v[:description], v[:type].class.short_name]
+            end
+          end
+
+          table = Terminal::Table.new :headings => ['Action', 'Parameter', 'Description', 'Parameter Type'], :rows => rows
+          puts table.to_s
+        end
+      end
     end
   end
 end

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

@@ -17,7 +17,7 @@ module GoodData
 
         PARAMS = define_type(self) do
           description 'Cascade Drop'
-          param :cascade_drop, instance_of(Type::BooleanType), required: false, default: nil
+          param :cascade_drops, instance_of(Type::BooleanType), required: false, default: nil
 
           description 'Preserve Data'
           param :preserve_data, instance_of(Type::BooleanType), required: false, default: nil

data/lib/gooddata/mixins/md_finders.rb

@@ -37,10 +37,12 @@ module GoodData
         items.pmap { |item| self[item.uri, options] unless item.nil? }
       end
 
-      def find_by_tag(tag, opts = { :client => GoodData.connection, :project => GoodData.project })
+      def find_by_tag(tags, opts = { :client => GoodData.connection, :project => GoodData.project })
         client, project = GoodData.get_client_and_project(opts)
+        tags = tags.split(',').map(&:strip) unless tags.is_a?(Array)
 
-        self[:all, client: client, project: project].select { |r| r.tag_set.include?(tag) }
+        self[:all, client: client, project: project]
+          .select { |r| (r.tag_set & tags).any? }
       end
 
       # Finds a specific type of the object by title. Returns first match. Returns full object.

data/lib/gooddata/mixins/md_object_indexer.rb

@@ -9,12 +9,22 @@ module GoodData
     module MdObjectIndexer
       MD_OBJ_CTG = 'obj'
 
-      # Returns either list of objects or a specific object. This method is reimplemented in subclasses to leverage specific implementation for specific type of objects. Options is used in subclasses specifically to provide shorthand for getting a full objects after getting a list of hashes from query resource
+      # Returns either list of objects or a specific object.
+      # This method is reimplemented in subclasses to leverage specific
+      # implementation for specific type of objects. Options is used in
+      # subclasses specifically to provide shorthand for getting a full
+      # objects after getting a list of hashes from query resource.
       # @param [Object] id id can be either a number a String (as a URI). Subclasses should also be abel to deal with getting the instance of MdObject already and a :all symbol
       # @param [Hash] options the options hash
-      # @option options [Boolean] :full if passed true the subclass can decide to pull in full objects. This is desirable from the usability POV but unfortunately has negative impact on performance so it is not the default
+      # @option options [Boolean] :full if passed true the subclass can decide
+      # to pull in full objects. This is desirable from the usability POV
+      # but unfortunately has negative impact on performance so it is not
+      # the default.
       # @return [MdObject] if id is a String or number single object is returned
-      # @return [Array] if :all was provided as an id, list of objects should be returned. Note that this is implemented only in the subclasses. MdObject does not support this since API has no means to return list of all types of objects
+      # @return [Array] if :all was provided as an id, list of objects should
+      # be returned. Note that this is implemented only in the subclasses.
+      # MdObject does not support this since API has no means to return list
+      # of all types of objects.
       def [](id, options = { :client => GoodData.connection, :project => GoodData.project })
         client, project = GoodData.get_client_and_project(options)
 

data/lib/gooddata/mixins/md_object_query.rb

@@ -10,7 +10,10 @@ module GoodData
       # Method intended to get all objects of that type in a specified project
       #
       # @param options [Hash] the options hash
-      # @option options [Boolean] :full if passed true the subclass can decide to pull in full objects. This is desirable from the usability POV but unfortunately has negative impact on performance so it is not the default
+      # @option options [Boolean] :full if passed true the subclass can decide
+      # to pull in full objects. This is desirable from the usability POV
+      # but unfortunately has negative impact on performance so it is not
+      # the default.
       # @return [Array<GoodData::MdObject> | Array<Hash>] Return the appropriate metadata objects or their representation
       def all(_options = { :client => GoodData.connection, :project => GoodData.project })
         fail NotImplementedError, 'Method should be implemented in subclass. Currently there is no way how to get all metadata objects on API.'
@@ -25,7 +28,10 @@ module GoodData
       # @param query_obj_type [String] string used in URI to distinguish different query resources for different objects
       # @param klass [Class] A class used for instantiating the returned data
       # @param options [Hash] the options hash
-      # @option options [Boolean] :full if passed true the subclass can decide to pull in full objects. This is desirable from the usability POV but unfortunately has negative impact on performance so it is not the default
+      # @option options [Boolean] :full if passed true the subclass can
+      # decide to pull in full objects. This is desirable from the usability
+      # POV but unfortunately has negative impact on performance so it is
+      # not the default.
       # @return [Array<GoodData::MdObject> | Array<Hash>] Return the appropriate metadata objects or their representation
       def query(query_obj_type, klass, options = { :client => GoodData.connection, :project => GoodData.project })
         client = options[:client]

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

@@ -9,6 +9,12 @@ require_relative 'schema_blueprint'
 module GoodData
   module Model
     class DateDimension < GoodData::Model::SchemaBlueprint
+      # Returns urn of the date dataset
+      #
+      # @return [String]
+      def urn
+        data[:urn]
+      end
     end
   end
 end

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

@@ -51,9 +51,12 @@ module GoodData
       #
       # @param project [Hash | GoodData::Model::ProjectBlueprint] Project blueprint
       # @param dataset_name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset to be removed
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Hash] new project with removed dataset
-      def self.remove_dataset(project, dataset_id)
-        dataset = dataset_id.is_a?(String) ? find_dataset(project, dataset_id) : dataset_name
+      def self.remove_dataset(project, dataset_id, options = {})
+        dataset = dataset_id.is_a?(String) ? find_dataset(project, dataset_id, options) : dataset_name
         index = project[:datasets].index(dataset)
         dupped_project = GoodData::Helpers.deep_dup(project)
         dupped_project[:datasets].delete_at(index)
@@ -66,10 +69,13 @@ module GoodData
       #
       # @param project [Hash | GoodData::Model::ProjectBlueprint] Project blueprint
       # @param dataset_name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset to be removed
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Hash] project with removed dataset
-      def self.remove_dataset!(project, dataset_id)
+      def self.remove_dataset!(project, dataset_id, options = {})
         project = project.to_hash
-        dataset = dataset_id.is_a?(String) ? find_dataset(project, dataset_id) : dataset_id
+        dataset = dataset_id.is_a?(String) ? find_dataset(project, dataset_id, options) : dataset_id
         index = project[:datasets].index(dataset)
         project[:datasets].delete_at(index)
         project
@@ -80,6 +86,8 @@ module GoodData
       #
       # @param project [GoodData::Model::ProjectBlueprint | Hash] Project blueprint
       # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Array<Hash>]
       def self.datasets(project_blueprint, options = {})
         project_blueprint = project_blueprint.to_hash
@@ -110,6 +118,9 @@ module GoodData
       #
       # @param project [GoodData::Model::ProjectBlueprint | Hash] Project blueprint
       # @param name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Boolean]
       def self.dataset?(project, name, options = {})
         find_dataset(project, name, options)
@@ -123,6 +134,8 @@ module GoodData
       # @param project [GoodData::Model::ProjectBlueprint | Hash] Project blueprint
       # @param obj [GoodData::Model::DatasetBlueprint | String | Hash] Dataset
       # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [GoodData::Model::DatasetBlueprint]
       def self.find_dataset(project_blueprint, obj, options = {})
         return obj.to_hash if DatasetBlueprint.dataset_blueprint?(obj)
@@ -189,6 +202,8 @@ module GoodData
       # date dimensions
       #
       # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Array<GoodData::Model::DatasetBlueprint>]
       def datasets(id = :all, options = {})
         id = id.respond_to?(:id) ? id.id : id
@@ -335,6 +350,9 @@ module GoodData
       # Returns true if a dataset contains a particular dataset false otherwise
       #
       # @param name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Boolean]
       def dataset?(name, options = {})
         ProjectBlueprint.dataset?(to_hash, name, options)
@@ -377,6 +395,8 @@ module GoodData
       #
       # @param name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset
       # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [GoodData::Model::DatasetBlueprint]
       def find_dataset(name, options = {})
         ds = datasets(name, options)
@@ -404,7 +424,10 @@ module GoodData
 
       # Constructor
       #
-      # @param init_data [ProjectBlueprint | Hash] Blueprint or a blueprint definition. If passed a hash it is used as data for new instance. If there is a ProjectBlueprint passed it is duplicated and a new instance is created.
+      # @param init_data [ProjectBlueprint | Hash] Blueprint or a blueprint
+      # definition. If passed a hash it is used as data for new instance.
+      # If there is a ProjectBlueprint passed it is duplicated and a new
+      # instance is created.
       # @return [ProjectBlueprint] A new project blueprint instance
       def initialize(init_data)
         some_data = if init_data.respond_to?(:project_blueprint?) && init_data.project_blueprint?
@@ -424,6 +447,7 @@ module GoodData
         (@data[:date_dimensions] || []).each do |d|
           d[:type] = d[:type].to_sym
         end
+        @data[:include_ca] = true if @data[:include_ca].nil?
       end
 
       def id
@@ -510,9 +534,12 @@ module GoodData
       # or a DatasetBlueprint or a Hash representation.
       #
       # @param dataset_name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset to be removed
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Hash] project with removed dataset
-      def remove_dataset(dataset_name)
-        ProjectBlueprint.remove_dataset(to_hash, dataset_name)
+      def remove_dataset(dataset_name, options = {})
+        ProjectBlueprint.remove_dataset(to_hash, dataset_name, options)
         self
       end
 
@@ -520,9 +547,12 @@ module GoodData
       # or a DatasetBlueprint or a Hash representation.
       #
       # @param dataset_name [GoodData::Model::DatasetBlueprint | String | Hash] Dataset to be removed
+      # @param options [Hash] options
+      # @option options [Boolean] :include_date_dimensions Specifies whether to include date dimensions
+      # @option options [Boolean] :dd Specifies whether to include date dimensions
       # @return [Hash] project with removed dataset
-      def remove_dataset!(dataset_id)
-        ProjectBlueprint.remove_dataset!(to_hash, dataset_id)
+      def remove_dataset!(dataset_id, options = {})
+        ProjectBlueprint.remove_dataset!(to_hash, dataset_id, options)
         self
       end
 
@@ -640,8 +670,8 @@ module GoodData
         end
         a_blueprint.date_dimensions.each do |dd|
           if temp_blueprint.dataset?(dd.id, dd: true)
-            local_dim = temp_blueprint.find_dataset(dd.id, dd: true)
-            fail "Unable to merge date dimensions #{dd.id} with defintion #{dd.data} with #{local_dim.data}" unless local_dim.data == dd.data
+            local_dim = temp_blueprint.data[:date_dimensions].find { |d| d[:id] == dd.id }
+            local_dim[:urn] = dd.urn
           else
             temp_blueprint.add_date_dimension!(dd.dup)
           end