gooddata 2.1.14-java → 2.2.0-java

data/lib/gooddata/models/domain.rb

@@ -5,7 +5,6 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'cgi'
-require 'active_support/core_ext/hash/compact'
 
 require_relative 'profile'
 require_relative '../extensions/enumerable'
@@ -457,10 +456,12 @@ Available values for setting language are: #{available_languages}."
     alias_method :add_clients_settings, :update_clients_settings
 
     def update_clients(data, options = {})
+      results = []
       data.group_by(&:data_product_id).each do |data_product_id, client_update_data|
         data_product = data_products(data_product_id)
-        data_product.update_clients(client_update_data, options)
+        results.concat data_product.update_clients(client_update_data, options)
       end
+      results
     end
 
     # Update user in domain

data/lib/gooddata/models/metadata/analytical_dashboard.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+#
+# 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.
+
+require_relative 'analytical_visualization_object'
+
+module GoodData
+  class AnalyticalDashboard < GoodData::AnalyticalVisualizationObject
+    EMPTY_OBJECT = {
+      'analyticalDashboard' => {
+        'content' => {
+          'filterContext' => '',
+          'layout' => {},
+          'widgets' => []
+        },
+        'meta' => {
+          'deprecated' => '0',
+          'summary' => '',
+          'title' => ''
+        }
+      }
+    }
+
+    ASSIGNABLE_MEMBERS = %i[filterContext layout widgets deprecated summary title]
+
+    class << self
+      # Method intended to get all AnalyticalDashboard objects in a specified project
+      #
+      # @param options [Hash] the options hash
+      # @option options [Boolean] :full with true value will pull in full objects. Default is false value
+      # @return [Array<GoodData::AnalyticalDashboard>] Return AnalyticalDashboard list
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
+        query('analyticalDashboard', AnalyticalDashboard, options)
+      end
+
+      # Create Analytical Dashboard in the specify project
+      #
+      # @param analytical_dashboard [Hash] the data of object will be created
+      # @param options [Hash] The project that the object will be created in
+      # @return GoodData::AnalyticalDashboard object
+      def create(analytical_dashboard = {}, options = { :client => GoodData.client, :project => GoodData.project })
+        GoodData::AnalyticalVisualizationObject.create(analytical_dashboard, AnalyticalDashboard, EMPTY_OBJECT, ASSIGNABLE_MEMBERS, options)
+      end
+    end
+  end
+end

data/lib/gooddata/models/metadata/analytical_visualization_object.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+#
+# 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
+  class AnalyticalVisualizationObject < GoodData::MdObject
+    class << self
+      # Create a specify object in the specify project
+      #
+      # @param object_data [Hash] the data of object will be created
+      # @param klass [Class] A class used for instantiating the returned data
+      # @param empty_data_object [Hash] the empty data of object will be created
+      # @param assignable_properties [Hash] the properties allow updating
+      # @param options [Hash] The project that the object will be created in
+      # @return klass object
+      def create(object_data, klass, empty_data_object = {}, assignable_properties = [], options = { :client => GoodData.client, :project => GoodData.project })
+        client, project = GoodData.get_client_and_project(GoodData::Helpers.symbolize_keys(options))
+
+        res = client.create(klass, GoodData::Helpers.deep_dup(GoodData::Helpers.stringify_keys(empty_data_object)), :project => project)
+        object_data.each do |k, v|
+          res.send("#{k}=", v) if assignable_properties.include? k
+        end
+        res
+      end
+    end
+  end
+end

data/lib/gooddata/models/metadata/label.rb

@@ -40,22 +40,20 @@ module GoodData
       end
     end
 
-    # Gets valid elements using /validElements? API
+    # Gets valid elements of a label for a specific paging (:offset and :limit) or get validElements of a specific value (:filter).
+    # In the case filter a specific value, because the API /validElements only filter by partial match, we need to filter again at client side for exact match.
     # @return [Array] Results
     def get_valid_elements(*args)
-      results, params = valid_elements(*args)
-      # TMA-775 - the validElements API can possibly return more matches than requested (usually 1)
-      # so we do a preliminary first request to check and then increase the limit if needed
-      if results['validElements']['paging']['total'].to_i != params[:limit]
+      if args && !args.empty? && args.first[:filter]
+        params = args.first
         params[:limit] = 100_000
         results, = valid_elements params
-        if params[:filter]
-          results['validElements']['items'] = results['validElements']['items'].reject do |i|
-            i['element']['title'] != params[:filter]
-          end
+        results['validElements']['items'] = results['validElements']['items'].select do |i|
+          i['element']['title'] == params[:filter]
         end
+      else
+        results, = valid_elements(*args)
       end
-
       results
     end
 
@@ -74,24 +72,25 @@ module GoodData
     # @option options [Number] :limit limits the number of values to certain number. Default is 100
     # @return [Array]
     def values(options = {})
-      Enumerator.new do |y|
-        offset = options[:offset] || 0
-        page_limit = options[:limit] || 100
-        loop do
-          results = get_valid_elements(limit: page_limit, offset: offset)
-
-          elements = results['validElements']
-          elements['items'].map do |el|
-            v = el['element']
-            y << {
-              :value => v['title'],
-              :uri => v['uri']
-            }
-          end
-          break if elements['items'].count < page_limit
-          offset += page_limit
+      all_values = []
+      offset = options[:offset] || 0
+      page_limit = options[:limit] || 100
+      loop do
+        results = get_valid_elements(limit: page_limit, offset: offset)
+
+        elements = results['validElements']
+        elements['items'].map do |el|
+          v = el['element']
+          all_values << {
+            :value => v['title'],
+            :uri => v['uri']
+          }
         end
+        break if elements['items'].count < page_limit
+
+        offset += page_limit
       end
+      all_values
     end
 
     def values_count
@@ -136,7 +135,7 @@ module GoodData
       if status_url
         results = client.poll_on_response(status_url) do |body|
           status = body['taskState'] && body['taskState']['status']
-          status == 'RUNNING' || status == 'PREPARED'
+          status == 'RUNNING' || status == 'PREPARED' || body['uri']
         end
       end
 

data/lib/gooddata/models/metadata/visualization_object.rb

@@ -0,0 +1,50 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+#
+# 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.
+
+require_relative 'analytical_visualization_object'
+
+module GoodData
+  class VisualizationObject < GoodData::AnalyticalVisualizationObject
+    EMPTY_OBJECT = {
+      'visualizationObject' => {
+        'content' => {
+          'buckets' => [],
+          'properties' => '',
+          'visualizationClass' => {}
+        },
+        'links' => {},
+        'meta' => {
+          'deprecated' => '0',
+          'summary' => '',
+          'title' => ''
+        }
+      }
+    }
+
+    ASSIGNABLE_MEMBERS = %i[buckets properties visualizationClass deprecated summary title]
+
+    class << self
+      # Method intended to get all VisualizationObject objects in a specified project
+      #
+      # @param options [Hash] the options hash
+      # @option options [Boolean] :full with true value to pull full objects
+      # @return [Array<GoodData::VisualizationObject>] Return VisualizationObject list
+      def all(options = { :client => GoodData.connection, :project => GoodData.project })
+        query('visualizationObject', VisualizationObject, options)
+      end
+
+      # Create Visualization Object in the specify project
+      #
+      # @param visualization_object [Hash] the data of object will be created
+      # @param options [Hash] The project that the object will be created in
+      # @return GoodData::VisualizationObject object
+      def create(visualization_object = {}, options = { :client => GoodData.client, :project => GoodData.project })
+        GoodData::AnalyticalVisualizationObject.create(visualization_object, VisualizationObject, EMPTY_OBJECT, ASSIGNABLE_MEMBERS, options)
+      end
+    end
+  end
+end

data/lib/gooddata/models/project.rb

@@ -1,6 +1,6 @@
 # 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.
 
@@ -13,7 +13,6 @@ require 'zip'
 require 'net/smtp'
 
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/compact'
 require 'active_support/core_ext/hash/slice'
 
 require_relative '../exceptions/no_project_error'
@@ -31,6 +30,7 @@ require_relative 'process'
 require_relative 'project_log_formatter'
 require_relative 'project_role'
 require_relative 'blueprint/blueprint'
+require_relative 'dataset_mapping'
 
 require_relative 'metadata/scheduled_mail'
 require_relative 'metadata/scheduled_mail/dashboard_attachment'
@@ -38,7 +38,8 @@ require_relative 'metadata/scheduled_mail/report_attachment'
 
 module GoodData
   class Project < Rest::Resource
-    USERSPROJECTS_PATH = '/gdc/account/profile/%s/projects'
+    USER_ACCOUNT_PATH = '/gdc/account/profile/'
+    USERSPROJECTS_PATH = USER_ACCOUNT_PATH + '%s/projects'
     PROJECTS_PATH = '/gdc/projects'
     PROJECT_PATH = '/gdc/projects/%s'
     SLIS_PATH = '/ldm/singleloadinterface'
@@ -255,6 +256,22 @@ module GoodData
         transfer_schedules(from_project, to_project)
       end
 
+      def get_dataset_mapping(from_project)
+        GoodData::DatasetMapping.get(:client => from_project.client, :project => from_project)
+      end
+
+      def update_dataset_mapping(model_mapping_json, to_project)
+        dataset_mapping = GoodData::DatasetMapping.new(model_mapping_json)
+        res = dataset_mapping.save(:client => to_project.client, :project => to_project)
+        status = res&.dig('datasetMappings', 'items').nil? ? "Failed" : "OK"
+        count = "OK".eql?(status) ? res['datasetMappings']['items'].length : 0
+        {
+          to: to_project.pid,
+          count: count,
+          status: status
+        }
+      end
+
       # @param from_project The source project
       # @param to_project The target project
       # @param options Optional parameters
@@ -336,26 +353,22 @@ module GoodData
 
       def get_data_source_alias(data_source_id, client, aliases)
         unless aliases[data_source_id]
-          data_source = GoodData::Helpers.get_data_source_by_id(data_source_id, client)
-          if data_source&.dig('dataSource', 'alias')
+          data_source = GoodData::DataSource.from_id(data_source_id, client: client)
+          if data_source&.alias
             aliases[data_source_id] = {
-              :type => get_data_source_type(data_source),
-              :alias => data_source['dataSource']['alias']
+              :type => data_source.type,
+              :alias => data_source.alias
             }
           end
         end
         aliases[data_source_id]
       end
 
-      def get_data_source_type(data_source_data)
-        data_source_data&.dig('dataSource', 'connectionInfo') ? data_source_data['dataSource']['connectionInfo'].first[0].upcase : ""
-      end
-
       def replace_process_data_source_ids(process_data, client, aliases)
         component = process_data.dig(:process, :component)
         if component&.dig(:configLocation, :dataSourceConfig)
           the_alias = aliases[component[:configLocation][:dataSourceConfig][:id]]
-          process_data[:process][:component][:configLocation][:dataSourceConfig][:id] = GoodData::Helpers.verify_data_source_alias(the_alias, client)
+          process_data[:process][:component][:configLocation][:dataSourceConfig][:id] = verify_data_source_alias(the_alias, client)
         end
         process_data[:process][:dataSources] = replace_data_source_ids(process_data[:process][:dataSources], client, aliases)
         process_data
@@ -365,13 +378,35 @@ module GoodData
         array_data_sources = []
         if data_sources && !data_sources.empty?
           data_sources.map do |data_source|
-            new_id = GoodData::Helpers.verify_data_source_alias(aliases[data_source[:id]], client)
+            new_id = verify_data_source_alias(aliases[data_source[:id]], client)
             array_data_sources.push(:id => new_id)
           end
         end
         array_data_sources
       end
 
+      # Verify whether the data source exists in the domain using its alias
+      #
+      # @param [String] ds_alias The data source's alias
+      # @param [Object] client The Rest Client object
+      # @return [String] Id of the data source or failed with the reason
+      def verify_data_source_alias(ds_alias, client)
+        domain = client.connection.server.url
+        fail "The data source alias is empty, check your data source configuration." unless ds_alias
+
+        uri = "/gdc/dataload/dataSources/internal/availableAlias?alias=#{ds_alias[:alias]}"
+        res = client.get(uri)
+        fail "Unable to get information about the Data Source '#{ds_alias[:alias]}' in the domain '#{domain}'" unless res
+        fail "Unable to find the #{ds_alias[:type]} Data Source '#{ds_alias[:alias]}' in the domain '#{domain}'" if res['availableAlias']['available']
+
+        ds_type = res['availableAlias']['existingDataSource']['type']
+        if ds_type && ds_type != ds_alias[:type]
+          fail "Wrong Data Source type - the '#{ds_type}' type is expected but the Data Source '#{ds_alias[:alias]}' in the domain '#{domain}' has the '#{ds_alias[:type]}' type"
+        else
+          res['availableAlias']['existingDataSource']['id']
+        end
+      end
+
       def transfer_user_groups(from_project, to_project)
         from_project.user_groups.map do |ug|
           # migrate groups
@@ -438,7 +473,9 @@ module GoodData
         local_stuff = local_schedules.map do |s|
           v = s.to_hash
           after_schedule = local_schedules.find { |s2| s.trigger_id == s2.obj_id }
-          v[:after] = s.trigger_id && after_schedule && after_schedule.name
+          after_process_schedule = from_project_processes.find { |p| after_schedule && p.obj_id == after_schedule.process_id }
+          v[:after] = s.trigger_id && after_process_schedule && after_schedule && after_schedule.name
+          v[:trigger_execution_status] = s.trigger_execution_status
           v[:remote_schedule] = s
           v[:params] = v[:params].except("EXECUTABLE", "PROCESS_ID")
           v.compact
@@ -507,6 +544,7 @@ module GoodData
             schedule.params = (schedule_spec[:params] || {})
             schedule.cron = schedule_spec[:cron] if schedule_spec[:cron]
             schedule.after = schedule_cache[schedule_spec[:after]] if schedule_spec[:after]
+            schedule.trigger_execution_status = schedule_cache[schedule_spec[:trigger_execution_status]] if schedule_spec[:after]
             schedule.hidden_params = schedule_spec[:hidden_params] || {}
             if process_spec.type != :dataload
               schedule.executable = schedule_spec[:executable] || (process_spec.type == :ruby ? 'main.rb' : 'main.grf')
@@ -567,7 +605,8 @@ module GoodData
           hidden_params: schedule_spec[:hidden_params],
           name: schedule_spec[:name],
           reschedule: schedule_spec[:reschedule],
-          state: schedule_spec[:state]
+          state: schedule_spec[:state],
+          trigger_execution_status: schedule_spec[:trigger_execution_status]
         }
       end
     end
@@ -1716,7 +1755,7 @@ module GoodData
         end
       end
       diff_results = diff_results.map do |u|
-        u[:login_uri] = "/gdc/account/profile/" + u[:login]
+        u[:login_uri] = USER_ACCOUNT_PATH + u[:login]
         u
       end
       return diff_results if options[:dry_run]
@@ -1952,17 +1991,17 @@ module GoodData
 
     def resolve_roles(login, desired_roles, options = {})
       user = if login.is_a?(String) && login.include?('@')
-               '/gdc/account/profile/' + login
+               USER_ACCOUNT_PATH + login
              elsif login.is_a?(String)
                login
              elsif login.is_a?(Hash) && login[:login]
-               '/gdc/account/profile/' + login[:login]
+               USER_ACCOUNT_PATH + login[:login]
              elsif login.is_a?(Hash) && login[:uri]
                login[:uri]
              elsif login.respond_to?(:uri) && login.uri
                login.uri
              elsif login.respond_to?(:login) && login.login
-               '/gdc/account/profile/' + login.login
+               USER_ACCOUNT_PATH + login.login
              else
                fail "Unsupported user specification #{login}"
              end
@@ -2000,6 +2039,14 @@ module GoodData
       GoodData::Project.transfer_etl(client, self, target)
     end
 
+    def dataset_mapping
+      GoodData::Project.get_dataset_mapping(self)
+    end
+
+    def update_dataset_mapping(model_mapping_json)
+      GoodData::Project.update_dataset_mapping(model_mapping_json, self)
+    end
+
     def transfer_processes(target)
       GoodData::Project.transfer_processes(self, target)
     end

data/lib/gooddata/models/schedule.rb

@@ -101,6 +101,7 @@ module GoodData
 
         schedule.name = options[:name]
         schedule.set_trigger(trigger)
+        schedule.trigger_execution_status = options[:trigger_execution_status]
         schedule.params = default_opts[:params].merge(options[:params] || {})
         schedule.hidden_params = options[:hidden_params] || {}
         schedule.timezone = options[:timezone] || default_opts[:timezone]
@@ -468,6 +469,7 @@ module GoodData
         hidden_params: hidden_params,
         cron: cron,
         trigger_id: trigger_id,
+        trigger_execution_status: trigger_execution_status,
         timezone: timezone,
         uri: uri,
         reschedule: reschedule,
@@ -486,6 +488,16 @@ module GoodData
       self
     end
 
+    def trigger_execution_status
+      json['schedule']['triggerExecutionStatus']
+    end
+
+    def trigger_execution_status=(trigger_execution_status)
+      json['schedule']['triggerExecutionStatus'] = trigger_execution_status
+      @dirty = true
+      self # rubocop:disable Lint/Void
+    end
+
     def name
       json['schedule']['name']
     end
@@ -530,7 +542,7 @@ module GoodData
           'hiddenParams' => GoodData::Helpers.encode_hidden_params(hidden_params)
         }
       }
-
+      res['schedule']['triggerExecutionStatus'] = trigger_execution_status if trigger_execution_status
       res['schedule']['reschedule'] = reschedule if reschedule
 
       res

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

@@ -7,7 +7,6 @@
 require_relative '../project_log_formatter'
 
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/compact'
 
 require 'gooddata/extensions/true'
 require 'gooddata/extensions/false'
@@ -204,7 +203,7 @@ module GoodData
     # so it precaches the values and still be able to function for larger ones even
     # though that would mean tons of requests
     def self.get_small_labels(labels_cache)
-      labels_cache.values.select { |label| label && label.values_count && label.values_count < 100_000 }
+      labels_cache.values.select { |label| label &.values_count &. < 100_000 }
     end
 
     # Creates a MAQL expression(s) based on the filter defintion.
@@ -422,68 +421,73 @@ module GoodData
                  results: create_results + delete_results }
       end
 
-      create_results = to_create.each_slice(100).flat_map do |batch|
-        batch.pmapcat do |related_uri, group|
-          group.each(&:save)
-          res = client.get("/gdc/md/#{project.pid}/userfilters?users=#{related_uri}")
-          items = res['userFilters']['items'].empty? ? [] : res['userFilters']['items'].first['userFilters']
-
-          payload = {
-            'userFilters' => {
-              'items' => [{
-                'user' => related_uri,
-                'userFilters' => items.concat(group.map(&:uri))
-              }]
+      if to_create.empty?
+        create_results = []
+      else
+        create_results = to_create.each_slice(100).flat_map do |batch|
+          batch.pmapcat do |related_uri, group|
+            group.each(&:save)
+            res = client.get("/gdc/md/#{project.pid}/userfilters?users=#{related_uri}")
+            items = res['userFilters']['items'].empty? ? [] : res['userFilters']['items'].first['userFilters']
+
+            payload = {
+              'userFilters' => {
+                'items' => [{
+                  'user' => related_uri,
+                  'userFilters' => items.concat(group.map(&:uri))
+                }]
+              }
             }
-          }
-          res = client.post("/gdc/md/#{project.pid}/userfilters", payload)
+            res = client.post("/gdc/md/#{project.pid}/userfilters", payload)
 
-          # turn the errors from hashes into array of hashes
-          update_result = res['userFiltersUpdateResult'].flat_map do |k, v|
-            v.map { |r| { status: k.to_sym, user: r, type: :create } }
-          end
+            # turn the errors from hashes into array of hashes
+            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
+            update_result.map do |result|
+              result[:status] == :failed ? result.merge(GoodData::Helpers.symbolize_keys(result[:user])) : result
+            end
           end
         end
+        project_log_formatter.log_user_filter_results(create_results, to_create)
+        create_errors = create_results.select { |r| r[:status] == :failed }
+        fail "Creating MUFs resulted in errors: #{create_errors}" if create_errors.any?
       end
 
-      project_log_formatter.log_user_filter_results(create_results, to_create)
-      create_errors = create_results.select { |r| r[:status] == :failed }
-      fail "Creating MUFs resulted in errors: #{create_errors}" if create_errors.any?
-
-      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|
-                             results = []
-                             if related_uri
-                               res = client.get("/gdc/md/#{project.pid}/userfilters?users=#{related_uri}")
-                               items = res['userFilters']['items'].empty? ? [] : res['userFilters']['items'].first['userFilters']
-                               payload = {
-                                 'userFilters' => {
-                                   'items' => [
-                                     {
-                                       'user' => related_uri,
-                                       'userFilters' => items - group.map(&:uri)
-                                     }
-                                   ]
-                                 }
-                               }
-                               res = client.post("/gdc/md/#{project.pid}/userfilters", payload)
-                               results.concat(res['userFiltersUpdateResult']
+      if to_delete.empty?
+        delete_results = []
+      elsif !options[:do_not_touch_filters_that_are_not_mentioned]
+        delete_results = to_delete.each_slice(100).flat_map do |batch|
+          batch.flat_map do |related_uri, group|
+            results = []
+            if related_uri
+              res = client.get("/gdc/md/#{project.pid}/userfilters?users=#{related_uri}")
+              items = res['userFilters']['items'].empty? ? [] : res['userFilters']['items'].first['userFilters']
+              payload = {
+                'userFilters' => {
+                  'items' => [
+                    {
+                      'user' => related_uri,
+                      'userFilters' => items - group.map(&:uri)
+                    }
+                  ]
+                }
+              }
+              res = client.post("/gdc/md/#{project.pid}/userfilters", payload)
+              results.concat(res['userFiltersUpdateResult']
                                  .flat_map { |k, v| v.map { |r| { status: k.to_sym, user: r, type: :delete } } }
                                  .map { |result| result[:status] == :failed ? result.merge(GoodData::Helpers.symbolize_keys(result[:user])) : result })
-                             end
-                             group.peach(&:delete)
-                             results
-                           end
-                         end
-                       end
+            end
+            group.peach(&:delete)
+            results
+          end
 
-      project_log_formatter.log_user_filter_results(delete_results, to_delete)
-      delete_errors = delete_results.select { |r| r[:status] == :failed } if delete_results
-      fail "Deleting MUFs resulted in errors: #{delete_errors}" if delete_errors && delete_errors.any?
+          project_log_formatter.log_user_filter_results(delete_results, to_delete)
+          delete_errors = delete_results.select { |r| r[:status] == :failed } if delete_results
+          fail "Deleting MUFs resulted in errors: #{delete_errors}" if delete_errors&.any?
+        end
+      end
 
       { created: to_create, deleted: to_delete, results: create_results + (delete_results || []) }
     end

data/lib/gooddata/models/user_group.rb

@@ -13,7 +13,6 @@ require_relative '../mixins/rest_resource'
 require_relative '../mixins/uri_getter'
 
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/compact'
 
 module GoodData
   # Representation of User Group

data/lib/gooddata/rest/connection.rb

@@ -1,6 +1,6 @@
 # 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.
 
@@ -26,6 +26,8 @@ module GoodData
     class Connection
       include MonitorMixin
 
+      HTTPS_PROTOCOL = 'https://'
+      HTTP_PROTOCOL = 'http://'
       DEFAULT_URL = 'https://secure.gooddata.com'
       LOGIN_PATH = '/gdc/account/login'
       TOKEN_PATH = '/gdc/account/token'
@@ -712,12 +714,12 @@ ERR
 
       def fix_server_url(server)
         server = server.chomp('/')
-        if server.start_with? 'http://'
-          server = server.sub 'http://', 'https://'
+        if server.start_with? HTTP_PROTOCOL
+          server = server.sub HTTP_PROTOCOL, HTTPS_PROTOCOL
           GoodData.logger.warn 'You specified the HTTP protocol in your server string. It has been autofixed to HTTPS.'
         end
 
-        server = 'https://' + server unless server.start_with? 'https://'
+        server = HTTPS_PROTOCOL + server unless server.start_with? HTTPS_PROTOCOL
         server
       end
     end