gooddata 0.6.51 → 0.6.52

data/lib/gooddata/models/report_data_result.rb

@@ -180,7 +180,9 @@ module GoodData
 
     # Allows you to test if a report contains a row.
     #
-    # @param [Array<String | Number>] row Row that you want to test. It is looking for the whole row. If the headers are getting in the way use #without_left_headers or #without_top_headers
+    # @param [Array<String | Number>] row Row that you want to test.
+    # It is looking for the whole row. If the headers are getting in the way
+    # use #without_left_headers or #without_top_headers
     # @return [Array] Returns true if data are inside a report
     def include_row?(row)
       @data.include?(row)
@@ -188,7 +190,9 @@ module GoodData
 
     # Allows you to test if a report contains a column.
     #
-    # @param [Array<String | Number>] row Row that you want to test. It is looking for the whole row. If the headers are getting in the way use #without_left_headers or #without_top_headers
+    # @param [Array<String | Number>] row Row that you want to test.
+    # It is looking for the whole row. If the headers are getting in the way
+    # use #without_left_headers or #without_top_headers
     # @return [Array] Returns true if data are inside a report
     def include_column?(col)
       transpose.include_row?(col)

data/lib/gooddata/models/schedule.rb

@@ -74,7 +74,6 @@ module GoodData
           dataload_datasets = '[]' unless dataload_datasets
 
           de_synchronize_all = options[:de_synchronize_all] || options['GDC_DE_SYNCHRONIZE_ALL']
-          de_synchronize_all = 'true' unless de_synchronize_all
         else
           fail 'Executable has to be provided' if executable.blank?
         end
@@ -85,7 +84,7 @@ module GoodData
         params = { 'PROCESS_ID' => process_id }
         if is_dataload_process
           params['GDC_DATALOAD_DATASETS'] = dataload_datasets
-          params['GDC_DE_SYNCHRONIZE_ALL'] = de_synchronize_all
+          params['GDC_DE_SYNCHRONIZE_ALL'] = de_synchronize_all if de_synchronize_all
         else
           params['EXECUTABLE'] = executable
         end
@@ -396,6 +395,10 @@ module GoodData
       self
     end
 
+    def rewrite_deprecated_params
+      params['EXECUTABLE'] = params.delete('GRAPH') if params['GRAPH']
+    end
+
     # Saves object if dirty
     #
     # @return [Boolean] True if saved
@@ -403,9 +406,9 @@ module GoodData
       fail 'trigger schedule has to be provided' if cron.blank? && trigger_id.blank?
       fail 'A timezone has to be provided' if timezone.blank?
       fail 'Schedule type has to be provided' if schedule_type.blank?
+      rewrite_deprecated_params
       if @dirty
         if saved?
-          puts JSON.pretty_generate(to_update_payload)
           res = client.put(uri, to_update_payload)
           @json = Schedule.new(res).json
         else

data/lib/gooddata/models/subscription.rb

@@ -175,7 +175,14 @@ module GoodData
 
     def ==(other)
       return false unless [:project, :title, :process, :channels, :message, :subject, :project_events, :timer_event].all? { |m| other.respond_to?(m) }
-      @project == other.project && @title == other.title && @process == other.process && @channels == other.channels && @message == other.message && @subject == other.subject && @project_events == other.project_events && @timer_event == other.timer_event
+      @project == other.project &&
+        @title == other.title &&
+        @process == other.process &&
+        @channels == other.channels &&
+        @message == other.message &&
+        @subject == other.subject &&
+        @project_events == other.project_events &&
+        @timer_event == other.timer_event
     end
   end
 end

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

@@ -32,6 +32,7 @@ module GoodData
     # @return [GoodData::Project | GoodData::Profile] Related object
     def related
       uri = related_uri
+      return unless uri
       level == :project ? client.projects(uri) : client.create(GoodData::Profile, client.get(uri))
     end
 

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

@@ -130,7 +130,11 @@ module GoodData
           next true if domain_user
           false
         end
-        fail "#{missing_users.count} users are not part of the project and variable cannot be resolved since :users_must_exist is set to true (#{missing_users.join(', ')})" unless missing_users.empty?
+        unless missing_users.empty?
+          fail "#{missing_users.count} users are not part of the project and " \
+               "variable cannot be resolved since :users_must_exist is set " \
+               "to true (#{missing_users.join(', ')})"
+        end
       end
     end
 
@@ -280,7 +284,7 @@ module GoodData
                          fail 'Unsuported type in maqlify_filters.'
                        end
 
-        if profiles_uri && expression
+        if profiles_uri && expression && expression != 'TRUE'
           [create_user_filter(expression, profiles_uri)] + errors
         else
           [] + errors
@@ -376,7 +380,11 @@ module GoodData
       filters = user_filters.map { |data| client.create(MandatoryUserFilter, data, project: project) }
       to_create, to_delete = resolve_user_filters(filters, project.data_permissions)
 
-      GoodData.logger.warn("Data permissions computed: #{to_create.count} to create and #{to_delete.count} to delete")
+      if options[:do_not_touch_filters_that_are_not_mentioned]
+        GoodData.logger.warn("Data permissions computed: #{to_create.count} to create")
+      else
+        GoodData.logger.warn("Data permissions computed: #{to_create.count} to create and #{to_delete.count} to delete")
+      end
       return { created: to_create, deleted: to_delete } if dry_run
 
       create_results = to_create.each_slice(100).flat_map do |batch|
@@ -396,7 +404,13 @@ module GoodData
           res = client.post("/gdc/md/#{project.pid}/userfilters", payload)
 
           # turn the errors from hashes into array of hashes
-          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 }
+          update_result = res['userFiltersUpdateResult'].flat_map do |k, v|
+            v.map { |r| { status: k.to_sym, user: r, type: :create } }
+          end
+
+          update_result.map do |result|
+            result[:status] == :failed ? result.merge(GoodData::Helpers.symbolize_keys(result[:user])) : result
+          end
         end
       end
 

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

@@ -17,7 +17,9 @@ module GoodData
       self
     end
 
-    # Method used for replacing values in their state according to mapping. Can be used to replace any values but it is typically used to replace the URIs. Returns a new object of the same type.
+    # Method used for replacing values in their state according to mapping.
+    # Can be used to replace any values but it is typically used to replace
+    # the URIs. Returns a new object of the same type.
     #
     # @param [Array<Array>]Mapping specifying what should be exchanged for what. As mapping should be used output of GoodData::Helpers.prepare_mapping.
     # @return [GoodData::VariableUserFilter]

data/lib/gooddata/rest/client.rb

@@ -106,12 +106,6 @@ module GoodData
           client = Client.new(new_opts)
           GoodData.logger.info("Connected to server with webdav path #{client.user_webdav_path}")
 
-          if client
-            at_exit do
-              puts client.connection.stats_table if client && client.connection && (GoodData.stats_on? || client.stats_on?)
-            end
-          end
-
           # HACK: This line assigns class instance # if not done yet
           @@instance = client # rubocop:disable ClassVars
         end
@@ -197,6 +191,10 @@ module GoodData
       end
 
       def disconnect
+        if stats_on?
+          puts "API call statistics to server #{@connection.server}"
+          puts @connection.stats_table
+        end
         @connection.disconnect
       end
 

data/lib/gooddata/rest/connection.rb

@@ -19,7 +19,11 @@ module RestClient
   module AbstractResponse
     alias_method :old_follow_redirection, :follow_redirection
     def follow_redirection(request = nil, result = nil, &block)
-      fail 'Using monkey patched version of RestClient::AbstractResponse#follow_redirection which is guaranteed to be compatible only with RestClient 1.8.0' if RestClient::VERSION != '1.8.0'
+      if RestClient::VERSION != '1.8.0'
+        fail 'Using monkey patched version of RestClient::AbstractResponse#' \
+             'follow_redirection which is guaranteed to be compatible only ' \
+             'with RestClient 1.8.0'
+      end
 
       new_args = @args.dup
 
@@ -508,6 +512,9 @@ module GoodData
         return e unless e.respond_to?(:response)
         error = MultiJson.load(e.response)
         message = GoodData::Helpers.interpolate_error_message(error)
+        if error && error['error'] && error['error']['errorClass'] == 'com.gooddata.security.authorization.AuthorizationFailedException'
+          message = "#{message}, accessing with #{user['accountSetting']['login']}"
+        end
         <<-ERR
 
 #{e}: #{message}
@@ -631,7 +638,8 @@ ERR
         ['/gdc/datawarehouse/instances/{id}', %r{/gdc/datawarehouse/instances/[\w]+}],
         ['/gdc/datawarehouse/executions/{id}', %r{/gdc/datawarehouse/executions/[\w]+}],
 
-        ['/gdc/domains/{id}/segments/{segment}/synchronizeClients/results/{result}/details?offset={offset}&limit={limit}', %r{/gdc/domains/[\w]+/segments/[\w-]+/synchronizeClients/results/[\w]+/details/\?offset=[\d]+&limit=[\d]+}],
+        ['/gdc/domains/{id}/segments/{segment}/synchronizeClients/results/{result}/details?offset={offset}&limit={limit}',
+         %r{/gdc/domains/[\w]+/segments/[\w-]+/synchronizeClients/results/[\w]+/details/\?offset=[\d]+&limit=[\d]+}],
         ['/gdc/domains/{id}/segments/{segment}/synchronizeClients/results/{result}', %r{/gdc/domains/[\w]+/segments/[\w-]+/synchronizeClients/results/[\w]+}],
         ['/gdc/domains/{id}/segments/{segment}/', %r{/gdc/domains/[\w]+/segments/[\w-]+/}],
         ['/gdc/domains/{id}/segments/{segment}', %r{/gdc/domains/[\w]+/segments/[\w-]+}],

data/lib/gooddata/version.rb

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

data/spec/data/blueprints/test_blueprint.json

@@ -1,5 +1,6 @@
 {
   "title": "Devs module",
+  "include_ca": false,
   "datasets": [
     {
       "type": "dataset",

data/spec/data/wire_models/test_blueprint.json

@@ -2,6 +2,9 @@
   "diffRequest": {
     "targetModel": {
       "projectModel": {
+        "modelMetadata": {
+          "containCA": false
+        },
         "datasets": [
           {
             "dataset": {

data/spec/data/workspace_table.csv

@@ -0,0 +1,3 @@
+client_id,segment_id,project_title
+client_foo,segment_foo,project_foo
+client_bar,segment_bar,project_bar

data/spec/environment/development.rb

@@ -7,7 +7,10 @@
 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'])
+      encrypted_token = "cfO9ifFYQVJw3q6Kf8/pVf/uLPLGnUJ/9nfvBxeGf/ILoj8N4ymWGgvryWEK\nHDMu\n"
+      key = ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY']
+      token = GoodData::Helpers.decrypt(encrypted_token, key)
+      set_const :GD_PROJECT_TOKEN, token
       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'

data/spec/environment/environment.rb

@@ -12,7 +12,7 @@ module GoodData
         hotfix: 'production'
       }
 
-      def load(env = ENV['GD_ENV'] || 'development')
+      def load(env = ENV['GD_ENV'] || 'testing')
         require_relative 'default'
         env = branch_to_environment(env)
 

data/spec/environment/staging.rb

@@ -7,7 +7,11 @@
 module GoodData
   module Environment
     module ConnectionHelper
-      set_const :GD_PROJECT_TOKEN, GoodData::Helpers.decrypt("YC+foKO2M8rIfB5gxF/sVvop5dRA7d/zLO/zzUlBr9ZimnoYeLFyAqU20U4k\ncRYb\n", ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY'])
+      encrypted_token = 'YC+foKO2M8rIfB5gxF/sVvop5dRA7d/zLO/zzUlBr9ZimnoYe' \
+                           'LFyAqU20U4k\ncRYb\n'
+      key = ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY']
+      token = GoodData::Helpers.decrypt(encrypted_token, key)
+      set_const :GD_PROJECT_TOKEN, token
       set_const :DEFAULT_DOMAIN, 'staging-lcm-prod'
       set_const :DEFAULT_SERVER, 'https://staging-lcm-prod.intgdc.com'
       set_const :DEFAULT_USER_URL, '/gdc/account/profile/e306b64fb4178785c9cf29c29b5e498a'

data/spec/environment/testing.rb

@@ -7,11 +7,14 @@
 module GoodData
   module Environment
     module ConnectionHelper
-      set_const :GD_PROJECT_TOKEN, GoodData::Helpers.decrypt("DIRchLbHH1fovLSVEfo3f5aQwHHQ432+PxF3uR5IuNn+iYWz+HZrLtaZ3LVE\n0ZNc\n", ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY'])
+      set_const :GD_PROJECT_TOKEN, GoodData::Helpers.decrypt(
+        "DIRchLbHH1fovLSVEfo3f5aQwHHQ432+PxF3uR5IuNn+iYWz+HZrLtaZ3LVE\n0ZNc\n",
+        ENV['GD_SPEC_PASSWORD'] || ENV['BIA_ENCRYPTION_KEY']
+      )
       set_const :DEFAULT_DOMAIN, 'staging2-lcm-prod'
       set_const :DEFAULT_SERVER, 'https://staging2-lcm-prod.intgdc.com'
       set_const :DEFAULT_USER_URL, '/gdc/account/profile/5ad80b895edcc438e5a4418e222733fa'
-      set_const :STAGING_URI, 'https://na1-staging2-di.intgdc.com/uploads/'
+      set_const :STAGING_URI, 'https://staging2-lcm-prod.intgdc.com/gdc/uploads/'
     end
 
     module ProcessHelper

data/spec/integration/blueprint_with_ca_spec.rb

@@ -0,0 +1,56 @@
+# 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 'gooddata'
+
+describe 'Create project using GoodData client', :constraint => 'slow' do
+  before(:all) do
+    @client = ConnectionHelper.create_default_connection
+    @blueprint = GoodData::Model::ProjectBlueprint.build("My project from blueprint") do |project_builder|
+      project_builder.add_dataset('dataset.users', title: 'Users Dataset') do |schema_builder|
+        schema_builder.add_anchor('attr.users.id')
+        schema_builder.add_label('label.users.id_label', reference: 'attr.users.id')
+        schema_builder.add_attribute('attr.users.another_attr')
+        schema_builder.add_label('label.users.another_attr_label', reference: 'attr.users.another_attr')
+        schema_builder.add_fact('fact.users.some_number')
+      end
+    end
+    fail "blueprint is invalid" unless @blueprint.valid?
+
+    @project = @client.create_project_from_blueprint(@blueprint, auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
+  end
+
+  after(:all) do
+    @project && @project.delete
+    @client && @client.disconnect
+  end
+
+  it 'Should create computed attribute' do
+    metric = @project.facts('fact.users.some_number').create_metric(title: 'Test')
+    metric.save
+    attribute = @project.attributes('attr.users.another_attr')
+
+    update = GoodData::Model::ProjectBlueprint.build('update') do |project_builder|
+      project_builder.add_computed_attribute(
+        'attr.comp.my_computed_attr',
+        title: 'My computed attribute',
+        metric: metric,
+        attribute: attribute,
+        buckets: [{ label: 'Small', highest_value: 1000 }, { label: 'Medium', highest_value: 2000 }, { label: 'High' }]
+      )
+    end
+
+    new_bp = @blueprint.merge(update)
+    fail "blueprint with computed attribute is invalid" unless new_bp.valid?
+
+    @project.update_from_blueprint(new_bp)
+    ca = @project.attributes.find { |a| a.title == 'My computed attribute' }
+
+    expect(ca).not_to be_nil
+    expect(ca.computed_attribute?).to be_truthy
+    expect(@project.computed_attributes.length).to eq 1
+  end
+end

data/spec/integration/clients_spec.rb

@@ -62,6 +62,27 @@ describe GoodData::Client do
     end
   end
 
+  describe '#dissociate' do
+    before(:all) do
+      client_id = SecureRandom.uuid
+      @client_project = @client.create_project(title: 'client_1 project', auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
+      @segment_client = @segment.create_client(id: "tenant_#{client_id}", project: @client_project)
+    end
+
+    after(:all) do
+      @client_project && @client_project.delete
+    end
+
+    it 'Dissociate particular client and their project is not cleaned up' do
+      expect(@segment.clients.count).to eq 1
+      s = @segment.clients(@segment_client)
+      s.dissociate
+      expect(@segment.clients.count).to eq 0
+      expect(@client_project.reload!.state).to eq :enabled
+      @segment_client = nil
+    end
+  end
+
   describe '#delete' do
     before(:all) do
       client_id = SecureRandom.uuid

data/spec/integration/command_datawarehouse_spec.rb

@@ -26,7 +26,13 @@ describe GoodData::Command::DataWarehouse do
     dwh = nil
 
     begin
-      dwh = GoodData::Command::DataWarehouse.create(title: title, summary: summary, token: ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT, client: @client)
+      dwh = GoodData::Command::DataWarehouse.create(
+        title: title,
+        summary: summary,
+        token: ConnectionHelper::GD_PROJECT_TOKEN,
+        environment: ProjectHelper::ENVIRONMENT,
+        client: @client
+      )
 
       expect(dwh.title).to eq(title)
       expect(dwh.summary).to eq(summary)

data/spec/integration/create_from_template_spec.rb

@@ -6,7 +6,7 @@
 
 require 'gooddata'
 
-describe "Spin a project from template", :constraint => 'slow' do
+describe 'Spin a project from template', :constraint => 'slow' do
   before(:all) do
     @client = ConnectionHelper.create_default_connection
   end
@@ -15,9 +15,15 @@ describe "Spin a project from template", :constraint => 'slow' do
     @client.disconnect
   end
 
-  it "should spin a project from a template that does not exist. It should throw an error" do
+  it 'should spin a project from a template that does not exist. It should throw an error' do
     expect do
-      GoodData::Project.create(:title => "Test project", :template => "/some/nonexisting/template/uri", :auth_token => ConnectionHelper::GD_PROJECT_TOKEN, environment: ProjectHelper::ENVIRONMENT, :client => @client)
+      GoodData::Project.create(
+        title: 'Test project',
+        template: '/some/nonexisting/template/uri',
+        auth_token: ConnectionHelper::GD_PROJECT_TOKEN,
+        environment: ProjectHelper::ENVIRONMENT,
+        client: @client
+      )
     end.to raise_error
   end
 end

data/spec/integration/project_spec.rb

@@ -155,6 +155,13 @@ describe GoodData::Project, :constraint => 'slow' do
       expect(@project.members?(users).all?).to be_truthy
       expect(@project.get_user(ConnectionHelper::DEFAULT_USERNAME).role.title).to eq 'Admin'
     end
+
+    it 'should downcase login' do
+      users = [ProjectHelper.create_random_user(@client, login: "#{rand(1e7)}+TMA-445+RubyDev+Admin@gooddata.com")]
+      @domain.create_users(users)
+      @project.import_users(users, domain: @domain, whitelists: ['rubydev+admin@gooddata.com'])
+      expect(@project.members?(users.map(&:to_hash).map { |u| u[:login].downcase! })).to be_truthy
+    end
   end
 
   describe '#set_user_roles' do

data/spec/integration/segments_spec.rb

@@ -96,57 +96,4 @@ describe GoodData::Segment do
       end
     end
   end
-
-  describe '#provision_client_projects' do
-    it 'can create a new client in a segment without project and then provision' do
-      begin
-        segment_client = @segment.create_client(id: 'tenant_1')
-        expect(segment_client).to be_an_instance_of(GoodData::Client)
-        expect(@segment.clients.count).to eq 1
-        @domain.synchronize_clients
-        @domain.provision_client_projects
-        expect(@domain.segments.flat_map { |s| s.clients.to_a }.all?(&:project?)).to be_truthy
-      ensure
-        segment_client && segment_client.delete
-      end
-    end
-  end
-
-  describe '#update_clients' do
-    it 'can create a new client in a segment without project and then provision' do
-      begin
-        uuid_2 = SecureRandom.uuid
-        master_project_2 = @client.create_project(title: "Test MASTER project for #{uuid_2}", auth_token: ConnectionHelper::GD_PROJECT_TOKEN)
-        segment_name_2 = "segment-#{uuid_2}"
-        segment_2 = @domain.create_segment(segment_id: segment_name_2, master_project: master_project_2)
-
-        client_1 = "client-#{SecureRandom.uuid}"
-        client_2 = "client-#{SecureRandom.uuid}"
-        data = [{ id: client_1, segment: segment_name_2 },
-                { id: client_2, segment: @segment_name }]
-        @domain.update_clients(data)
-        expect(@domain.segments.map(&:id)).to include(@segment.id, segment_2.id)
-        expect(@domain.segments.pmapcat { |s| s.clients.to_a }.map(&:id)).to include(client_1, client_2)
-
-        client_3 = "client-#{SecureRandom.uuid}"
-        client_4 = "client-#{SecureRandom.uuid}"
-        data = [{ id: client_3, segment: segment_name_2 },
-                { id: client_4, segment: @segment_name }]
-        @domain.update_clients(data)
-        expect(@domain.segments.pmapcat { |s| s.clients.to_a }.map(&:id)).to include(client_1, client_2, client_3, client_4)
-
-        # bring the projects
-        @domain.synchronize_clients
-        @domain.provision_client_projects
-        projects_to_delete = @domain.segments.pmapcat { |s| s.clients.to_a }.select { |c| [client_1, client_2].include?(c.id) }.map(&:project)
-        @domain.update_clients(data, delete_extra: true)
-        expect(@domain.segments.pmapcat { |s| s.clients.to_a }.map(&:id)).to include(client_3, client_4)
-        expect(@domain.segments.pmapcat { |s| s.clients.to_a }.map(&:id)).not_to include(client_1, client_2)
-        expect(projects_to_delete.pmap(&:reload!).map(&:state)).to eq [:deleted, :deleted]
-      ensure
-        master_project_2.delete if master_project_2
-        segment_2.delete(force: true) if segment_2
-      end
-    end
-  end
 end