gooddata 1.3.3-java → 1.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b088417656bd604e2e3ddefa7919c748d5c8feb093386092776cc3c4ddca8566
-  data.tar.gz: c5834668e787cdef66f31ccc7322ac50de894aac64b4f8ba41b9a933a015adce
+  metadata.gz: af5e1b8a6e52b429663671a1cd7a280ef0bae395817c73cf68199c9153cbe9da
+  data.tar.gz: c223718e99211f37226e6222588e38d6cbd4f98a42e953e9e639be08b846a06f
 SHA512:
-  metadata.gz: fd97a0d53c64c3e9431015c8b6052fd67fa9a2014719d93766c81838b878265b4dc543832ed852d9830023450f9be0461e1208f05430d176be78904568772f10
-  data.tar.gz: 00bcfd05b42557d530361a4f74d6cf825058b4e55a97af1aebba5cf7da3cf1b38c10a4a97bf7b93cecf3e71fd9e8a53047507ef193ded8acc100c9138829121c
+  metadata.gz: 8d12d8bdeb73e7a23ee36f8cef59b5e07f350920596d343a0ce12c1f680385b5b2c6d6aeda7c580ab2c792b8c43808b07ed5fa449e2232f08823801746672310
+  data.tar.gz: bf903ad5b0059c946cdbc36a8426d20ac6eae4b6ef318f175e554579255e5c66055b50c19e48ad1503654411dc06167d1602bd2685e0a0287c5fd30578136086

data/.travis.yml

@@ -1,133 +1,195 @@
 language: ruby
 cache: bundler
 stages:
-- name: unit
+- name: before-merge
   if: type IN (push, pull_request)
-- name: integration
-  if: type IN (api)
-- name: periodic
-  if: type IN (cron)
-- name: cleanup
+- name: after-merge
+  if: type IN (api, cron)
+- name: platform-cleanup
   if: type IN (cron)
+
+git:
+  depth: false # this is needed for pronto
+
 jobs:
   include:
-  # unit
-  - stage: unit
-    name: unit tests
+  # BEFORE MERGE
+  - name: pronto code review
+    stage: before-merge
+    script: |
+      git remote add upstream https://github.com/gooddata/gooddata-ruby.git
+      git fetch upstream master
+      bundle exec pronto run -c upstream/master --exit-code
+
+  - name: unit tests
+    stage: before-merge
     script: bundle exec rake test:unit
     rvm:
+    - 2.2
     - 2.3
     - 2.4
     - 2.5
+    - jruby-1.7.19
     - jruby-9.1.5
+    - jruby-9.1.7
     - jruby-9.1.14
-    - jruby-1.7.19
-  - stage: unit
-    name: pronto code review
+
+  - name: sdk integration (vcr) tests - base
+    stage: before-merge
+    script: bundle exec rake test:sdk
+    env: VCR_RECORD_MODE=none
+    rvm: 2.3
+
+  - name: sdk integration (vcr) tests - project
+    stage: before-merge
+    script: bundle exec rake test:project
+    env: VCR_RECORD_MODE=none
+    rvm: 2.3
+
+  - name: lcm integration (vcr) tests - e2e
+    stage: before-merge
+    script: bundle exec rspec spec/lcm/integration/lcm_end_to_end_spec.rb
+    env:
+    - VCR_RECORD_MODE=none
+    - GD_ENV=development
+    rvm: 2.3
+
+  #  AFTER MERGE
+  #  staging 1
+  - &lcm-integration-tests
+    name: staging1 - lcm integration tests
+    stage: after-merge
     script: |
-      git remote add upstream https://github.com/gooddata/gooddata-ruby.git
-      git fetch upstream master
-      bundle exec pronto run -c upstream/master --exit-code
-  - stage: unit
-    name: sdk vcr tests
-    script: VCR_RECORD_MODE=none bundle exec rake test:sdk
+      bundle exec rake -f lcm.rake docker:build
+      bundle exec rake -f lcm.rake docker:bundle
+      bundle exec rake -f lcm.rake test:docker:integration
+    env:
+    - VCR_ON=false
+    - GD_ENV=staging
     rvm: jruby-9.1.14
-  - stage: unit
-    name: sdk vcr tests (project)
-    script: VCR_RECORD_MODE=none bundle exec rake test:project
+
+  - &lcm-slow-tests
+    name: staging1 - lcm slow tests
+    stage: after-merge
+    script: |
+      bundle exec rake -f lcm.rake docker:build
+      bundle exec rake -f lcm.rake docker:bundle
+      bundle exec rake -f lcm.rake test:docker:slow
+    env:
+    - VCR_ON=false
+    - GD_ENV=staging
     rvm: jruby-9.1.14
-  # integration
-  - &lcm-integration-tests
-    stage: integration
-    name: lcm integration tests
+
+  - &userprov-tests
+    name: staging1 - user provisioning tests
+    stage: after-merge
     script: |
       bundle exec rake -f lcm.rake docker:build
       bundle exec rake -f lcm.rake docker:bundle
-      bundle exec rake -f lcm.rake test:integration:docker
-    rvm:
-    - jruby-9.1.7
+      bundle exec rake -f lcm.rake test:docker:userprov
+    env:
+    - VCR_ON=false
+    - GD_ENV=staging
+    rvm: jruby-9.1.14
+
   - &sdk-integration-tests
-    stage: integration
-    name: sdk integration tests
+    name: staging1 - sdk integration tests - base
+    stage: after-merge
     script: bundle exec rake test:sdk
-    rvm: 2.5
-    env: VCR_ON=false
-  - &sdk-integration-tests-project
-    stage: integration
-    name: sdk integration tests (project)
-    script: bundle exec rake test:project
-    env: VCR_ON=false
-    rvm: 2.5
-  # periodic
-  # staging 1
-  - <<: *lcm-integration-tests
-    stage: periodic
-    name: staging1 - lcm integration tests
     env:
-    - GD_ENV=staging
     - VCR_ON=false
-  - <<: *sdk-integration-tests
-    stage: periodic
-    name: staging1 - sdk integration tests
-    env:
     - GD_ENV=staging
-    - VCR_ON=false
-  - <<: *sdk-integration-tests-project
-    stage: periodic
-    name: staging1 - sdk integration tests (project)
+    rvm: jruby-9.1.14
+
+  - &sdk-integration-tests-project
+    name: staging1 - sdk integration tests - project
+    stage: after-merge
+    script: bundle exec rake test:project
     env:
-    - GD_ENV=staging
     - VCR_ON=false
+    - GD_ENV=staging
+    rvm: jruby-9.1.14
+
   # staging 2
   - <<: *lcm-integration-tests
-    stage: periodic
     name: staging2 - lcm integration tests
     env:
     - GD_ENV=testing
     - VCR_ON=false
+
+  - <<: *lcm-slow-tests
+    name: staging2 - lcm slow tests
+    env:
+    - GD_ENV=staging
+    - VCR_ON=false
+
+  - <<: *userprov-tests
+    name: staging2 - lcm user provisioning tests
+    env:
+    - GD_ENV=staging
+    - VCR_ON=false
+
   - <<: *sdk-integration-tests
-    stage: periodic
-    name: staging2 - sdk integration tests
+    name: staging2 - sdk integration tests - base
     env:
     - GD_ENV=testing
     - VCR_ON=false
+
   - <<: *sdk-integration-tests-project
-    stage: periodic
-    name: staging2 - sdk integration tests (project)
+    name: staging2 - sdk integration tests - project
     env:
     - GD_ENV=testing
     - VCR_ON=false
+
   # staging 3
   - <<: *lcm-integration-tests
-    stage: periodic
     name: staging3 - lcm integration tests
     env:
     - GD_ENV=development
     - VCR_ON=false
+
+  - <<: *lcm-slow-tests
+    name: staging3 - lcm slow tests
+    env:
+    - GD_ENV=staging
+    - VCR_ON=false
+
+  - <<: *userprov-tests
+    name: staging3 - lcm user provisioning tests
+    env:
+    - GD_ENV=staging
+    - VCR_ON=false
+
   - <<: *sdk-integration-tests
-    stage: periodic
-    name: staging3 - sdk integration tests
+    name: staging3 - sdk integration tests - base
     env:
     - GD_ENV=development
     - VCR_ON=false
+
   - <<: *sdk-integration-tests-project
-    stage: periodic
-    name: staging3 - sdk integration tests (project)
+    name: staging3 - sdk integration tests - project
     env:
     - GD_ENV=development
     - VCR_ON=false
+
+  # cleanups
   - &cleanup
-    stage: cleanup
+    stage: after-merge
     name: staging1 - test environment clean-up
     script: bundle exec ruby bin/test_projects_cleanup.rb -f
     env: GD_ENV=staging
+
   - <<: *cleanup
     name: staging2 - test environment clean-up
     env: GD_ENV=testing
+
   - <<: *cleanup
     name: staging3 - test environment clean-up
     env: GD_ENV=development
+
 notifications:
-  slack:
-    secure: TyYks8rEBJMouWRjRtHZJJm+BIajxgwsoSIpxidZmD5zRk5ssEkGVbuYIvjUN+if1NyM1bmWspTSVX+8g5IDmt9PgcujXVqCbPRvfK90r3obs8A5pHbDnKEue6inqYUjNoqa1D6PkWTS1dTb6xvy8WiAwMGqoFGHnlNs4WFF9N4=
-    on_pull_requests: false
+  email:
+    recipients:
+      secure: AMTssALc5Qt4ApAoI7gCmqP3d7AL0dGyZ+DsxYYlas2T0tjXdOH97XlY2jRzFSxZU1P3JKJkjHLmxu0m908Q28SQVcdBlK29Ofyl2pwGnniExY4wdQJLmqNW9eKa2dmSMUsntR6DryNThKVn9mqUACdXgpT8X2CnQl/DWMGpo80=
+    on_success: always
+    on_failure: always

data/CHANGELOG.md

@@ -1,4 +1,35 @@
 # GoodData Ruby SDK Changelog
+## 1.3.4
+ - FEATURE: TMA-1240 Read SDK and brick versions from files
+ - TEST: TMA-1061 Introduce end to end tests
+ - TMA-483 request number optimisation in synchronize users and user filters action
+ - TMA-1232: resilient user filters spec
+ - II-294: Update base image - CentOS 7.6
+ - FEATURE: TMA-1243 Upgrade LCM k8s image to JRuby version 9.2.5.0
+ - Encrypt notification recipient
+ - TMA-1192: dependable CI env
+ - TMA-1003: Move mocking methods into a separate class
+ - BUGFIX: TMA-1233 Install RVM according to changes in installation script
+ - Describe parameters of create_expression
+ - BUGFIX: TMA-1233 Remove ZenTest development dependency which isn't needed anymore
+ - Relax the activesupport dependency
+ - fixup! TMA-1003: Add unit test for delete_extra_process_schedule
+ - BUGFIX: TMA-1218 Anonymise hidden parameters only in LCM bricks running in K8s
+ - TMA-1003: Add unit test for delete_extra_process_schedule
+ - Update README.md
+ - Remove nonsensical object extension
+ - TMA-1189: Remove unnecessary requires from specs
+ - FEATURE: TMA-1198 Log LCM brick output to file instead of stdout when running in K8s
+ - Update README.md
+ - REFACTOR: TMA-1198 Set global logger in LoggerMiddleware instead of GoodDataMiddleware
+ - TMA-1216 removed constant PROJECT_URL
+ - TMA-1070: Record vcr cassettes
+ - TMA-1070: Add test for LCM components
+ - TRIVIAL: Remove code which was commented out
+ - TMA-1208 Log to sigle file from K8s LCM bricks
+ - TMA-1190: Merge cleanup stage into periodic
+ - BUGFIX: TMA-1121 use current user call instead of expensive bootstrap
+
 ## 1.3.3
  - Fix git-ignoring project cache
  - Fix style in vcr configurer

data/CONTRIBUTING.md

@@ -1,9 +1,20 @@
 # Contributing
 
 ## Tests
-### Unit tests
+### CI setup
+gooddata-ruby has a robust CI setup in place to ensure easy contributing by both GD employees and outsiders. The CI is based on travis-ci and all of the environment specifics is versioned in .travis.yml
+
+The pipeline is split into two parts - before-merge and after-merge.
+#### Before-merge
+This pipeline has to pass before the merge of a PR. All of the checks included are runnable without special permissions or credentials (it is possible to run them as an outside contributor). It includes a suite of unit tests, automated code review tools and mocked (thru VCR) integration and E2E tests.
+#### After-merge
+This pipeline has to pass before a release is made. It extends the before-merge suite, running it against a live GD env (staging servers) and adds more thorough specs (load specs, slow specs). Special permissions and credentials are required (member of github GD organization, valid testing credentials).
+#### Details & Caveats
+It is possible to create a local "fork" of the CI environment on travis-ci.org or travis-ci.com. The forked environment will still use the versioned .travis.yml, so all of the settings (including email reporting) will be also valid on the fork. To see a solution to this, check https://confluence.intgdc.com/display/~jakub.mahnert/gooddata-ruby+CI+notification+setup (only applies to specific GD employees)
+### Running tests manually 
+#### Unit tests
 `bundle exec rake test:unit`
-### Integration tests
+#### Integration tests
 Currently only GoodData employees can run integration tests for security reasons.
 
 `GD_SPEC_PASSWORD=*** bundle exec rake test:integration`
@@ -11,7 +22,7 @@ Currently only GoodData employees can run integration tests for security reasons
 [Integration tests](spec/integration) can be run against different GoodData [environments](spec/environment) or with 
 [VCR](https://relishapp.com/vcr/vcr/docs). 
 
-#### VCR test setup
+##### VCR test setup
 When adding new integration test, always set `:vcr` metadata. 
 ```ruby
 describe 'New integration test', :vcr
@@ -19,11 +30,11 @@ describe 'New integration test', :vcr
 The VCR `record` mode can be set via `VCR_RECORD_MODE` environment variable. Set it to `all` to make a new recording.
 Please check the recorded payloads for possible sensitive data before submitting to github.
 
-#### PI test setup 
+##### PI test setup 
 If you are so lucky and have acces to PI, you can run the test agains it ... there is guide in [confluence](https://confluence.intgdc.com/display/SCRUM/Running+Tests+on+PI)
 
 ## Static analysis
-We use [Pronto](https://github.com/prontolabs/pronto) to detect code smells using static analysis. Comments are automatically created on pull requests when code smells are found.
+We use [Pronto](https://github.com/prontolabs/pronto) to detect code smells using static analysis.
 
 #### Running locally
 `bundle exec pronto run --unstaged -c upstream/develop`

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM harbor.intgdc.com/tools/gdc-java-8-jre:b057b53
+FROM harbor.intgdc.com/tools/gdc-java-8-jre:92b15b7
 
 ARG GIT_COMMIT=unspecified
 ARG BRICKS_VERSION=unspecified
@@ -6,7 +6,7 @@ ARG BRICKS_VERSION=unspecified
 LABEL image_name="GDC LCM Bricks"
 LABEL maintainer="LCM <lcm@gooddata.com>"
 LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
-LABEL parent_image="harbor.intgdc.com/tools/gdc-java-8-jre:b057b53"
+LABEL parent_image="harbor.intgdc.com/tools/gdc-java-8-jre:92b15b7"
 LABEL git_commit=$GIT_COMMIT
 LABEL bricks_version=$BRICKS_VERSION
 
@@ -16,14 +16,14 @@ RUN yum install -y curl which \
     && rm -rf /var/cache/yum
 
 RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-RUN curl -sSL https://get.rvm.io | bash -s stable --ruby=jruby-9.1.14.0
+RUN curl -sSL https://get.rvm.io | bash -s stable
 
 # Switch to directory with sources
 WORKDIR /src
 ENV HOME=/src
 
 # login shell is required by rvm
-RUN /bin/bash -l -c ". /usr/local/rvm/scripts/rvm && gem update --system \
+RUN /bin/bash -l -c ". /usr/local/rvm/scripts/rvm && rvm install jruby-9.2.5.0 && gem update --system \
     && gem install bundler rake"
 
 ENV GOODDATA_RUBY_COMMIT=$GIT_COMMIT

data/Dockerfile.jruby

@@ -20,5 +20,3 @@ ADD . .
 RUN keytool -importcert -alias gooddata-2008 -file "./data/2008.crt" -keystore $JAVA_HOME/lib/security/cacerts -trustcacerts -storepass 'changeit' -noprompt
 RUN keytool -importcert -alias gooddata-int -file "./data/new_ca.cer" -keystore $JAVA_HOME/lib/security/cacerts -trustcacerts -storepass 'changeit' -noprompt
 RUN keytool -importcert -alias gooddata-prod -file "data/new_prodgdc_ca.crt" -keystore $JAVA_HOME/lib/security/cacerts -trustcacerts -storepass 'changeit' -noprompt
-
-CMD ["bundle", "exec", "rspec spec/lcm/integration"]

data/README.md

@@ -5,7 +5,7 @@ It has a CLI client and it is a library which you can integrate into your applic
 
 The best documentation for the GoodData API can be found using these resources:
 
- * http://sdk.gooddata.com/gooddata-ruby-examples/
+ * https://sdk.gooddata.com/gooddata-ruby-doc
  * http://developer.gooddata.com/api
  * https://secure.gooddata.com/gdc
  * http://rubydoc.info/gems/gooddata/frames

data/SDK_VERSION

@@ -0,0 +1 @@
+1.3.4

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.5.0

data/bin/run_brick.rb

@@ -5,6 +5,7 @@ require_relative '../lib/gooddata'
 
 DEFAULT_BRICK = 'hello_world_brick'
 BRICK_PARAM_PREFIX = 'BRICK_PARAM_'
+HIDDEN_BRICK_PARAMS_PREFIX = 'HIDDEN_BRICK_PARAM_'
 
 brick_type = !ARGV.empty? ? ARGV[0] : DEFAULT_BRICK
 
@@ -13,13 +14,23 @@ log = RemoteSyslogLogger.new(syslog_node, 514, :program => "ruby_#{brick_type}",
 
 log.info "action=#{brick_type}_execution status=init"
 
+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
+
 begin
   brick_pipeline = GoodData::Bricks::Pipeline.send("#{brick_type}_pipeline")
-  params = ENV.select { |k,| k.to_s.match(/^#{BRICK_PARAM_PREFIX}.*/) }.map { |k, v| [k.slice(BRICK_PARAM_PREFIX.length..-1), v] }.to_h
+  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['log_directory'] = ENV['LOG_DIRECTORY'] || '/tmp/'
-  log.info "action=#{brick_type}_execution status=start commit_hash=#{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_result = brick_pipeline.call(params)
   log.info "action=#{brick_type}_execution status=finished"
 rescue NoMethodError => e

data/docker-compose.yml

@@ -13,6 +13,7 @@ services:
     volumes:
       - /etc/passwd:/etc/passwd:ro
       - .:/src
+      - /tmp/junit.xml:/src/junit.xml
     volumes_from:
       - bundle
   gooddata-jruby: