gooddata 0.6.51 → 0.6.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1715a4ba9d7203654418b0a275dd7eaf7e5e1dc
-  data.tar.gz: 42547b8e7ccbef65b3a0c6b0cb276886c55adcd8
+  metadata.gz: 4b52bbc7d6883ecc03056e9bd3b8d40814b1c7e6
+  data.tar.gz: d9016a67965073aa35cc99d6285200b2217aafdb
 SHA512:
-  metadata.gz: d8120afa7ca7037fbd372960fe2ad02e9d2dc92d2d9dd17ce614b3f8d2a9d4e12412fe6ee8c3c2bd9f1c67ffdbf7962c099f612ec10a625188e2dfe0b5f8f2c8
-  data.tar.gz: a8485d9b645c943c91386111a4f4b6d12c66162d141bb747e4865761d2ca15ebdad92900d8ed6f3596ebdd55048af6c1ad3cf651049ccf04fb0e7b9edc2acfad
+  metadata.gz: 9c84503bccbc716e9a55fd77c2ceaa105ec3790fcf0af44282c01cc1704c0095bf65777a63ebea9e89d193806e349c4c081fdf8f235530c211f42716ae8da355
+  data.tar.gz: b8bd3acdca2aaac173bc92dbd9aef01c32a8b5f2a99267686b02e97d66d15521577e1cfedfa96814d5eb3cc3e7b42611945980871732eb5658e94cfcc4d3f531

data/.rubocop.yml

@@ -35,7 +35,7 @@ HashSyntax:
   Enabled: false
 
 LineLength:
-  Max: 323
+  Max: 180
 
 MethodLength:
   Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # GoodData Ruby SDK Changelog
 
 ## 0.6.52
+- Add support for computed attribute in blueprint
+- Fix bug with transfering schedules without their state
+- Support segment-specific production tags (TMA-309)
+- Rewrite deprecated schedule parameter "GRAPH" (TMA-453)
+- Add parameter HTTP_LOGGING to LoggerMiddleware
+- Resolve also hidden reference parameters (TMA-411)
+- Support integer type id in Domain#clients (TMA-450)
+- Support urn for date dimension (TMA-221)
+- Implement "skip_actions" for LCM2
+- Support MAQL DIFF API (TMA-219)
+- Support for restricted flag
+- Fix deployment via SDK on Windows
 
 ## 0.6.50
 - Add support for Email Notification Rules on Process
@@ -11,7 +23,7 @@
 - Handle export/import async task errors (TMA-231)
 - Support for custom color palette
 - Support for trasfering attribute drill paths
-- Implemented basic version of LCM2 
+- Implemented basic version of LCM2
 - Add more logging for user, user filter management
 
 ## 0.6.49

data/CONTRIBUTING.md

@@ -0,0 +1,25 @@
+### Contribution acceptance criteria
+
+1. The change is as small as possible. It fixes one specific issue or implements
+   one specific feature. Do not combine things, send separate pull requests if needed.
+1. Include proper tests and make all tests pass (unless it contains a test
+   exposing a bug in existing code). Every new class should have corresponding
+   unit tests, even if the class is exercised at a higher level, such as a feature test.
+1. Every bug-fix has a regression test.
+1. If you suspect a failing CI build is unrelated to your contribution, you may
+   try and restart the failing CI job or ask a developer to fix the
+   aforementioned failing test.
+1. Code conforms to this [style guide](https://github.com/bbatsov/ruby-style-guide).
+1. When writing tests, please follow [these guidelines](http://betterspecs.org/).
+1. Changes do not adversely degrade performance.
+1. Your PR contains a single commit (please use `git rebase -i` to squash commits)
+1. When writing commit messages, please follow
+   [these](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   [guidelines](http://chris.beams.io/posts/git-commit/).
+1. Your changes can merge without problems (if not please rebase if you're the
+   only one working on your feature branch, otherwise, merge `master`).
+1. If the pull request adds any new libraries, they should be in line with our
+   [license](/LICENSE).
+1. Use `GoodData.logger` for logging instead of `puts`.
+
+_Based on [GitLab's contribution guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md)._

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+## Todos
+- [ ] Tests
+- [ ] Documentation
+- [ ] Changelog
+- [ ] Build passing

data/README.md

@@ -36,7 +36,7 @@ If you are using gems just
     gem install gooddata
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -47,15 +47,19 @@ If you are using gems just
 * run `rake cop` and make sure you did not introduce any new coding rules issues
 * Send us a pull request. Bonus points for topic branches.
 
+## Contributing
+
+See our [contribution guidelines](/CONTRIBUTING.md).
+
 ## Credits
 
 **Originally started by**
 
-Pavel Kolesnikov [ <mailto:pavel@gooddata.com> / [@koles](http://twitter.com/koles) ] 
+Pavel Kolesnikov [ <mailto:pavel@gooddata.com> / [@koles](http://twitter.com/koles) ]
 
 **Actively developed and maintained by**
 
-- [Tomas Korcak](https://github.com/korczis) [ <mailto:korczis@gmail.com> / [@korczis](http://twitter.com/korczis) ] 
+- [Tomas Korcak](https://github.com/korczis) [ <mailto:korczis@gmail.com> / [@korczis](http://twitter.com/korczis) ]
 - [Tomas Svarovsky](https://github.com/fluke777) [ <mailto:svarovsky.tomas@gmail.com> / [@fluke777](http://twitter.com/fluke777) ]
 
 **Contributors**
@@ -72,4 +76,3 @@ For full contributor info see [contributors page](https://github.com/gooddata/go
 ## Copyright
 
 Copyright (c) 2010 - 2015 GoodData Corporation and Thomas Watson Steen. See LICENSE for details.
-

data/gooddata.gemspec

@@ -42,9 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ZenTest', '~> 4.11'
   s.add_development_dependency 'pry'
 
-  s.add_dependency 'aws-sdk', '~> 2.7'
-  s.add_dependency 'nokogiri', '~> 1.6.8'
-  s.add_dependency 'aws-sdk-v1', '~> 1.45'
+  s.add_dependency 'aws-sdk', '~> 2.9', '>= 2.9.42'
   s.add_dependency 'docile', '~> 1.1'
   s.add_dependency 'erubis', '~> 2.7'
   s.add_dependency 'gli', '~> 2.15'
@@ -61,4 +59,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'salesforce_bulk_query', '~> 0.2'
   s.add_dependency 'terminal-table', '~> 1.7'
   s.add_dependency 'thread_safe'
+  s.add_dependency 'backports'
 end

data/lib/gooddata.rb

@@ -31,3 +31,4 @@ require_relative 'gooddata/version'
 
 # Extensions
 require_relative 'gooddata/extensions/extensions'
+require 'backports/2.1.0/array/to_h'

data/lib/gooddata/bricks/base_downloader.rb

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'pathname'
-require 'aws'
+require 'aws-sdk'
 
 module GoodData
   module Bricks
@@ -33,19 +33,19 @@ module GoodData
 
         bucket_name = @params['s3_backup_bucket_name']
 
-        s3 = AWS::S3.new(
+        s3 = Aws::S3::Resource.new(
           :access_key_id => @params['aws_access_key_id'],
           :secret_access_key => @params['aws_secret_access_key']
         )
 
-        bucket = s3.buckets[bucket_name]
-        bucket = s3.buckets.create(bucket_name) unless bucket.exists?
+        bucket = s3.bucket(bucket_name)
+        bucket = s3.create_bucket(bucket_name) unless bucket.exists?
 
         files.each do |file|
           file_path = Pathname.new(file)
           target_path = Pathname.new(@params['s3_backup_path'] || '') + file_path.basename
-          obj = bucket.objects[target_path]
-          obj.write(file_path)
+          obj = bucket.objects(target_path)
+          obj.upload_file(file_path)
           @logger.info "Backed up file #{file_path} to s3 #{target_path}" if @logger
         end
 

data/lib/gooddata/bricks/middleware/aws_middleware.rb

@@ -17,15 +17,25 @@ module GoodData
           raise 'Unable to connect to AWS. Parameter "aws_client" seems to be empty' unless params['aws_client']
           raise 'Unable to connect to AWS. Parameter "access_key_id" is missing' if params['aws_client']['access_key_id'].blank?
           raise 'Unable to connect to AWS. Parameter "secret_access_key" is missing' if params['aws_client']['secret_access_key'].blank?
-          if params['aws_client'].key?('use_ssl')
-            params['aws_client']['use_ssl'] =
-              params['aws_client']['use_ssl'].to_b
-          end
-          s3 = AWS::S3.new(params['aws_client'])
+          params['aws_client'] = rewrite_for_aws_sdk_v2(params['aws_client'])
+          symbolized_config = GoodData::Helpers.symbolize_keys(params['aws_client'])
+          s3 = Aws::S3::Resource.new(symbolized_config)
           params['aws_client']['s3_client'] = s3
         end
         @app.call(params)
       end
+
+      private
+
+      def rewrite_for_aws_sdk_v2(config)
+        config['region'] = 'us-west-2' unless config['region']
+        if config['use_ssl']
+          fail 'Parameter use_ssl has been deprecated. Version 2 of the AWS ' \
+            'SDK uses SSL everywhere. To disable SSL you must ' \
+            'configure an endpoint that uses http://.'
+        end
+        config
+      end
     end
   end
 end

data/lib/gooddata/bricks/middleware/dwh_middleware.rb

@@ -15,10 +15,22 @@ module GoodData
       def call(params)
         if params.key?('ads_client') && (RUBY_PLATFORM == 'java')
           GoodData.logger.info "Setting up ADS connection to #{params['ads_client']['ads_id'] || params['ads_client']['jdbc_url']}"
-          raise "ADS middleware needs username either as part of ads_client spec or as a global 'GDC_USERNAME' parameter" unless params['ads_client']['username'] || params['GDC_USERNAME']
-          raise "ADS middleware needs password either as part of ads_client spec or as a global 'GDC_PASSWORD' parameter" unless params['ads_client']['password'] || params['GDC_PASSWORD']
+          unless params['ads_client']['username'] || params['GDC_USERNAME']
+            raise "ADS middleware needs username either as part of " \
+                  "ads_client spec or as a global 'GDC_USERNAME' parameter"
+          end
 
-          ads = GoodData::Datawarehouse.new(params['ads_client']['username'] || params['GDC_USERNAME'], params['ads_client']['password'] || params['GDC_PASSWORD'], params['ads_client']['ads_id'], jdbc_url: params['ads_client']['jdbc_url'])
+          unless params['ads_client']['password'] || params['GDC_PASSWORD']
+            raise "ADS middleware needs password either as part of " \
+                  "ads_client spec or as a global 'GDC_PASSWORD' parameter"
+          end
+
+          ads = GoodData::Datawarehouse.new(
+            params['ads_client']['username'] || params['GDC_USERNAME'],
+            params['ads_client']['password'] || params['GDC_PASSWORD'],
+            params['ads_client']['ads_id'],
+            jdbc_url: params['ads_client']['jdbc_url']
+          )
           @app.call(params.merge('ads_client' => ads, :ads_client => ads))
         else
           @app.call(params)

data/lib/gooddata/bricks/middleware/gooddata_middleware.rb

@@ -25,9 +25,15 @@ module GoodData
         logger = params['GDC_LOGGER']
         GoodData.logger = logger
 
+        # Set parallelism
+        max_concurrency = params['max_concurrency'] || params['MAX_CONCURRENCY']
+        if max_concurrency && max_concurrency.to_i > 0
+          $pmap_default_thread_count = max_concurrency.to_i # rubocop:disable GlobalVars
+        end
+
         # Connect Client
-        protocol = params['CLIENT_GDC_PROTOCOL'] || DEFAULT_PROTOCOL
-        hostname = params['CLIENT_GDC_HOSTNAME'] || DEFAULT_HOSTNAME
+        protocol = params['CLIENT_GDC_PROTOCOL'] || params['GDC_PROTOCOL'] || DEFAULT_PROTOCOL
+        hostname = params['CLIENT_GDC_HOSTNAME'] || params['GDC_HOSTNAME'] || DEFAULT_HOSTNAME
         server = "#{protocol}://#{hostname}"
         client = GoodDataMiddleware.connect(
           server,
@@ -91,11 +97,14 @@ module GoodData
           if username.nil? || password.nil?
             puts "Connecting with SST to server #{server}"
             raise 'SST (SuperSecureToken) not present in params' if sst_token.nil?
-            GoodData.connect(sst_token: sst_token, server: server, verify_ssl: verify_ssl)
+            conn = GoodData.connect(sst_token: sst_token, server: server, verify_ssl: verify_ssl)
           else
             puts "Connecting as #{username} to server #{server}"
-            GoodData.connect(username, password, server: server, verify_ssl: verify_ssl)
+            conn = GoodData.connect(username, password, server: server, verify_ssl: verify_ssl)
           end
+          conn.stats_on
+
+          conn
         end
       end
     end

data/lib/gooddata/bricks/middleware/logger_middleware.rb

@@ -18,9 +18,12 @@ module GoodData
           logger = NilLogger.new
         else
           logger = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
+          logger.level = params['GDC_LOG_LEVEL'] if params['GDC_LOG_LEVEL']
           logger.info('Pipeline starts')
         end
         params['GDC_LOGGER'] = logger
+        GoodData.logging_http_on if params['HTTP_LOGGING'] && params['HTTP_LOGGING'].to_b
+
         returning(@app.call(params)) do |_result|
           logger.info('Pipeline ending')
         end

data/lib/gooddata/exceptions/no_project_error.rb

@@ -6,7 +6,11 @@
 
 module GoodData
   class NoProjectError < RuntimeError
-    DEFAULT_MSG = 'You have to provide "project_id". You can either provide it through -p flag or even better way is to fill it in in your Goodfile under key "project_id". If you just started a project you have to create it first. One way might be through "gooddata project build"'
+    DEFAULT_MSG = 'You have to provide "project_id". You can either provide ' \
+                  'it through -p flag or even better way is to fill it in in ' \
+                  'your Goodfile under key "project_id". If you just started ' \
+                  'a project you have to create it first. One way might be ' \
+                  'through "gooddata project build"'
 
     def initialize(msg = DEFAULT_MSG)
       super(msg)

data/lib/gooddata/goodzilla/goodzilla.rb

@@ -96,18 +96,19 @@ module GoodData
         pairs = get_uris(expression).pmap do |uri|
           if uri =~ /elements/
             begin
-              [uri, Attribute.find_element_value(uri, opts)]
+              ['element', uri, Attribute.find_element_value(uri, opts)]
             rescue AttributeElementNotFound
-              [uri, '(empty value)']
+              ['element', uri, '(empty value)']
             end
           else
-            [uri, GoodData::MdObject[uri, opts].title]
+            ['object', uri, GoodData::MdObject[uri, opts].title]
           end
         end
+        pairs.sort_by! { |p| p[0] }
         pairs.each do |el|
-          uri = el[0]
-          obj = el[1]
-          temp.sub!(uri, obj)
+          uri = el[1]
+          obj = el[2]
+          temp.gsub!(uri, obj)
         end
         temp
       end

data/lib/gooddata/helpers/data_helper.rb

@@ -104,17 +104,17 @@ module GoodData
       def realize_s3(params)
         params = GoodData::Helpers.stringify_keys(params)
         s3_client = params['aws_client'] && params['aws_client']['s3_client']
-        raise 'AWS client not present. Perhaps S3Middleware is missing in the brick definition?' if !s3_client || !s3_client.respond_to?(:buckets)
+        raise 'AWS client not present. Perhaps S3Middleware is missing in the brick definition?' if !s3_client || !s3_client.respond_to?(:bucket)
         bucket_name = @options[:bucket]
         key = @options[:key]
         raise 'Key "bucket" is missing in S3 datasource' if bucket_name.blank?
         raise 'Key "key" is missing in S3 datasource' if key.blank?
         puts "Realizing download from S3. Bucket #{bucket_name}, object with key #{key}."
         filename = Digest::SHA256.new.hexdigest(@options.to_json)
-        bucket = s3_client.buckets[bucket_name]
-        obj = bucket.objects[key]
+        bucket = s3_client.bucket(bucket_name)
+        obj = bucket.object(key)
         File.open(filename, 'wb') do |file|
-          obj.read do |chunk|
+          obj.get do |chunk|
             file.write(chunk)
           end
         end

data/lib/gooddata/helpers/global_helpers_params.rb

@@ -11,8 +11,12 @@ module GoodData
 
     class << self
       # Encodes parameters for passing them to GD execution platform.
-      # Core types are kept and complex types (arrays, structures, etc) are JSON encoded into key hash "gd_encoded_params" or "gd_encoded_hidden_params", depending on the 'hidden' method param.
-      # The two different keys are used because the params and hidden params are merged by the platform and if we use the same key, the param would be overwritten.
+      # Core types are kept and complex types (arrays, structures, etc) are
+      # JSON encoded into key hash "gd_encoded_params" or
+      # "gd_encoded_hidden_params", depending on the 'hidden' method param.
+      # The two different keys are used because the params and hidden params
+      # are merged by the platform and if we use the same key,
+      # the param would be overwritten.
       #
       # Core types are following:
       # - Boolean (true, false)
@@ -68,52 +72,26 @@ module GoodData
                                '{}'
                              end
 
+        reference_values = []
         # Replace reference parameters by the actual values. Use backslash to escape a reference parameter, e.g: \${not_a_param},
         # the ${not_a_param} will not be replaced
         if options[:resolve_reference_params]
-          regexps = Regexp.union(/\\\\/, /\\\$/, /\$\{(\w+)\}/)
-          resolve_reference = lambda do |v|
-            if v.is_a? Hash
-              Hash[
-                v.map do |k, v2|
-                  [k, resolve_reference.call(v2)]
-                end
-              ]
-            elsif v.is_a? Array
-              v.map do |v2|
-                resolve_reference.call(v2)
-              end
-            elsif !v.is_a?(String)
-              v
-            else
-              v.gsub(regexps) do |match|
-                if match =~ /\\\\/
-                  data_params.is_a?(Hash) ? '\\' : '\\\\' # rubocop: disable Metrics/BlockNesting
-                elsif match =~ /\\\$/
-                  '$'
-                elsif match =~ /\$\{(\w+)\}/
-                  params["#{$1}"] || raise("The gd_encoded_params parameter contains unknow reference #{$1}") # rubocop: disable Style/PerlBackrefs
-                end
-              end
-            end
-          end
-
-          data_params = if data_params.is_a? Hash
-                          Hash[
-                            data_params.map do |k, v|
-                              [k, resolve_reference.call(v)]
-                            end
-                          ]
-                        else
-                          resolve_reference.call(data_params)
-                        end
+          data_params, reference_values = resolve_reference_params(data_params, params)
+          hidden_data_params, = resolve_reference_params(hidden_data_params, params)
         end
 
         begin
           parsed_data_params = data_params.is_a?(Hash) ? data_params : JSON.parse(data_params)
+        rescue JSON::ParserError => exception
+          reason = exception.message
+          reference_values.each { |secret_value| reason.gsub!("\"#{secret_value}\"", '"***"') }
+          raise exception.class, "Error reading json from '#{key}', reason: #{reason}"
+        end
+
+        begin
           parsed_hidden_data_params = hidden_data_params.is_a?(Hash) ? hidden_data_params : JSON.parse(hidden_data_params)
         rescue JSON::ParserError => exception
-          raise exception.class, "Error reading json from '#{key}' or '#{hidden_key}', reason: #{exception.message}"
+          raise exception.class, "Error reading json from '#{hidden_key}'"
         end
 
         # Add the nil on ENCODED_HIDDEN_PARAMS_KEY
@@ -260,6 +238,50 @@ module GoodData
           value.to_s
         end
       end
+
+      private
+
+      def resolve_reference_params(data_params, params)
+        reference_values = []
+        regexps = Regexp.union(/\\\\/, /\\\$/, /\$\{(\w+)\}/)
+        resolve_reference = lambda do |v|
+          if v.is_a? Hash
+            Hash[
+              v.map do |k, v2|
+                [k, resolve_reference.call(v2)]
+              end
+            ]
+          elsif v.is_a? Array
+            v.map do |v2|
+              resolve_reference.call(v2)
+            end
+          elsif !v.is_a?(String)
+            v
+          else
+            v.gsub(regexps) do |match|
+              if match =~ /\\\\/
+                data_params.is_a?(Hash) ? '\\' : '\\\\' # rubocop: disable Metrics/BlockNesting
+              elsif match =~ /\\\$/
+                '$'
+              elsif match =~ /\$\{(\w+)\}/
+                val = params["#{$1}"] || raise("The gd_encoded_params parameter contains unknow reference #{$1}") # rubocop: disable Style/PerlBackrefs
+                reference_values << val
+                val
+              end
+            end
+          end
+        end
+
+        data_params = if data_params.is_a? Hash
+                        Hash[data_params.map do |k, v|
+                          [k, resolve_reference.call(v)]
+                        end]
+                      else
+                        resolve_reference.call(data_params)
+                      end
+
+        [data_params, reference_values]
+      end
     end
   end
 end