gooddata 1.0.2-java → 1.1.0-java

data/lib/gooddata/models/project.rb

@@ -264,6 +264,9 @@ module GoodData
           to_process = if process.path
                          to_process.delete if to_process
                          GoodData::Process.deploy_from_appstore(process.path, name: process.name, client: to_project.client, project: to_project)
+                       elsif process.component
+                         to_process.delete if to_process
+                         GoodData::Process.deploy_component(GoodData::Helpers.symbolize_keys(process.to_hash), project: to_project, client: to_project.client)
                        else
                          Dir.mktmpdir('etl_transfer') do |dir|
                            dir = Pathname(dir)
@@ -1172,22 +1175,15 @@ module GoodData
     # @return [String] Returns token that you can use as input for object_import
     def objects_export(objs, options = {})
       fail 'Nothing to migrate. You have to pass list of objects, ids or uris that you would like to migrate' if objs.nil?
-      objs = Array(objs)
+      objs = Array(objs).map { |o| o.respond_to?(:uri) ? o.uri : o }
       if objs.empty?
         GoodData.logger.warn 'Nothing to migrate.'
         return
       end
 
-      objs = objs.pmap { |obj| [obj, objects(obj)] }
-      if objs.any? { |_, obj| obj.nil? }
-        object = objs.select { |_, obj| obj.nil? }.map { |o, _| o }.join(', ')
-        error_message = "Exporting objects failed with messages. " \
-                        "Object #{object} could not be found."
-        fail ObjectsExportError, error_message
-      end
       export_payload = {
         :partialMDExport => {
-          :uris => objs.map { |_, obj| obj.uri },
+          :uris => objs,
           :exportAttributeProperties => '1',
           :crossDataCenterExport => '1'
         }
@@ -1259,32 +1255,21 @@ module GoodData
       if projects.is_a?(Array)
         projects.each_slice(batch_size).flat_map do |batch|
           batch.pmap do |proj|
-            begin
-              target_project = client.projects(proj)
-              target_project.objects_import(token, options)
-              {
-                project: target_project,
-                result: true
-              }
-            rescue RestClient::Exception => e
-              {
-                project: proj,
-                exception: e,
-                result: false,
-                reason: GoodData::Helpers.interpolate_error_message(MultiJson.load(e.response))
-              }
-            rescue GoodData::ObjectsImportError => e
-              {
-                project: target_project,
-                result: false,
-                reason: e.message
-              }
-            end
+            target_project = client.projects(proj)
+            target_project.objects_import(token, options)
+            {
+              project: target_project,
+              result: true
+            }
           end
         end
       else
         target_project = client.projects(projects)
         target_project.objects_import(token, options)
+        [{
+          project: target_project,
+          result: true
+        }]
       end
     end
 
@@ -1464,12 +1449,10 @@ module GoodData
     #
     # @return [Array<GoodData::ProjectRole>] List of roles
     def roles
-      url = "/gdc/projects/#{pid}/roles"
-
-      tmp = client.get(url)
-      tmp['projectRoles']['roles'].pmap do |role_url|
-        json = client.get role_url
-        client.create(GoodData::ProjectRole, json, project: self)
+      url = "/gdc/internal/projects/#{pid}/roles"
+      res = client.get url
+      res['internalProjectRoles']['roles'].map do |r|
+        client.create(GoodData::ProjectRole, r, project: self)
       end
     end
 

data/lib/gooddata/models/project_creator.rb

@@ -42,7 +42,9 @@ module GoodData
           _, project = GoodData.get_client_and_project(opts)
 
           bp = ProjectBlueprint.new(spec)
-          response = project.maql_diff(blueprint: bp, params: [:includeGrain])
+          maql_diff_params = [:includeGrain]
+          maql_diff_params << :excludeFactRule if opts[:exclude_fact_rule]
+          response = project.maql_diff(blueprint: bp, params: maql_diff_params)
 
           GoodData.logger.debug("projectModelDiff") { response.pretty_inspect }
           chunks = response['projectModelDiff']['updateScripts']

data/lib/gooddata/models/project_role.rb

@@ -33,6 +33,7 @@ module GoodData
         d[:updated] = data[:updated] || d[:created] || Time.now
         d[:title] = data[:title]
         d[:summary] = data[:summary]
+        d[:uri] = data[:uri]
       end
       new_data = GoodData::Helpers.deep_dup(EMPTY_OBJECT).tap do |d|
         d['projectRole']['links']['self'] = data[:uri] if data[:uri]
@@ -54,7 +55,7 @@ module GoodData
     #
     # @return [Array<GoodData::Profile>] List of users
     def users
-      url = data['links']['roleUsers']
+      url = uri + '/users'
       tmp = client.get url
       tmp['associatedUsers']['users'].pmap do |user_url|
         url = user_url
@@ -67,9 +68,7 @@ module GoodData
     #
     # @return [string] URI of this project role
     def uri
-      return @json['projectRole']['links']['self'] if @json['projectRole']['links']['self']
-      return nil unless @json['projectRole']['links']['roleUsers']
-      @json['projectRole']['links']['roleUsers'].split('/')[0...-1].join('/')
+      @json['projectRole']['meta']['uri']
     end
 
     def ==(other)

data/lib/gooddata/models/schedule.rb

@@ -77,7 +77,6 @@ module GoodData
         else
           fail 'Executable has to be provided' if executable.blank?
         end
-        fail 'Trigger schedule has to be provided' if trigger.blank?
 
         schedule = c.create(GoodData::Schedule, GoodData::Helpers.stringify_keys(GoodData::Helpers.deep_dup(SCHEDULE_TEMPLATE)), client: c, project: project)
 
@@ -403,7 +402,6 @@ module GoodData
     #
     # @return [Boolean] True if saved
     def save
-      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

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

@@ -28,7 +28,7 @@ module GoodData
           result = c.get("/gdc/md/#{project.pid}/userfilters?count=#{count}&offset=#{offset}")
           result['userFilters']['items'].each do |item|
             item['userFilters'].each do |f|
-              user_lookup[f] = item['user']
+              user_lookup[f] = user_lookup[f] ? Array(user_lookup[f]).concat([item['user']]) : item['user']
             end
           end
           break if result['userFilters']['length'] < offset
@@ -72,5 +72,13 @@ module GoodData
       res = client.post(project.md['obj'], data)
       @json[:uri] = res['uri']
     end
+
+    def related
+      if related_uri.is_a? Array
+        related_uri.map { |u| super u }
+      else
+        super
+      end
+    end
   end
 end

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

@@ -30,8 +30,7 @@ module GoodData
     # Returns the the object of this filter is related to. It can be either project or a user
     #
     # @return [GoodData::Project | GoodData::Profile] Related object
-    def related
-      uri = related_uri
+    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

@@ -5,6 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 require_relative '../project_log_formatter'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module GoodData
   module UserFilterBuilder
@@ -270,10 +271,10 @@ module GoodData
       attrs_cache = create_attrs_cache(filters, options)
       create_filter_proc = proc do |login, f|
         expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
+        safe_login = login.downcase
         profiles_uri = if options[:type] == :muf
                          project_user = project_users.find { |u| u.login == login }
-
-                         project_user.nil? ? ('/gdc/account/profile/' + login) : project_user.profile_url
+                         project_user.nil? ? ('/gdc/account/profile/' + safe_login) : project_user.profile_url
                        elsif options[:type] == :variable
                          (users_cache[login] && users_cache[login].uri)
                        else
@@ -384,7 +385,14 @@ module GoodData
       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
+
+      if dry_run
+        create_results = to_create.map { |x| { status: 'dry_run', user: x.first, type: 'create' } }
+        delete_results = to_delete.map { |x| { status: 'dry_run', user: x.first, type: 'delete' } }
+        return { created: {},
+                 deleted: {},
+                 results: create_results + delete_results }
+      end
 
       create_results = to_create.each_slice(100).flat_map do |batch|
         batch.pmapcat do |related_uri, group|
@@ -414,6 +422,8 @@ module GoodData
       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|
@@ -444,6 +454,8 @@ module GoodData
                        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?
 
       { created: to_create, deleted: to_delete, results: create_results + (delete_results || []) }
     end
@@ -541,13 +553,13 @@ module GoodData
     # if this does not happen, users that are about to be deleted by users_brick
     # would have all their filters removed now, which is not desirable
     def self.sanitize_filters_to_delete(to_delete, users_brick_input, project_users)
-      return to_delete unless users_brick_input && users_brick_input.any?
+      return [] unless users_brick_input && users_brick_input.any?
       user_profiles = users_brick_input.map do |user|
-        result = project_users.find { |u| u.login == user['login'] }
+        result = project_users.find { |u| u.login == user.with_indifferent_access['login'] }
         next unless result
         result.profile_url
       end.compact
-      return to_delete unless user_profiles.any?
+      return [] unless user_profiles.any?
       to_delete.reject do |_, value|
         user_profiles.none? { |profile| profile == value.first.json[:related] }
       end

data/lib/gooddata/rest/client.rb

@@ -111,8 +111,7 @@ module GoodData
         end
 
         def connect_sso(sso)
-          client = Client.new(sso)
-          client
+          @@instance = Client.new(sso) # rubocop:disable ClassVars
         end
 
         def disconnect

data/lib/gooddata/rest/connection.rb

@@ -17,48 +17,6 @@ require_relative '../helpers/global_helpers'
 
 require_relative 'phmap'
 
-module RestClient
-  module AbstractResponse
-    alias_method :old_follow_redirection, :follow_redirection
-    def follow_redirection(request = nil, result = nil, &block)
-      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
-
-      url = headers[:location]
-      url = URI.parse(request.url).merge(url).to_s if url !~ /^http/
-
-      new_args[:url] = url
-      if request
-        fail MaxRedirectsReached if request.max_redirects.zero?
-        new_args[:password] = request.password
-        new_args[:user] = request.user
-        new_args[:headers] = request.headers
-        new_args[:max_redirects] = request.max_redirects - 1
-
-        # TODO: figure out what to do with original :cookie, :cookies values
-        new_args[:cookies] = get_redirection_cookies(request, result, new_args)
-      end
-
-      Request.execute(new_args, &block)
-    end
-
-    # Returns cookies which should be passed when following redirect
-    #
-    # @param request [RestClient::Request] Original request
-    # @param result [Net::HTTPResponse] Response
-    # @param args [Hash] Original arguments
-    # @return [Hash] Cookies to be passsed when following redirect
-    def get_redirection_cookies(request, _result, _args)
-      request.cookies
-    end
-  end
-end
-
 module GoodData
   module Rest
     class RestRetryError < StandardError
@@ -210,13 +168,23 @@ module GoodData
 
         # Reset old cookies first
         if options[:sst_token]
-          merge_headers!(:x_gdc_authsst => options[:sst_token])
+          headers = {
+            :x_gdc_authsst => options[:sst_token],
+            :x_gdc_authtt => options[:tt_token]
+          }
+          merge_headers!(headers)
           get('/gdc/account/token', @request_params)
 
           @user = get(get('/gdc/app/account/bootstrap')['bootstrapResource']['accountSetting']['links']['self'])
           GoodData.logger.info("Connected using SST to server #{@server.url} to profile \"#{@user['accountSetting']['login']}\"")
           @auth = {}
           refresh_token :dont_reauth => true
+        elsif  options[:headers][:x_gdc_authsst]
+          @request_params = options[:headers]
+          @user = get('/gdc/app/account/bootstrap')['bootstrapResource']
+          GoodData.logger.info("Connected using SST to server #{@server.url} to profile \"#{@user['accountSetting']['login']}\"")
+          @auth = {}
+          refresh_token :dont_reauth => true
         else
           GoodData.logger.info("Connected using username \"#{username}\" to server #{@server.url}")
           credentials = Connection.construct_login_payload(username, password)
@@ -656,9 +624,7 @@ ERR
           placeholders = true
 
           if placeholders
-            PH_MAP.each do |pm|
-              break if title.gsub!(pm[1], pm[0])
-            end
+            title = self.class.map_placeholders(title)
           end
 
           stat = stats[title]

data/lib/gooddata/rest/phmap.rb

@@ -7,74 +7,119 @@
 module GoodData
   module Rest
     class Connection
+      def self.map_placeholders(title)
+        PH_MAP.each do |pm|
+          break if title.gsub!(pm[1], pm[0])
+        end
+        title
+      end
+
       # PH_MAP for wildcarding of URLs in reports
       PH_MAP = [
-        ['/gdc/account/profile/{id}', %r{/gdc/account/profile/[\w]+}],
-        ['/gdc/account/login/{id}', %r{/gdc/account/login/[\w]+}],
-        ['/gdc/account/domains/{id}/users?login={login}', %r{/gdc/account/domains/[\w\d-]+/users\?login=[^&$]+}],
-        ['/gdc/account/domains/{id}', %r{/gdc/account/domains/[\w\d-]+}],
+        ['/gdc/projects/{id}/execute', %r{/gdc/projects/[^\/]+/execute}],
+
+        ['/gdc/dataload/projects/{id}/outputStage', %r{/gdc/dataload/projects/[^\/]+/outputStage}],
+
+        ['/gdc/datawarehouse/instances/{id}', %r{/gdc/datawarehouse/instances/[^\/]+}],
+        ['/gdc/datawarehouse/executions/{id}', %r{/gdc/datawarehouse/executions/[^\/]+}],
 
-        ['/gdc/projects/{id}/execute', %r{/gdc/projects/[\w]+/execute}],
+        # domain dataproducts' clients
+        ['/gdc/domains/{id}/dataproducts/{data_product}/clients?segment={segment}',
+         %r{\/gdc\/domains\/[^\/]+\/dataproducts\/[^\/]+\/clients\?.*segment=[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/clients/{client}', %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/clients/[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/clients', %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/clients}],
 
-        ['/gdc/datawarehouse/instances/{id}', %r{/gdc/datawarehouse/instances/[\w]+}],
-        ['/gdc/datawarehouse/executions/{id}', %r{/gdc/datawarehouse/executions/[\w]+}],
+        # domain dataproducts' segments
+        ['/gdc/domains/{id}/dataproducts/{data_product}/segments/{segment}/synchronizeClients/results/{result}/details?offset={offset}&limit={limit}',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/segments/[^\/]+/synchronizeClients/results/[^\/]+/details\?offset=[\d]+&limit=[\d]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/segments/{segment}/synchronizeClients/results/{result}',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/segments/[^\/]+/synchronizeClients/results/[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/segments/{segment}', %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/segments/[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/segments', %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/segments}],
 
+        # domain dataproducts' provision & update
+        ['/gdc/domains/{id}/dataproducts/{data_product}/provisionClientProjects/results/{result}/details?offset={offset}&limit={limit}',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/provisionClientProjects/results/[^\/]+/details\?offset=[\d]+&limit=[\d]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/provisionClientProjects/results/{result}',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/provisionClientProjects/results/[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/provisionClientProjects',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/provisionClientProjects}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/updateClients?deleteExtraInSegments={segments}',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/updateClients\?deleteExtraInSegments=[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts/{data_product}/updateClients',
+         %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+/updateClients}],
+
+        # domain dataproduct
+        ['/gdc/domains/{id}/dataproducts/{data_product}', %r{/gdc/domains/[^\/]+/dataproducts/[^\/]+}],
+        ['/gdc/domains/{id}/dataproducts', %r{/gdc/domains/[^\/]+/dataproducts}],
+
+        # domain segments
         ['/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]+}],
+         %r{/gdc/domains/[^\/]+/segments/[^\/]+/synchronizeClients/results/[^\/]+/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-]+}],
-        ['/gdc/domains/{id}/clients?segment={segment}', %r{/gdc/domains/[\w-]+/clients\?segment=[\w-]+}],
-        ['/gdc/domains/{id}/clients/{client_id}/settings/lcm.title', %r{/gdc/domains/[\w-]+/clients/[\w-]+/settings/lcm.title}],
-        ['/gdc/domains/{id}/clients/{client_id}/settings/lcm.token', %r{/gdc/domains/[\w-]+/clients/[\w-]+/settings/lcm.token}],
-        ['/gdc/domains/{id}/clients/{client_id}', %r{/gdc/domains/[\w-]+/clients/[\w-]+}],
+         %r{/gdc/domains/[^\/]+/segments/[^\/]+/synchronizeClients/results/[^\/]+}],
+        ['/gdc/domains/{id}/segments/{segment}/', %r{/gdc/domains/[^\/]+/segments/[^\/]+/}],
+        ['/gdc/domains/{id}/segments/{segment}', %r{/gdc/domains/[^\/]+/segments/[^\/]+}],
+
+        # domain clients
+        ['/gdc/domains/{id}/clients?segment={segment}', %r{/gdc/domains/[^\/]+/clients\?segment=[^\/]+}],
+        ['/gdc/domains/{id}/clients/{client_id}/settings/lcm.title', %r{/gdc/domains/[^\/]+/clients/[^\/]+/settings/lcm.title}],
+        ['/gdc/domains/{id}/clients/{client_id}/settings/lcm.token', %r{/gdc/domains/[^\/]+/clients/[^\/]+/settings/lcm.token}],
+        ['/gdc/domains/{id}/clients/{client_id}', %r{/gdc/domains/[^\/]+/clients/[^\/]+}],
         ['/gdc/domains/{id}/provisionClientProjects/results/{result}/details?offset={offset}&limit={limit}',
-         %r{/gdc/domains/[\w-]+/provisionClientProjects/results/[\w]+/details/\?offset=[\d]+&limit=[\d]+}],
-        ['/gdc/domains/{id}/provisionClientProjects/results/{result}', %r{/gdc/domains/[\w-]+/provisionClientProjects/results/[\w]+}],
-        ['/gdc/domains/{id}/provisionClientProjects', %r{/gdc/domains/[\w-]+/provisionClientProjects}],
-        ['/gdc/domains/{id}/updateClients', %r{/gdc/domains/[\w-]+/updateClients}],
-        ['/gdc/domains/{id}/', %r{/gdc/domains/[\w-]+/}],
+         %r{/gdc/domains/[^\/]+/provisionClientProjects/results/[^\/]+/details\?offset=[\d]+&limit=[\d]+}],
+        ['/gdc/domains/{id}/provisionClientProjects/results/{result}', %r{/gdc/domains/[^\/]+/provisionClientProjects/results/[^\/]+}],
+        ['/gdc/domains/{id}/provisionClientProjects', %r{/gdc/domains/[^\/]+/provisionClientProjects}],
+        ['/gdc/domains/{id}/updateClients', %r{/gdc/domains/[^\/]+/updateClients}],
+        ['/gdc/domains/{id}/', %r{/gdc/domains/[^\/]+/}],
 
-        ['/gdc/exporter/result/{id}/{id}', %r{/gdc/exporter/result/[\w]+/[\w]+}],
+        ['/gdc/exporter/result/{id}/{id}', %r{/gdc/exporter/result/[^\/]+/[^\/]+}],
 
         ['/gdc/internal/lcm/domains/{id}/dataproducts/{data_product}/segments/{segment}/syncProcesses/{process}',
-         %r{/gdc/internal/lcm/domains/[\w-]+/dataproducts/[\w-]+/segments/[\w-]+/syncProcesses/[\w]+}],
+         %r{/gdc/internal/lcm/domains/[^\/]+/dataproducts/[^\/]+/segments/[^\/]+/syncProcesses/[^\/]+}],
         ['/gdc/internal/lcm/domains/{id}/dataproducts/{data_product}/segments/{segment}/syncProcesses',
-         %r{/gdc/internal/lcm/domains/[\w-]+/dataproducts/[\w-]+/segments/[\w-]+/syncProcesses}],
-
-        ['/gdc/internal/projects/{id}/objects/setPermissions', %r{/gdc/internal/projects/[\w]+/objects/setPermissions}],
-
-        ['/gdc/md/{id}/variables/item/{id}', %r{/gdc/md/[\w]+/variables/item/[\d]+}],
-        ['/gdc/md/{id}/validate/task/{id}', %r{/gdc/md/[\w]+/validate/task/[\w]+}],
-        ['/gdc/md/{id}/using2/{id}/{id}', %r{/gdc/md/[\w]+/using2/[\d]+/[\d]+}],
-        ['/gdc/md/{id}/using2/{id}', %r{/gdc/md/[\w]+/using2/[\d]+}],
-        ['/gdc/md/{id}/userfilters?users={users}', %r{/gdc/md/[\w]+/userfilters\?users=[/\w]+}],
-        ['/gdc/md/{id}/userfilters?count={count}&offset={offset}', %r{/gdc/md/[\w]+/userfilters\?count=[\d]+&offset=[\d]+}],
-        ['/gdc/md/{id}/usedby2/{id}/{id}', %r{/gdc/md/[\w]+/usedby2/[\d]+/[\d]+}],
-        ['/gdc/md/{id}/usedby2/{id}', %r{/gdc/md/[\w]+/usedby2/[\d]+}],
-        ['/gdc/md/{id}/tasks/{id}/status', %r{/gdc/md/[\w]+/tasks/[\w]+/status}],
-        ['/gdc/md/{id}/obj/{id}/validElements', %r{/gdc/md/[\w]+/obj/[\d]+/validElements(/)?(\?.*)?}],
-        ['/gdc/md/{id}/obj/{id}/elements', %r{/gdc/md/[\w]+/obj/[\d]+/elements(/)?(\?.*)?}],
-        ['/gdc/md/{id}/obj/{id}', %r{/gdc/md/[\w]+/obj/[\d]+}],
-        ['/gdc/md/{id}/etltask/{id}', %r{/gdc/md/[\w]+/etltask/[\w]+}],
-        ['/gdc/md/{id}/dataResult/{id}', %r{/gdc/md/[\w]+/dataResult/[\d]+}],
-        ['/gdc/md/{id}', %r{/gdc/md/[\w]+}],
-
-        ['/gdc/projects/{id}/users/{id}/roles', %r{/gdc/projects/[\w]+/users/[\w]+/roles}],
-        ['/gdc/projects/{id}/users/{id}/permissions', %r{/gdc/projects/[\w]+/users/[\w]+/permissions}],
-        ['/gdc/projects/{id}/users', %r{/gdc/projects/[\w]+/users}],
-        ['/gdc/projects/{id}/schedules/{id}/executions/{id}', %r{/gdc/projects/[\w]+/schedules/[\w]+/executions/[\w]+}],
-        ['/gdc/projects/{id}/schedules/{id}', %r{/gdc/projects/[\w]+/schedules/[\w]+}],
-        ['/gdc/projects/{id}/roles/{id}', %r{/gdc/projects/[\w]+/roles/[\d]+}],
-        ['/gdc/projects/{id}/model/view/{id}', %r{/gdc/projects/[\w]+/model/view/[\w]+}],
-        ['/gdc/projects/{id}/model/view', %r{/gdc/projects/[\w]+/model/view}],
-        ['/gdc/projects/{id}/model/diff/{id}', %r{/gdc/projects/[\w]+/model/diff/[\w]+}],
-        ['/gdc/projects/{id}/model/diff', %r{/gdc/projects/[\w]+/model/diff}],
-        ['/gdc/projects/{id}/dataload/processes/{id}/executions/{id}', %r{/gdc/projects/[\w]+/dataload/processes/[\w-]+/executions/[\w-]+}],
-        ['/gdc/projects/{id}/dataload/processes/{id}', %r{/gdc/projects/[\w]+/dataload/processes/[\w-]+}],
-        ['/gdc/projects/{id}/', %r{/gdc/projects/[\w]+/}],
-        ['/gdc/projects/{id}', %r{/gdc/projects/[\w]+}]
+         %r{/gdc/internal/lcm/domains/[^\/]+/dataproducts/[^\/]+/segments/[^\/]+/syncProcesses}],
+
+        ['/gdc/internal/projects/{id}/objects/setPermissions', %r{/gdc/internal/projects/[^\/]+/objects/setPermissions}],
+
+        ['/gdc/md/{id}/variables/item/{id}', %r{/gdc/md/[^\/]+/variables/item/[\d]+}],
+        ['/gdc/md/{id}/validate/task/{id}', %r{/gdc/md/[^\/]+/validate/task/[^\/]+}],
+        ['/gdc/md/{id}/using2/{id}/{id}', %r{/gdc/md/[^\/]+/using2/[\d]+/[\d]+}],
+        ['/gdc/md/{id}/using2/{id}', %r{/gdc/md/[^\/]+/using2/[\d]+}],
+        ['/gdc/md/{id}/userfilters?users={users}', %r{\/gdc\/md\/[^\/]+\/userfilters\?users=[\/\w+@.]+}],
+        ['/gdc/md/{id}/userfilters?count={count}&offset={offset}', %r{/gdc/md/[^\/]+/userfilters\?count=[\d]+&offset=[\d]+}],
+        ['/gdc/md/{id}/usedby2/{id}/{id}', %r{/gdc/md/[^\/]+/usedby2/[\d]+/[\d]+}],
+        ['/gdc/md/{id}/usedby2/{id}', %r{/gdc/md/[^\/]+/usedby2/[\d]+}],
+        ['/gdc/md/{id}/tasks/{id}/status', %r{/gdc/md/[^\/]+/tasks/[^\/]+/status}],
+        ['/gdc/md/{id}/obj/{id}/validElements', %r{/gdc/md/[^\/]+/obj/[\d]+/validElements(/)?(\?.*)?}],
+        ['/gdc/md/{id}/obj/{id}/elements', %r{/gdc/md/[^\/]+/obj/[\d]+/elements(/)?(\?.*)?}],
+        ['/gdc/md/{id}/obj/{id}', %r{/gdc/md/[^\/]+/obj/[\d]+}],
+        ['/gdc/md/{id}/etltask/{id}', %r{/gdc/md/[^\/]+/etltask/[^\/]+}],
+        ['/gdc/md/{id}/dataResult/{id}', %r{/gdc/md/[^\/]+/dataResult/[\d]+}],
+        ['/gdc/md/{id}', %r{/gdc/md/[^\/]+}],
+
+        ['/gdc/projects/{id}/users/{id}/roles', %r{/gdc/projects/[^\/]+/users/[^\/]+/roles}],
+        ['/gdc/projects/{id}/users/{id}/permissions', %r{/gdc/projects/[^\/]+/users/[^\/]+/permissions}],
+        ['/gdc/projects/{id}/users', %r{/gdc/projects/[^\/]+/users}],
+        ['/gdc/projects/{id}/schedules/{id}/executions/{id}', %r{/gdc/projects/[^\/]+/schedules/[^\/]+/executions/[^\/]+}],
+        ['/gdc/projects/{id}/schedules/{id}', %r{/gdc/projects/[^\/]+/schedules/[^\/]+}],
+        ['/gdc/projects/{id}/roles/{id}', %r{/gdc/projects/[^\/]+/roles/[\d]+}],
+        ['/gdc/projects/{id}/model/view/{id}', %r{/gdc/projects/[^\/]+/model/view/[^\/]+}],
+        ['/gdc/projects/{id}/model/view', %r{/gdc/projects/[^\/]+/model/view}],
+        ['/gdc/projects/{id}/model/diff/{id}', %r{/gdc/projects/[^\/]+/model/diff/[^\/]+}],
+        ['/gdc/projects/{id}/model/diff', %r{/gdc/projects/[^\/]+/model/diff}],
+        ['/gdc/projects/{id}/dataload/metadata/{project}', %r{/gdc/projects/[^\/]+/dataload/metadata/[^\/]+}],
+        ['/gdc/projects/{id}/dataload/processes/{id}/executions/{id}', %r{/gdc/projects/[^\/]+/dataload/processes/[^\/]+/executions/[^\/]+}],
+        ['/gdc/projects/{id}/dataload/processes/{id}', %r{/gdc/projects/[^\/]+/dataload/processes/[^\/]+}],
+        ['/gdc/projects/{id}/', %r{/gdc/projects/[^\/]+/}],
+        ['/gdc/projects/{id}', %r{/gdc/projects/[^\/]+}],
+
+        ['/gdc/userGroups/{id}', %r{/gdc/userGroups/[^\/]+}],
+
+        ['/gdc/account/profile/{id}', %r{/gdc/account/profile/[^\/]+}],
+        ['/gdc/account/login/{id}', %r{/gdc/account/login/[^\/]+}],
+        ['/gdc/account/domains/{id}/users?login={login}', %r{/gdc/account/domains/[^\/]+/users\?login=[^&$]+}],
+        ['/gdc/account/domains/{id}', %r{/gdc/account/domains/[^\/]+}]
       ]
     end
   end