gooddata 2.1.0-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aeb4013ddeaeb9d85a24d510186f07d057d829ae1abbaca2a3fceda59160f56
-  data.tar.gz: a988ad2a37132e168cf562c64070bf1c951afc41a1f7aa2e6a6b4b43e6137041
+  metadata.gz: 8d6d8542912850269fd1a5171dea30c8e3ffea2c25245c34fed1a6ca177f4882
+  data.tar.gz: 2ed9f49ae9d72e89323ca7ef449b1084ae39bb6e2f19484672d4e0393afbefc0
 SHA512:
-  metadata.gz: 83249304bbb76555fe9c6eae3776fcda14464bd27bbc64c275ce0961917b494540c3dbedc60c14fb5ec001fe1e545a47a85d320a8ef80006194e47d8b944c74c
-  data.tar.gz: 38a3da28fc0d6df3529b7766b2140b5b4af2933347cab5b6011235831f5b26578041858b0f34353603e748944baf7c9c780ef735e7181dc4fc7534a1b2495d13
+  metadata.gz: 4239bf895d152f4bc1bc04d85db87826d398ad9b303b6d705381ba24ad2b6e9ab8984c09e954d54e17088a1a0b10e3bdf4dcbfb02afe77e50a1ae7dfce42a513
+  data.tar.gz: a29a685e759fa151be91abf220b5b6edf38a9f9b3ba42a5cdb650ec51c1ad9e526eb00b15f205adee924f61ebe1aec9dbf233a04ee8d0594461df9bead5ca6c1

data/.travis.yml

@@ -25,19 +25,36 @@ jobs:
       git fetch upstream develop
       bundle exec pronto run -c upstream/develop --exit-code
 
-  - name: unit tests
+    #  UNIT TESTS ON LINUX IN ALL SUPPORTED RUBY VERSIONS
+  - name: unit tests 2.2
     stage: before-merge
     script: bundle exec rake test:unit
-    rvm:
-    - 2.2
-    - 2.3
-    - 2.4
-    - 2.5
-    - 2.6
-    - jruby-1.7.19
-    - jruby-9.1.5
-    - jruby-9.1.7
-    - jruby-9.1.14
+    rvm: 2.2
+
+  - name: unit tests 2.3
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm: 2.3
+
+  - name: unit tests 2.4
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm: 2.4
+
+  - name: unit tests 2.5
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm: 2.5
+
+  - name: unit tests 2.6
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm: 2.6
+
+  - name: unit tests jruby-9.1.14
+    stage: before-merge
+    script: bundle exec rake test:unit
+    rvm: jruby-9.1.14
 
   - name: sdk integration (vcr) tests - base
     stage: before-merge
@@ -193,6 +210,50 @@ jobs:
     name: staging3 - test environment clean-up
     env: GD_ENV=development
 
+  # AFTER MERGE UNIT TESTS ON ALTERNATIVE PLATFORM 
+
+  - name: unit tests 2.3
+    stage: after-merge
+    script: bundle exec rake test:unit
+    os: osx
+    osx_image: xcode7.3
+    rvm: 2.3
+
+  - name: unit tests 2.4
+    stage: after-merge
+    script: bundle exec rake test:unit
+    os: osx
+    osx_image: xcode9.3 
+    rvm: 2.4
+
+  - name: unit tests 2.5
+    stage: after-merge
+    script: bundle exec rake test:unit
+    os: osx
+    osx_image: xcode9
+    rvm: 2.5
+
+  - name: unit tests 2.6
+    stage: after-merge
+    script: bundle exec rake test:unit
+    os: osx
+    osx_image: xcode9
+    rvm: 2.6
+
+  - name: unit tests jruby-9.1.14
+    stage: after-merge
+    script: bundle exec rake test:unit
+    os: osx
+    rvm: jruby-9.1.14
+
+  - name: unit tests 2.2
+    stage: after-merge
+    before_install:
+      - gem install bundler -v 1.17
+    script: bundle exec rake test:unit
+    os: osx
+    rvm: 2.2
+
   - stage: gem-release
     name: deploy MRI gem
     rvm: 2.3

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # GoodData Ruby SDK Changelog
+## 2.1.1
+ - TMA-1423: handle windows shell in a healthy manner
+ - TMA-1424: fix server strings that cause trouble
+ - TMA-1404: explicitly fail when segments filter is not array
+ - TMA-1412: fix api cmd spec
+
 ## 2.1.0
 - TMA-1401: print message and request id on http error
 - Add doc section to contributing.md

data/Dockerfile

@@ -15,7 +15,7 @@ RUN yum install -y curl which \
     && yum clean all \
     && rm -rf /var/cache/yum
 
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN curl -sSL https://get.rvm.io | bash -s stable
 
 # Switch to directory with sources

data/SDK_VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/bin/run_brick.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'remote_syslog_logger'
+
 require_relative '../lib/gooddata'
 
 DEFAULT_BRICK = 'hello_world_brick'
@@ -12,15 +14,26 @@ def get_brick_params(prefix)
   ENV.select { |k,| k.to_s.match(/^#{prefix}.*/) }.map { |k, v| [k.slice(prefix.length..-1), v] }.to_h
 end
 
-brick_pipeline = GoodData::Bricks::Pipeline.send("#{brick_type}_pipeline")
-normal_params = get_brick_params(BRICK_PARAM_PREFIX)
-hidden_params = get_brick_params(HIDDEN_BRICK_PARAMS_PREFIX)
-params = normal_params.merge(hidden_params)
-
-params['values_to_mask'] = hidden_params.values
-commit_hash = ENV['GOODDATA_RUBY_COMMIT'] || ''
-execution_id = ENV['GDC_EXECUTION_ID']
-params['gooddata_ruby_commit'] = commit_hash
-params['GDC_LOG_DIRECTORY'] = ENV['GDC_LOG_DIRECTORY'] || '/tmp/'
-params['GDC_EXECUTION_ID'] = execution_id
-brick_pipeline.call(params)
+syslog_node = ENV['NODE_NAME']
+log = RemoteSyslogLogger.new(syslog_node, 514, :program => "ruby_#{brick_type}", :facility => 'local2')
+
+log.info "action=#{brick_type}_execution status=init"
+
+begin
+  brick_pipeline = GoodData::Bricks::Pipeline.send("#{brick_type}_pipeline")
+  normal_params = get_brick_params(BRICK_PARAM_PREFIX)
+  hidden_params = get_brick_params(HIDDEN_BRICK_PARAMS_PREFIX)
+  params = normal_params.merge(hidden_params)
+
+  params['values_to_mask'] = hidden_params.values
+  commit_hash = ENV['GOODDATA_RUBY_COMMIT'] || ''
+  execution_id = ENV['GDC_EXECUTION_ID']
+  params['gooddata_ruby_commit'] = commit_hash
+  params['GDC_LOG_DIRECTORY'] = ENV['GDC_LOG_DIRECTORY'] || '/tmp/'
+  params['GDC_EXECUTION_ID'] = execution_id
+  log.info "action=#{brick_type}_execution status=start commit_hash=#{commit_hash} execution_id=#{execution_id}"
+  brick_pipeline.call(params)
+rescue StandardError => e
+  log.info "action=#{brick_type}_execution status=failed commit_hash=#{commit_hash} execution_id=#{execution_id} exception=#{e}"
+  raise
+end

data/k8s/charts/lcm-bricks/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: lcm-bricks
 description: LCM Bricks
-version: 1.0.2
+version: 1.0.3

data/k8s/charts/lcm-bricks/templates/prometheus/alertingRules.yaml

@@ -54,26 +54,6 @@ data:
         annotations:
           description: "{{`{{ $labels.pod }}`}} was OOMKilled in the last 10 minutes. Investigate and/or increase memoryRequest or memoryLimit."
           summary: "{{`{{ $labels.pod }}`}} OOMKill occured"
-      - record: "container_pod:lcm_pod_container_status_error:increase10m"
-        expr: increase(kube_pod_container_status_terminated_reason{namespace='{{ .Release.Namespace }}', reason!~"Completed|OOMKilled"}[10m])
-      - alert: "[LCM] Container exited with error on cluster={{ .Values.clusterId }}"
-        expr: container_pod:lcm_pod_container_status_error:increase10m >= 1
-        labels:
-          severity: warning
-          team: lcm # switch to msf in production
-          cluster_id: {{ .Values.clusterId }}
-        annotations:
-          description: "{{`{{ $labels.pod }}`}} container exited with non-zero exit code in the last 10 minutes. Investigate and fix."
-          summary: "{{`{{ $labels.pod }}`}} Container exited with error"
-      - alert: "[LCM] Container exited with error on cluster={{ .Values.clusterId }}"
-        expr: container_pod:lcm_pod_container_status_error:increase10m >= 2
-        labels:
-          severity: critical
-          team: lcm # switch to msf in production
-          cluster_id: {{ .Values.clusterId }}
-        annotations:
-          description: "{{`{{ $labels.pod }}`}} container exited with non-zero exit code in the last 10 minutes. Investigate and fix."
-          summary: "{{`{{ $labels.pod }}`}} Container exited with error"
       - alert: "[LCM] Container is being throttled on cluster={{ .Values.clusterId }}"
         expr: rate(container_cpu_cfs_throttled_seconds_total{namespace='{{ .Release.Namespace }}'}[1m]) > 1
         for: 5m

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

@@ -39,7 +39,7 @@ module GoodData
           logger = Logger.new("#{log_directory}/#{execution_id}.log")
           logger.level = params['GDC_LOG_LEVEL'] || 'info'
           values_to_mask = params['values_to_mask'] || []
-          logger = MaskLoggerDecorator.new(logger, values_to_mask) if values_to_mask.any?
+          logger = MaskLoggerDecorator.new(logger, values_to_mask)
         else
           logger = params[:GDC_LOGGER_FILE].nil? ? Logger.new(STDOUT) : Logger.new(params[:GDC_LOGGER_FILE])
           logger.level = params['GDC_LOG_LEVEL'] || 'info'
@@ -58,9 +58,7 @@ module GoodData
           splunk_logger.level = params['SPLUNK_LOG_LEVEL'] || GoodData::DEFAULT_SPLUNKLOG_LEVEL
           splunk_logger = splunk_logger.extend(ContextLoggerDecorator)
           splunk_logger.context_source = GoodData.gd_logger
-          values_to_mask = params['values_to_mask'] || []
-          values_to_mask.concat MaskLoggerDecorator.extract_values params
-          splunk_logger = MaskLoggerDecorator.new(splunk_logger, values_to_mask) if values_to_mask.any?
+          splunk_logger = MaskLoggerDecorator.new(splunk_logger, params)
           GoodData.splunk_logging_on splunk_logger
         end
 

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

@@ -9,9 +9,9 @@ module GoodData
       # entry-point
       # @param [Logger] logger logger to decorated
       # @param [Array] values_to_mask sensitive values to be masked out from logs
-      def initialize(logger, values_to_mask = [])
+      def initialize(logger, params = [])
         @logger = logger
-        @values_to_mask = values_to_mask
+        @values_to_mask = GoodData::Bricks::MaskLoggerDecorator.extract_values(params)
       end
 
       class << self
@@ -39,6 +39,14 @@ module GoodData
         end
       end
 
+      def debug?
+        true
+      end
+
+      %i[warn? error? fatal? info?].each do |level|
+        alias_method level, :debug?
+      end
+
       # Decorator pretends being inner logger itselfs.
       # @return inner logger class
       def class

data/lib/gooddata/commands/auth.rb

@@ -62,13 +62,52 @@ module GoodData
           }
         end
 
+        def ask_for_credentials_on_windows(credentials_file_path = Helpers::AuthHelper.credentials_file)
+          puts 'Enter your GoodData credentials.'
+
+          old_credentials = Helpers::AuthHelper.read_credentials(credentials_file_path)
+
+          puts 'Email'
+          input = $stdin.gets.chomp
+          user = input.empty? ? old_credentials[:username] : input
+
+          puts 'Password'
+          input = $stdin.gets.chomp
+          password = input.empty? ? old_credentials[:password] : input
+
+          puts 'Authorization (Project) Token'
+          input = $stdin.gets.chomp
+          auth_token = input.empty? ? old_credentials[:auth_token] : input
+
+          puts 'Environment'
+          input = $stdin.gets.chomp
+          environment = input.empty? ? old_credentials[:environment] : input
+          # in windows console, an empty input does not flush the previous buffer
+          # so if you do not fill any environment, the previous value is still present in $stdin
+          # so this is a default
+          environment = GoodData::Project::DEFAULT_ENVIRONMENT if environment == auth_token
+
+          puts 'Server'
+          input = $stdin.gets.chomp
+          server = input.empty? ? old_credentials[:server] : input
+
+          # Return as struct
+          {
+            :username => user,
+            :password => password,
+            :auth_token => auth_token,
+            :environment => environment,
+            :server => server
+          }
+        end
+
         # Ask for credentials and store them
         def store(credentials_file_path = Helpers::AuthHelper.credentials_file)
           puts 'This will store credentials to GoodData in an UNencrypted form to your harddrive to file ~/.gooddata.'
           overwrite = GoodData::CLI.terminal.ask('Do you want to continue? (y/n)')
           return if overwrite != 'y'
 
-          credentials = ask_for_credentials
+          credentials = GoodData::Helpers.running_on_windows? ? ask_for_credentials_on_windows : ask_for_credentials
 
           ovewrite = if File.exist?(credentials_file_path)
                        GoodData::CLI.terminal.ask('Overwrite existing stored credentials (y/n)')

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

@@ -29,6 +29,8 @@ module GoodData
           fail "Parameter 'segments' contains duplicate segment id(s): #{duplicated_segment_ids.join(', ')}" if duplicated_segment_ids.any?
 
           if params.segments_filter
+            fail 'Segments filter should be a non-empty array!' if !params.segments_filter.is_a?(Array) || params.segments_filter.empty?
+
             segments_filter = params.segments_filter.map(&:downcase)
 
             filtered_segments = params.segments.select do |segment|

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

@@ -17,7 +17,7 @@ module GoodData
     extend GoodData::Mixin::ContentPropertyWriter
 
     content_property_reader :folders, :expression, :format
-    content_property_writer :folders, :expression
+    content_property_writer :folders, :expression, :format
 
     class << self
       # Method intended to get all objects of that type in a specified project

data/lib/gooddata/rest/connection.rb

@@ -162,7 +162,7 @@ module GoodData
         headers = options[:headers] || {}
 
         options = options.merge(headers)
-        @server = RestClient::Resource.new server, options
+        @server = RestClient::Resource.new fix_server_url(server), options
 
         # Install at_exit handler first
         unless @at_exit_handler_installed
@@ -468,6 +468,8 @@ module GoodData
 
       def enrich_error_message(exception)
         begin
+          return exception unless exception.response
+
           response = JSON.parse(exception.response.body, symbolize_names: true)
           return exception unless exception.message && response[:error] && response[:error][:message] && response[:error][:requestId]
 
@@ -703,6 +705,17 @@ ERR
           end
         end
       end
+
+      def fix_server_url(server)
+        server = server.chomp('/')
+        if server.starts_with? 'http://'
+          server = server.sub 'http://', 'https://'
+          GoodData.logger.warn 'You specified the HTTP protocol in your server string. It has been autofixed to HTTPS.'
+        end
+
+        server = 'https://' + server unless server.starts_with? 'https://'
+        server
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement