gooddata 0.6.54 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 83f988e424e03c5ef86612b386366b1d30969b414ea4f523a893da381a6ff925
-  data.tar.gz: b4568e0f4741ffeabfa6b52805800f0b95f803550b72bd65532cefc8bc6fc740
+SHA1:
+  metadata.gz: 9408b0739864f2bccdff5fadf792f65cd1e9e1cb
+  data.tar.gz: 51ec5d63f27c2f6b4e09456a406ef07a1d0297f6
 SHA512:
-  metadata.gz: 14e02a69965ab34c0975f6030543304bfc10460b948dfdc35158ed5c4d89e2beb899933d921db7b156ed4a7b60e8b9aac5ddd4d12c8ebe8b5add3e7210accd54
-  data.tar.gz: 8ecd6f9d5da4d24de8ddb45004fd86099003ba774a65d25e98195905ff69fe50a8f17fb98637df06e13e15a62a3b10df5f1f3aaaaa8dc12f6c3acdace8f3fda0
+  metadata.gz: 8c6aaaa625353dafd2c2cb4d5b97af9c46bb38628583af3e23b39b46e2a37e6070f043406d337543eb1b866cdc568247da5b5c27ac0144f3dcf89e25fbc952f4
+  data.tar.gz: 68d49617d6e403a1e0f3b6023b61ae6e17f97974347af684010ae412ed56b2c09e15ab86ff889941314eec740a6d5a567da0a3f70adadd972b55bcb7f90a818d

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+
+rvm:
+ - 2.2
+ - jruby-9.1.7
+
+script:
+  - bundle exec rake test:unit

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 # GoodData Ruby SDK Changelog
+## 1.0.0
+ - TMA-575: Add support for raw export-report API
+ - TMA-738: Update highline to v2
+ - TMA-711: segments filter works correctly in users brick
+ - TMA-662: Users Brick passes with empty input source
+ - Rename travis.yml to .travis.yml
+
 ## 0.6.54
  - Generating changelog automatically from git
  - Fix resolving dataproduct

data/gooddata.gemspec

@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'gli', '~> 2.15'
   s.add_dependency 'gooddata_datawarehouse' if RUBY_PLATFORM == 'java'
   s.add_dependency 'gooddata-dss-jdbc', '0.1.12' if RUBY_PLATFORM == 'java'
-  s.add_dependency 'highline', '~> 1.7'
+  s.add_dependency 'highline', '= 2.0.0.pre.develop.14'
   s.add_dependency 'json_pure', '~> 1.8'
   s.add_dependency 'multi_json', '~> 1.12'
   s.add_dependency 'parseconfig', '~> 1.0'

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

@@ -31,18 +31,13 @@ module GoodData
           domain = client.domain(domain_name) || fail("Invalid domain name specified - #{domain_name}")
 
           if params.key?(:data_product)
-            begin
-              data_product = domain.data_products(params.data_product)
-            rescue RestClient::BadRequest
-              fail 'the specified DataProduct does not exist'
-            end
+            data_product_id = params.data_product
           else
-            params.gdc_logger.info 'Please specify the data_product parameter when using the brick - trying to find a fallback'
-            data_products = domain.data_products(:all)
-            fail 'No data_product parameter specified - unable to fallback to a default' if data_products.length > 1 || data_products.empty?
-            data_product = data_products.first
+            params.gdc_logger.info "Using data product 'default' since none was specified in brick parameters"
+            data_product_id = 'default'
           end
 
+          data_product = domain.data_products(data_product_id)
           results = [
             {
               data_product: data_product

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

@@ -51,7 +51,8 @@ module GoodData
               segment_id: segment.segment_id,
               development_pid: project.pid,
               driver: project.driver.downcase,
-              master_name: project.title
+              master_name: project.title,
+              uri: segment.uri
             }
           end
 

data/lib/gooddata/lcm/actions/collect_users_brick_users.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 CollectUsersBrickUsers < BaseAction
+      DESCRIPTION = 'Enriches parameters with users from the Users Brick input.'
+
+      PARAMS = define_params(self) do
+        description 'Input source of the Users Brick. Needed to prevent ' \
+                    'deletion of filters for a user that is to be removed.'
+        param :users_brick_config, instance_of(Type::UsersBrickConfig), required: true
+      end
+
+      class << self
+        def call(params)
+          users_brick_users = []
+          login_column = params.users_brick_config.login_column || 'login'
+          users_brick_data_source = GoodData::Helpers::DataSource.new(params.users_brick_config.input_source)
+          users_brick_data_source_file = File.open(
+            users_brick_data_source.realize(params),
+            'r:UTF-8'
+          )
+          CSV.foreach(users_brick_data_source_file,
+                      headers: true,
+                      return_headers: false,
+                      encoding: 'utf-8') do |row|
+            users_brick_users << { login: row[login_column] }
+          end
+
+          {
+            results: users_brick_users,
+            params: {
+              users_brick_users: users_brick_users
+            }
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -87,7 +87,8 @@ module GoodData
             ignore_missing_values: params.ignore_missing_values == 'true',
             do_not_touch_filters_that_are_not_mentioned: params.do_not_touch_filters_that_are_not_mentioned == 'true',
             domain: domain,
-            dry_run: false
+            dry_run: false,
+            users_brick_input: params.users_brick_users
           }
 
           puts "Synchronizing in mode \"#{mode}\""
@@ -118,21 +119,7 @@ module GoodData
               project.add_data_permissions(filters_to_load, run_params)
             end
           when 'sync_one_project_based_on_custom_id'
-            md = project.metadata
-            goodot_id = md['GOODOT_CUSTOM_PROJECT_ID'].to_s
-
-            client = domain.clients(:all, data_product).find { |c| c.project_uri == project.uri }
-            if goodot_id.empty? && client.nil?
-              fail "Project \"#{project.pid}\" metadata does not contain key GOODOT_CUSTOM_PROJECT_ID neither is it mapped \
-                  to a client_id in LCM metadata. We are unable to get the values for user filters."
-            end
-
-            unless goodot_id.empty? || client.nil? || (goodot_id == client.id)
-              fail "GOODOT_CUSTOM_PROJECT_ID metadata key is provided for project \"#{project.pid}\" but doesn't match \
-                    client id assigned to the project in LCM metadata. Please resolve the conflict."
-            end
-
-            filter_value = goodot_id.empty? ? client.id : goodot_id
+            filter_value = UserBricksHelper.resolve_client_id(domain, project, data_product)
 
             filepath = File.open(data_source.realize(params), 'r:UTF-8')
             CSV.foreach(filepath, headers: csv_with_headers, return_headers: false, encoding: 'utf-8') do |row|
@@ -166,10 +153,9 @@ module GoodData
             end
 
             domain_clients = domain.clients(:all, data_product)
-            params.segments_filter ||= params.segments_filter
-            if params.segments_filter
-              segments_filter = params.segments_filter.map { |seg| "/gdc/domains/#{domain.name}/segments/#{seg}" }
-              domain_clients.select! { |c| segments_filter.include?(c.segment_uri) }
+            if params.segments
+              segment_uris = params.segments.map(&:uri)
+              domain_clients = domain_clients.select { |c| segment_uris.include?(c.segment_uri) }
             end
 
             working_client_ids = []
@@ -177,8 +163,8 @@ module GoodData
             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?
               c = domain.clients(client_id, data_product)
-              if params.segments_filter && !segments_filter.include?(c.segment_uri)
-                puts "Client #{client_id} is outside segments_filter #{params.segments_filter}"
+              if params.segments && !segment_uris.include?(c.segment_uri)
+                puts "Client #{client_id} is outside segments_filter #{params.segments}"
                 next
               end
               project = c.project

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

@@ -5,6 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 require_relative 'base_action'
+require_relative '../user_bricks_helper'
 
 module GoodData
   module LCM2
@@ -125,18 +126,21 @@ module GoodData
                                            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)
                     when 'sync_one_project_based_on_custom_id'
-                      md = project.metadata
-                      goodot_id = md['GOODOT_CUSTOM_PROJECT_ID'].to_s
+                      filter_value = UserBricksHelper.resolve_client_id(domain, project, data_product)
 
                       filtered_users = new_users.select do |u|
                         fail "Column for determining the project assignement is empty for \"#{u[:login]}\"" if u[:pid].blank?
                         client_id = u[:pid].to_s
-                        (goodot_id && client_id == goodot_id) || domain.clients(client_id, data_product).project_uri == project.uri
+                        client_id == filter_value
                       end
 
                       if filtered_users.empty?
-                        fail "Project \"#{project.pid}\" does not match with any client ids in input source (both GOODOT_CUSTOM_PROJECT_ID and SEGMENT/CLIENT). \
-  We are unable to get the value to filter users."
+                        params.gdc_logger.warn(
+                          "Project \"#{project.pid}\" does not match " \
+                          "any client ids in input source (both " \
+                          "GOODOT_CUSTOM_PROJECT_ID and SEGMENT/CLIENT). " \
+                          "We are unable to get the value to filter users."
+                        )
                       end
 
                       puts "Project #{project.pid} will receive #{filtered_users.count} from #{new_users.count} users"
@@ -168,11 +172,19 @@ module GoodData
                       end
                     when 'sync_domain_client_workspaces'
                       domain_clients = domain.clients(:all, data_product)
+                      if params.segments
+                        segment_uris = params.segments.map(&:uri)
+                        domain_clients = domain_clients.select { |c| segment_uris.include?(c.segment_uri) }
+                      end
                       working_client_ids = []
                       res = []
                       res += new_users.group_by { |u| u[:pid] }.flat_map do |client_id, users|
                         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
                         working_client_ids << client_id.to_s