gooddata 2.1.15-java → 2.1.17-java

data/LICENSE.rb

@@ -1,5 +1,5 @@
 # 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.

data/README.md

@@ -95,4 +95,5 @@ For full contributor info see [contributors page](https://github.com/gooddata/go
 
 ## Copyright
 
-Copyright (c) 2010 - 2018 GoodData Corporation and Thomas Watson Steen. See [LICENSE](/LICENSE) for details.
+(c) 2010-2021 GoodData Corporation
+This repository is governed by the terms and conditions in the LICENSE. This repository contains a number of open source packages detailed in NOTICES, including the GoodData Ruby SDK, which is licensed under the BSD-3-Clause license and contains additional open source components detailed in the file called LICENSE_FOR_RUBY_SDK_COMPONENT.

data/Rakefile

@@ -33,7 +33,14 @@ namespace :gem do
   desc "Release gem version #{GoodData::VERSION} to rubygems"
   task :release do
     gem = "gooddata-#{GoodData::VERSION}.gem"
-
+    origin_license_file = 'LICENSE'
+    new_license_file = 'LICENSE_FOR_RUBY_SDK_COMPONENT.txt'
+    notices_file = 'NOTICES.txt'
+    File.delete(origin_license_file) if File.exist?(origin_license_file)
+    File.delete(notices_file) if File.exist?(notices_file)
+    puts "Deleted files: #{origin_license_file} and #{notices_file}"
+    File.rename(new_license_file, origin_license_file) if File.exists?(new_license_file)
+    puts "Renamed file #{new_license_file} to #{origin_license_file}"
     puts "Building #{gem} ..."
     res = `gem build ./gooddata.gemspec`
     file = res.match('File: (.*)')[1]

data/SDK_VERSION

@@ -1 +1 @@
-2.1.15
+2.1.17

data/VERSION

@@ -1 +1 @@
-3.7.24
+3.7.25

data/bin/test_projects_cleanup.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-example = 'Usage example: GD_ENV=testing GD_SPEC_PASSWORD=secret bundle exec ruby bin/test_projects_cleanup.rb'
+example = 'Usage example: GD_ENV=testing GD_SPEC_PASSWORD= bundle exec ruby bin/test_projects_cleanup.rb'
 
 options = {}
 OptionParser.new do |opts|

data/ci/postgresql/pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.gooddata.lcm</groupId>
+    <artifactId>lcm-postgresql-driver</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>binary-packaging</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <!-- compile scope gives runtime and compile dependencies (skips test deps) -->
+                                    <includeScope>runtime</includeScope>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <repositories>
+        <repository>
+            <id>my-repo1</id>
+            <name>my custom repo</name>
+            <url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
+        </repository>
+    </repositories>
+</project>

data/gooddata.gemspec

@@ -5,7 +5,7 @@ require 'gooddata/version'
 Gem::Specification.new do |s|
   s.name = 'gooddata'
   s.version = GoodData::VERSION
-  s.licenses = ['BSD']
+  s.licenses = ['BSD-3-Clause']
   s.platform = 'java' if RUBY_PLATFORM =~ /java/
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.email = 'lcm@gooddata.com'
   s.extra_rdoc_files = %w(LICENSE README.md)
 
-  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR).map { |f| f unless %w(NOTICES.txt LICENSE_FOR_RUBY_SDK_COMPONENT.txt).include?(f) }
   s.files.reject! { |fn| fn.start_with? 'spec/' }
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aws-sdk-s3', '~> 1.16'
   s.add_dependency 'docile', '~> 1.1'
-  s.add_dependency 'erubis', '~> 2.7'
   s.add_dependency 'gli', '~> 2.15'
   s.add_dependency 'gooddata_datawarehouse', '~> 0.0.10' if RUBY_PLATFORM == 'java'
   s.add_dependency 'highline', '= 2.0.0.pre.develop.14'

data/lib/gooddata/cloud_resources/{cloud_resouce_factory.rb → cloud_resource_factory.rb}

@@ -11,7 +11,15 @@ module GoodData
   module CloudResources
     class CloudResourceFactory
       class << self
+        def load_cloud_resource(type)
+          base = "#{Pathname(__FILE__).dirname.expand_path}#{File::SEPARATOR}#{type}#{File::SEPARATOR}"
+          Dir.glob(base + '**/*.rb').each do |file|
+            require file
+          end
+        end
+
         def create(type, data = {}, opts = {})
+          load_cloud_resource(type)
           clients = CloudResourceClient.descendants.select { |c| c.respond_to?("accept?") && c.send("accept?", type) }
           raise "DataSource does not support type \"#{type}\"" if clients.empty?
 

data/lib/gooddata/cloud_resources/cloud_resources.rb

@@ -7,6 +7,6 @@
 require 'pathname'
 
 base = Pathname(__FILE__).dirname.expand_path
-Dir.glob(base + '**/*.rb').each do |file|
+Dir.glob(base + '*.rb').each do |file|
   require file
 end

data/lib/gooddata/cloud_resources/postgresql/postgresql_client.rb

@@ -0,0 +1,107 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+#
+# Copyright (c) 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 'securerandom'
+require 'java'
+require 'pathname'
+require_relative '../cloud_resource_client'
+
+base = Pathname(__FILE__).dirname.expand_path
+Dir.glob(base + 'drivers/*.jar').each do |file|
+  require file unless file.start_with?('lcm-postgresql-driver')
+end
+
+module GoodData
+  module CloudResources
+    class PostgresClient < CloudResourceClient
+      JDBC_POSTGRES_PATTERN = %r{jdbc:postgresql:\/\/([^:^\/]+)(:([0-9]+))?(\/)?}
+      POSTGRES_DEFAULT_PORT = 5432
+      JDBC_POSTGRES_PROTOCOL = 'jdbc:postgresql://'
+      SSL_JAVA_FACTORY = '&sslfactory=org.postgresql.ssl.DefaultJavaSSLFactory'
+      VERIFY_FULL = 'verify-full'
+      PREFER = 'prefer'
+      REQUIRE = 'require'
+      POSTGRES_SET_SCHEMA_COMMAND = "set search_path to"
+      POSTGRES_FETCH_SIZE = 1000
+
+      class << self
+        def accept?(type)
+          type == 'postgresql'
+        end
+      end
+
+      def initialize(options = {})
+        raise("Data Source needs a client to Postgres to be able to query the storage but 'postgresql_client' is empty.") unless options['postgresql_client']
+
+        if options['postgresql_client']['connection'].is_a?(Hash)
+          @database = options['postgresql_client']['connection']['database']
+          @schema = options['postgresql_client']['connection']['schema'] || 'public'
+          @authentication = options['postgresql_client']['connection']['authentication']
+          @ssl_mode = options['postgresql_client']['connection']['sslMode']
+          raise "SSL Mode should be prefer, require and verify-full" unless @ssl_mode == 'prefer' || @ssl_mode == 'require' || @ssl_mode == 'verify-full'
+
+          @url = build_url(options['postgresql_client']['connection']['url'])
+        else
+          raise('Missing connection info for Postgres client')
+        end
+
+        Java.org.postgresql.Driver
+      end
+
+      def realize_query(query, _params)
+        GoodData.gd_logger.info("Realize SQL query: type=postgresql status=started")
+
+        connect
+        filename = "#{SecureRandom.urlsafe_base64(6)}_#{Time.now.to_i}.csv"
+        measure = Benchmark.measure do
+          statement = @connection.create_statement
+          statement.set_fetch_size(POSTGRES_FETCH_SIZE)
+          has_result = statement.execute(query)
+          if has_result
+            result = statement.get_result_set
+            metadata = result.get_meta_data
+            col_count = metadata.column_count
+            CSV.open(filename, 'wb') do |csv|
+              csv << Array(1..col_count).map { |i| metadata.get_column_name(i) } # build the header
+              csv << Array(1..col_count).map { |i| result.get_string(i)&.to_s } while result.next
+            end
+          end
+        end
+        GoodData.gd_logger.info("Realize SQL query: type=postgresql status=finished duration=#{measure.real}")
+        filename
+      ensure
+        @connection&.close
+        @connection = nil
+      end
+
+      def connect
+        GoodData.logger.info "Setting up connection to Postgresql #{@url}"
+
+        prop = java.util.Properties.new
+        prop.setProperty('user', @authentication['basic']['userName'])
+        prop.setProperty('password', @authentication['basic']['password'])
+        prop.setProperty('schema', @schema)
+
+        @connection = java.sql.DriverManager.getConnection(@url, prop)
+        statement = @connection.create_statement
+        statement.execute("#{POSTGRES_SET_SCHEMA_COMMAND} #{@schema}")
+        @connection.set_auto_commit(false)
+      end
+
+      def build_url(url)
+        matches = url.scan(JDBC_POSTGRES_PATTERN)
+        raise 'Cannot reach the url' unless matches
+
+        host = matches[0][0]
+        port = matches[0][2]&.to_i || POSTGRES_DEFAULT_PORT
+        raise "Custom port #{port} is not supported. Remove it or use the default port '5432'" if POSTGRES_DEFAULT_PORT != port
+
+        "#{JDBC_POSTGRES_PROTOCOL}#{host}:#{port}/#{@database}?sslmode=#{@ssl_mode}#{VERIFY_FULL == @ssl_mode ? SSL_JAVA_FACTORY : ''}"
+      end
+    end
+  end
+end

data/lib/gooddata/commands/scaffold.rb

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-require 'erubis'
+require 'erb'
 require 'fileutils'
 require 'pathname'
 
@@ -18,15 +18,14 @@ module GoodData
         # TODO: Add option for custom output dir
         def project(name)
           fail ArgumentError, 'No name specified' if name.nil?
-
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             FileUtils.mkdir('model')
             FileUtils.cd('model') do
               input = File.read(TEMPLATES_PATH + 'project/model/model.rb.erb')
-              eruby = Erubis::Eruby.new(input)
+              erb = ERB.new(input)
               File.open('model.rb', 'w') do |f|
-                f.write(eruby.result(:name => name))
+                f.write(erb.result_with_hash(:name => name))
               end
             end
 
@@ -36,9 +35,9 @@ module GoodData
             end
 
             input = File.read(TEMPLATES_PATH + 'project/Goodfile.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('Goodfile', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end
@@ -51,15 +50,15 @@ module GoodData
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             input = File.read(TEMPLATES_PATH + 'bricks/brick.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('brick.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
 
             input = File.read(TEMPLATES_PATH + 'bricks/main.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('main.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end

data/lib/gooddata/core/nil_logger.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# 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.
 
@@ -11,6 +12,7 @@ module GoodData
       @level = nil
     end
 
+    # No body define need for dummy logger
     def debug(*_args)
     end
 

data/lib/gooddata/helpers/data_helper.rb

@@ -44,9 +44,8 @@ module GoodData
           realize_link
         when 's3'
           realize_s3(params)
-        when 'redshift', 'snowflake', 'bigquery'
+        when 'redshift', 'snowflake', 'bigquery', 'postgresql'
           raise GoodData::InvalidEnvError, "DataSource does not support type \"#{source}\" on the platform #{RUBY_PLATFORM}" unless RUBY_PLATFORM =~ /java/
-
           require_relative '../cloud_resources/cloud_resources'
           realize_cloud_resource(source, params)
         else

data/lib/gooddata/helpers/global_helpers.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.
 
@@ -34,6 +34,7 @@ module GoodData
     end
 
     set_const :GD_MAX_RETRY, (ENV['GD_MAX_RETRY'] && ENV['GD_MAX_RETRY'].to_i) || 12
+    AES_256_CBC_CIPHER = 'aes-256-cbc'
 
     class << self
       def error(msg)
@@ -222,7 +223,7 @@ module GoodData
       # encrypts data with the given key. returns a binary data with the
       # unhashed random iv in the first 16 bytes
       def encrypt(data, key)
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.encrypt
         cipher.key = key = Digest::SHA256.digest(key)
         random_iv = cipher.random_iv
@@ -236,7 +237,7 @@ module GoodData
 
       # Simple encrypt data with given key
       def simple_encrypt(data, key)
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.encrypt
         cipher.key = key
         encrypted = cipher.update(data)
@@ -253,7 +254,7 @@ module GoodData
 
         data = Base64.decode64(database64)
 
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.decrypt
         cipher.key = cipher_key = Digest::SHA256.digest(key)
         random_iv = data[0..15] # extract iv from first 16 bytes
@@ -273,7 +274,7 @@ module GoodData
 
         data = Base64.decode64(database64)
 
-        cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')
+        cipher = OpenSSL::Cipher::Cipher.new(AES_256_CBC_CIPHER)
         cipher.decrypt
         cipher.key = key
         decrypted = cipher.update(data)

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

@@ -167,6 +167,10 @@ module GoodData
               fail "Client id cannot be empty" if client_id.blank?
 
               c = all_clients.detect { |specific_client| specific_client.id == client_id }
+              if c.nil?
+                params.gdc_logger.warn "Client #{client_id} is not found"
+                next
+              end
               if params.segments && !segment_uris.include?(c.segment_uri)
                 params.gdc_logger.warn "Client #{client_id} is outside segments_filter #{params.segments}"
                 next

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

@@ -182,11 +182,11 @@ module GoodData
           #     value of a project id in the data since he does not know it upfront
           #     and we cannot influence its value.
           common_params = {
-            domain: domain, 
-            whitelists: whitelists,  
-            ignore_failures: ignore_failures,  
-            remove_users_from_project: remove_users_from_project,  
-            do_not_touch_users_that_are_not_mentioned: do_not_touch_users_that_are_not_mentioned,  
+            domain: domain,
+            whitelists: whitelists,
+            ignore_failures: ignore_failures,
+            remove_users_from_project: remove_users_from_project,
+            do_not_touch_users_that_are_not_mentioned: do_not_touch_users_that_are_not_mentioned,
             create_non_existing_user_groups: create_non_existing_user_groups,
             user_groups_cache: nil
           }
@@ -198,7 +198,8 @@ module GoodData
                       domain.create_users(new_users.uniq { |u| u[:login] || u[:email] })
                     when 'remove_from_organization'
                       user_ids = new_users.uniq { |u| u[:login] || u[:email] }.map { |u| u[:login] || u[:email] }
-                      users = user_ids.map { |u| domain.users(u, client: client) }
+                      users = user_ids.map { |u| domain.users(u, client: client) }.reject(&:nil?)
+                      params.gdc_logger.info "#{user_ids.count - users.count} users were not found (or were deleted) in domain #{domain_name}" if user_ids.count > users.count
                       params.gdc_logger.warn "Deleting #{users.count} users from domain #{domain_name}"
 
                       GoodData.gd_logger.info("Synchronizing in mode=#{mode}, domain=#{domain_name}, data_rows=#{users.count}")