gooddata 0.6.50 → 0.6.51

data/lib/gooddata/models/project_log_formatter.rb

@@ -0,0 +1,204 @@
+require_relative 'project'
+
+module GoodData
+  class ProjectLogFormatter
+    def initialize(project)
+      @project = project
+      @users_cache = nil
+    end
+
+    # Log created users
+    #
+    # @param created_users [Array<Hash>] collection of created user result, e.g:
+    # [
+    #   {
+    #     type => :successful || :failed,
+    #     user => '/gdc/account/profile/abc@gooddata.com',
+    #     message => error_message,
+    #     reason: error_message
+    #   },
+    #   ...
+    # ]
+    # @param new_users [Array<Hash>] collection of new users to be created
+    #   [
+    #     {
+    #       login => 'xxx@gooddata.com',
+    #       role_title => 'Editor' || 'Admin' || ...
+    #     },
+    #     ...
+    #   ]
+    # @return nil
+    def log_created_users(created_users, new_users)
+      created_users.each do |created_user|
+        user_login = to_user_login(created_user[:user])
+        if created_user[:type] == :successful
+          user_data = new_users.find { |new_user| new_user[:login] == user_login }
+          GoodData.logger.info("Added new user=#{user_login}, roles=#{user_data[:role_title]} to project=#{@project.pid}.")
+        elsif created_user[:type] == :failed
+          error_message = created_user[:message] || created_user[:reason]
+          GoodData.logger.error("Failed to add user=#{user_login} to project=#{@project.pid}. Error: #{error_message}")
+        end
+      end
+    end
+
+    # Log updated users
+    #
+    # @param updated_users [Array<Hash>] collection of updated user result, e.g:
+    #   [
+    #     {
+    #       type => :successful || :failed,
+    #       user => '/gdc/account/profile/abc@gooddata.com',
+    #       message => error_message,
+    #       reason: error_message
+    #     },
+    #     ...
+    #   ]
+    # @param changed_users [Array<Hash>] collection of changed users to be updated
+    #   [
+    #     {
+    #       old_obj: {
+    #         :login => '/gdc/account/profile/abc@gooddata.com',
+    #         :role => '/gdc/projects/clp4z1qw60o0t048tov909b1xi4qztay/roles/5'
+    #       },
+    #       new_obj: {
+    #         :role_title => 'Editor' || 'Admin' || ...
+    #       }
+    #     },
+    #     ...
+    #   ]
+    # @param role_list [Array<ProjectRole>] project roles
+    # @return nil
+    def log_updated_users(updated_users, changed_users, role_list)
+      updated_users.each do |updated_user|
+        user_login = to_user_login(updated_user[:user])
+        if updated_user[:type] == :successful
+          changed_user = changed_users.find { |user| user[:old_obj][:login] == user_login }
+          old_user_data = changed_user[:old_obj]
+          old_role_uris = old_user_data[:role] || old_user_data[:roles]
+          old_role_titles = old_role_uris.map do |old_role_uri|
+            old_role = @project.get_role(old_role_uri, role_list)
+            old_role && old_role.title
+          end
+          new_role_titles = changed_user[:new_obj][:role_title]
+          GoodData.logger.info("Update user=#{user_login} from old_roles=#{old_role_titles} to new_roles=#{new_role_titles} in project=#{@project.pid}.")
+        elsif updated_user[:type] == :failed
+          error_message = updated_user[:message] || updated_user[:reason]
+          GoodData.logger.error("Failed to update user=#{user_login} to project=#{@project.pid}. Error: #{error_message}")
+        end
+      end
+    end
+
+    # Log disabled users
+    #
+    # @param disabled_users [Array<Hash>] collection of disabled user result, e.g:
+    #   [
+    #     {
+    #       type => :successful || :failed,
+    #       user => '/gdc/account/profile/abc@gooddata.com',
+    #       message => error_message,
+    #       reason: error_message
+    #     },
+    #     ...
+    #   ]
+    # @return nil
+    def log_disabled_users(disabled_users)
+      disabled_users.each do |disabled_user|
+        user_login = to_user_login(disabled_user[:user])
+        if disabled_user[:type] == :successful
+          GoodData.logger.warn("Disable user=#{user_login} in project=#{@project.pid}")
+        elsif disabled_user[:type] == :failed
+          error_message = disabled_user[:message] || disabled_user[:reason]
+          GoodData.logger.error("Failed to disable user=#{user_login} in project=#{@project.pid}. Error: #{error_message}")
+        end
+      end
+    end
+
+    # Log removed users
+    #
+    # @param removed_users [Array<Hash>] collection of removed user result, e.g:
+    #   [
+    #     {
+    #       type => :successful || :failed,
+    #       user => {
+    #         login => 'abc@gooddata.com'
+    #       },
+    #       message => error_message
+    #     },
+    #     ...
+    #   ]
+    # @return nil
+    def log_removed_users(removed_users)
+      removed_users.each do |removed_user|
+        user_login = to_user_login(removed_user[:user])
+        if removed_user[:type] == :successful
+          GoodData.logger.warn("Remove user=#{user_login} out of project=#{@project.pid}")
+        elsif removed_user[:type] == :failed
+          error_message = removed_user[:message]
+          GoodData.logger.error("Failed to remove user=#{user_login} out of project=#{@project.pid}. Error: #{error_message}")
+        end
+      end
+    end
+
+    # Log user filters results
+    #
+    # @param results [Array<Hash>] user-filter results
+    # [
+    #   {
+    #     status: :successful || :failed,
+    #     type: :create || delete,
+    #     user: user_profile_url
+    #   },
+    #   ...
+    # ]
+    # @param user_filters [Hash] user-filters data
+    # {
+    #   user_profile_url => MandatoryUserFilter,
+    #   ...
+    # }
+    # @return nil
+    def log_user_filter_results(results, user_filters)
+      results ||= []
+      results.each do |result|
+        user_profile_url = result[:user]
+        status = result[:status]
+        operator = result[:type]
+        if status == :successful
+          filter_uris = user_filters[user_profile_url].map(&:uri)
+          if operator == :create && GoodData.logger.info?
+            readable_user_login = users_cache[user_profile_url] || user_profile_url
+            GoodData.logger.info "Created user-filter=#{filter_uris} for user=#{readable_user_login} in project=#{@project.pid}"
+          elsif operator == :delete && GoodData.logger.warn?
+            readable_user_login = users_cache[user_profile_url] || user_profile_url
+            GoodData.logger.warn "Deleted user-filter=#{filter_uris} of user=#{readable_user_login} in project=#{@project.pid}"
+          end
+        else
+          error_message = result[:message]
+          if operator == :create && GoodData.logger.error?
+            GoodData.logger.error "Failed to create user-filters for user=#{user_profile_url} in project=#{@project.pid}. Error: #{error_message}"
+          elsif operator == :delete && GoodData.logger.error?
+            GoodData.logger.error "Failed to delete user-filters from user=#{user_profile_url} in project=#{@project.pid}. Error: #{error_message}"
+          end
+        end
+      end
+    end
+
+    private
+
+    def users_cache
+      if @users_cache.nil?
+        @users_cache = Hash[@project.users.map { |user| [user.profile_url, user.login] }]
+      end
+      @users_cache
+    end
+
+    def to_user_login(user)
+      if user.is_a?(String) && user.start_with?('/gdc/account/profile/')
+        GoodData::Helpers.last_uri_part(user)
+      elsif user.is_a?(Hash) && user[:login]
+        user[:login]
+      else
+        user
+      end
+    end
+  end
+end

data/lib/gooddata/models/schedule.rb

@@ -371,7 +371,7 @@ module GoodData
     #
     # @param new_hidden_param [String] Hidden parameters to be set
     def hidden_params=(new_hidden_params = {})
-      @json['schedule']['hiddenParams'] = stringify_values(new_hidden_params)
+      @json['schedule']['hiddenParams'] = GoodData::Helpers.stringify_values(new_hidden_params)
       @dirty = true
       self
     end
@@ -391,7 +391,7 @@ module GoodData
         'PROCESS_ID' => process_id,
         'EXECUTABLE' => executable
       }
-      @json['schedule']['params'] = default_params.merge(stringify_values(new_params))
+      @json['schedule']['params'] = default_params.merge(GoodData::Helpers.stringify_values(new_params))
       @dirty = true
       self
     end
@@ -531,24 +531,5 @@ module GoodData
 
       res
     end
-
-    private
-
-    def stringify_values(hash)
-      Hash[
-        hash.map do |k, v|
-          val = case v
-                when nil
-                  v
-                when Hash
-                  stringify_values(v)
-                else
-                  v.to_s
-                end
-
-          [k, val]
-        end
-      ]
-    end
   end
 end

data/lib/gooddata/models/segment.rb

@@ -180,6 +180,32 @@ module GoodData
       client.create(ClientSynchronizationResult, res)
     end
 
+    def synchronize_processes(projects = [], options = { dataproduct: 'default' })
+      projects = [projects] unless projects.is_a?(Array)
+      projects = projects.map do |p|
+        p = p.pid if p.respond_to?('pid')
+        fail('wrong type of argument. Should be either project ID or path') unless GoodData::Project.project_id_or_path?(p)
+        p.split('/').last
+      end
+
+      unless projects.empty?
+        body = {
+          syncConfig: {
+            filters: {
+              projectIdFilter: projects
+            }
+          }
+        }
+      end
+
+      uri = '/gdc/internal/lcm/domains/%s/dataproducts/%s/segments/%s/syncProcesses' % [domain.obj_id, options[:dataproduct], id]
+      res = client.post(uri, body)
+
+      client.poll_on_response(GoodData::Helpers.get_path(res, %w(asyncTask link poll)), sleep_interval: 1) do |r|
+        r['syncedResult'].nil?
+      end
+    end
+
     # Deletes a segment instance on the API.
     #
     # @return [GoodData::Segment] Segment instance

data/lib/gooddata/models/style_setting.rb

@@ -28,7 +28,11 @@ module GoodData
 
       def create(colors, opts = { client: GoodData.connection, project: GoodData.project })
         client, project = GoodData.get_client_and_project(opts)
-        colors &= colors # remove duplicate colors
+        if colors.is_a?(StyleSetting)
+          colors = colors.colors
+        else
+          colors = colors.uniq
+        end
         uri = STYLE_SETTING_PATH % project.pid
         data_to_send = GoodData::Helpers.deep_dup(EMPTY_OBJECT).tap do |d|
           d['styleSettings']['chartPalette'] = colors

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

@@ -4,6 +4,8 @@
 # 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 '../project_log_formatter'
+
 module GoodData
   module UserFilterBuilder
     # Main Entry function. Gets values and processes them to get filters
@@ -365,6 +367,7 @@ module GoodData
       ignore_missing_values = options[:ignore_missing_values]
       users_must_exist = options[:users_must_exist] == false ? false : true
       dry_run = options[:dry_run]
+      project_log_formatter = GoodData::ProjectLogFormatter.new(project)
 
       filters = normalize_filters(user_filters)
       user_filters, errors = maqlify_filters(filters, options.merge(users_must_exist: users_must_exist, type: :muf))
@@ -396,6 +399,9 @@ module GoodData
           res['userFiltersUpdateResult'].flat_map { |k, v| v.map { |r| { status: k.to_sym, user: r, type: :create } } }.map { |result| result[:status] == :failed ? result.merge(GoodData::Helpers.symbolize_keys(result[:user])) : result }
         end
       end
+
+      project_log_formatter.log_user_filter_results(create_results, to_create)
+
       delete_results = unless options[:do_not_touch_filters_that_are_not_mentioned]
                          to_delete.each_slice(100).flat_map do |batch|
                            batch.flat_map do |related_uri, group|
@@ -423,6 +429,9 @@ module GoodData
                            end
                          end
                        end
+
+      project_log_formatter.log_user_filter_results(delete_results, to_delete)
+
       { created: to_create, deleted: to_delete, results: create_results + (delete_results || []) }
     end
 

data/lib/gooddata/rest/connection.rb

@@ -505,7 +505,7 @@ module GoodData
       end
 
       def format_error(e, params = {})
-        return unless e.respond_to?(:response)
+        return e unless e.respond_to?(:response)
         error = MultiJson.load(e.response)
         message = GoodData::Helpers.interpolate_error_message(error)
         <<-ERR
@@ -514,7 +514,10 @@ module GoodData
 Request ID: #{params[:x_gdc_request]}
 Full response:
 #{JSON.pretty_generate(error)}
+Backtrace:\n#{e.backtrace.join("\n")}
 ERR
+      rescue MultiJson::ParseError
+        "Failed to parse #{e}. Raw response: #{e.response}"
       end
 
       # generate session id to be passed as the first part to

data/lib/gooddata/version.rb

@@ -6,7 +6,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.50'
+  VERSION = '0.6.51'
 
   class << self
     # Version

data/spec/environment/development.rb

@@ -0,0 +1,29 @@
+# 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 Environment
+    module ConnectionHelper
+      set_const :GD_PROJECT_TOKEN, GoodData::Helpers.decrypt("cfO9ifFYQVJw3q6Kf8/pVf/uLPLGnUJ/9nfvBxeGf/ILoj8N4ymWGgvryWEK\nHDMu\n", ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY'])
+      set_const :DEFAULT_DOMAIN, 'staging3-lcm-prod'
+      set_const :DEFAULT_SERVER, 'https://staging3-lcm-prod.intgdc.com'
+      set_const :DEFAULT_USER_URL, '/gdc/account/profile/a4c644d7b42b65c34e5a0f46809f7164'
+      set_const :STAGING_URI, 'https://staging3-lcm-prod.intgdc.com/gdc/uploads/'
+    end
+
+    module ProcessHelper
+      set_const :PROCESS_ID, 'b671fcfe-f6fd-4379-92c1-3db9eceb1c54'
+    end
+
+    module ProjectHelper
+      set_const :PROJECT_ID, 'rd87oh5rnbf1qhh9vjq5lkgq5v6okei5'
+    end
+
+    module ScheduleHelper
+      set_const :SCHEDULE_ID, '58ad6260e4b0ee87af79b0b8'
+    end
+  end
+end

data/spec/environment/environment.rb

@@ -7,20 +7,32 @@
 module GoodData
   module Environment
     class << self
-      def load(env = (ENV['GD_ENV'] && ENV['GD_ENV'].split('/')[1]) || 'develop')
+      BRANCH_TO_ENVIRONMENT = {
+        develop: 'testing',
+        hotfix: 'production'
+      }
+
+      def load(env = ENV['GD_ENV'] || 'development')
         require_relative 'default'
+        env = branch_to_environment(env)
 
         puts "USING ENVIRONMENT: #{env}"
         begin
           require_relative env
         rescue
           puts "Unable to find environment '#{env}'"
-          require_relative 'develop'
+          require_relative 'development'
         end
 
         GoodData::Environment::ProjectHelper.set_const :PROJECT_URL, "/gdc/projects/#{GoodData::Environment::ProjectHelper::PROJECT_ID}"
         ENV['GD_SERVER'] = GoodData::Environment::ConnectionHelper::DEFAULT_SERVER
       end
+
+      # Translates ci-infra branch to environment config name
+      # @param branch Name of the branch we are testing against
+      def branch_to_environment(branch)
+        BRANCH_TO_ENVIRONMENT[branch.to_sym] || branch
+      end
     end
   end
 end

data/spec/integration/date_dim_switch_spec.rb

@@ -40,7 +40,7 @@ describe "Swapping a date dimension and exchanging all attributes/elements", :co
     @client.disconnect
   end
 
-  it "should swap the dimension, exhcange all stuff and not break anything" do
+  it "should swap the dimension, exchange all stuffs and not break anything" do
     # WE have 2 date dims
     expect(@blueprint.date_dimensions.map(&:id)).to eq %w(created_on created_on_2)
     # One is connected
@@ -120,14 +120,12 @@ describe "Swapping a date dimension and exchanging all attributes/elements", :co
     # Labels
     GoodData::SmallGoodZilla.get_uris(@metric_2.expression)
     expect(@report.definition.attributes.map(&:identifier)).to eq ["created_on_2.quarter"]
-    ids = GoodData::SmallGoodZilla.get_uris(@report.definition.filters.first).map { |x| x.split('/')[-2..-1].join('/') }
-    expect(ids).to eq ["obj/2286", "2286/elements?id=2015", "2286/elements?id=2016"]
 
     ids = GoodData::SmallGoodZilla.get_uris(@report.definition.filters.first).map { |x| x.split('/')[-2..-1].join('/') }
-    expect(ids).to eq ["obj/2286", "2286/elements?id=2015", "2286/elements?id=2016"]
+    expect(ids).to eq ["obj/281", "281/elements?id=2015", "281/elements?id=2016"]
 
     ids = GoodData::SmallGoodZilla.get_uris(@variable.values.first.expression).map { |v| v.split('/')[-2..-1].join('/') }
-    expect(ids).to eq ["obj/2286", "2286/elements?id=2015", "2286/elements?id=2016"]
+    expect(ids).to eq ["obj/281", "281/elements?id=2015", "281/elements?id=2016"]
 
     # Swap the dims
     bp = @project.blueprint