gooddata 2.1.9-java → 2.1.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc6c846aa117ae4e5809d836ccdd2e0a9b5bd0a223837328c3f0e07065ee6b0f
-  data.tar.gz: d77bc24dd2ce6f01a6c0685cf58d099117a442113dfbb6cfb1c615d71af033a3
+  metadata.gz: efe801504220f2ac49763a1d5cb0ec516b7c50658835c16681e3f9d641f4470d
+  data.tar.gz: aa034a9c9b9f618805f5dfe48e6234c65f52fcc914eb319c85de2217be987636
 SHA512:
-  metadata.gz: 36a5cae65532cae267891feecd76562e83082c2f812201577c30a42a97d93ddcf2689f4f35166089e9262d9afd08f6564c114e6ad769081a3422909d26b5b8ec
-  data.tar.gz: e77339f7f2a67fa32213aa42619e71ac85f3495a1c9f1110458f71eb15e825e0014c5b9f06c72f85311ad0dcfad4b6dee0700464f6088350beee94ec02256de7
+  metadata.gz: c2e3d172e94722661c93dd1058c4dcc29c6a19b94644689c7a359407d1ca8d8fb963e80d054f537813ccb49331aa1c67028cb4ebbd89493c17b98c2a0b8948d5
+  data.tar.gz: 53ad15fd02b22838f98b4854863a4d72b8fea10b41078fb5ff362ce456aeaa9c783014057e0e8e8df678d0856746b2e4a6429c10c590272f229cfd74c554da1a

data/.gdc-ii-config.yaml

@@ -22,4 +22,4 @@ configFilesForUpdate:
   - '.gdc-ii-config-chart.yaml'
 
 customConstants:
-  pipeline.deploy.testEnvironments: ['stg3', 'stg2', 'stg']
+  pipeline.deploy.testEnvironments: ['stg9', 'stg3', 'stg2', 'stg']

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   DisplayCopNames: true
   Exclude:
       - 'spec/helpers/appstore_project_helper.rb'
+  TargetRubyVersion: 2.3
 
 AbcSize:
   Enabled: false

data/.travis.yml

@@ -15,11 +15,9 @@ stages:
 git:
   depth: false # this is needed for pronto
 
-matrix:
+jobs:
   allow_failures:
     - rvm: jruby-9.1.14
-
-jobs:
   include:
   # BEFORE MERGE
   - name: pronto code review

data/CHANGELOG.md

@@ -1,4 +1,53 @@
 # GoodData Ruby SDK Changelog
+## 2.1.14
+ - BUGFIX: MSF-18892 Change default option of recurrency field to valid value 
+ - FEATURE:TMA-1687 - Release/Rollout sync theme object 
+ - CONFIG: MSF-18574 Add support notice to the readme
+ - BUGFIX: MSF-18223 - Update param placeholder pattern
+
+## 2.1.13
+ - FEATURE: TMA-1676 Support LCM release across domain
+ - FEATURE: TMA-1672 Support sync process with generic datasource
+ - FEATURE: MSF-17743 upgrade custom v2 for rollout brick
+ - BUGFIX: MSF-17975 Introduce gdcshare to lcm bricks
+ - BUGFIX: TMA-1673 Update params processing to accept dot and space
+
+## 2.1.12
+ - FEATURE: MSF-17621 Apply patched version for activesupport to fix vulnerable issue
+ - CONFIG: SETI-4379 Add gdc-fossa configuration for gooddata-ruby
+ - CONFIG: MSF-17345 Set umask 0002 for lcm brick
+ - BUGFIX: TMA-1015 check case sensitivity for group name
+ - BUGFIX: MSF-17219 Fixed incorrect client used in domain.users
+ - BUGFIX: TMA-1022 Add more logs for case roll out without LDM change in master
+ - FEATURE: TMA-1640 Add alert for CPU limit hit
+
+## 2.1.11
+ - FEATURE: TMA-1647 Set VCR version to 5.0.0 due to incompatible license of the latest version
+
+## 2.1.10
+ - BUGFIX: TMA-1653 fix performance issue in functions project.users and domain.users
+ - BUGFIX: TMA-1643 Don't convert null value to empty string
+ - BUGFIX: TMA-1620 Users Brick, sometimes update users are conflicted
+ - BUGFIX: TMA-1642 parse csv from input source with case insensitive
+ - BUGFIX: TMA-1528: remove CollectSegments and CollectDataProduct for add and remove in users brick
+ - FEATURE: TMA-1629 Add parameter "set_master_project" to support reset latest master project
+ - FEATURE: TMA-1630 Support Snowflake, BigQuery as input source
+## 2.1.9
+ - FEATURE: TMA-1076 support new version api 2
+ - BUGFIX: TMA-1637 handle input_source of dynamic params
+ - BUGFIX: TMA-1636 Build csv file with force_quotes
+ - FEATURE: TMA-1614 Support redshift input source
+ - FEATURE: TMA-1259 Start using dataproduct in NFS release table
+ - FEATURE: MSF-16455 support yellow WARNING status into RubySDK
+ - CONFIG: TMA-1625 update version lock for test docker images
+ - BUGFIX: TMA-1602 User filter brick failed - K8s bricks don't show error properly
+ - BUGFIX: TMA-1593 Increase java heap space during execute bricks
+ - BUGFIX: TMA-1558 K8s bricks don't show error when config invalid
+ - BUGFIX: TMA-1596 The error propagated from a LCM brick is shown multiple times in the log
+ - BUGFIX: TMA-1582 show synchronize ldm mode is running
+ - FEATURE: TMA-1588 support schedule param include deprecated
+ - FEATURE: TMA-1597 Logging lcm execution result
+
 ## 2.1.8
  - FEATURE: TMA-1604 Upgrade Restforce version to 3.x
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM harbor.intgdc.com/tools/gdc-java-8-jre:0dec94a
+FROM harbor.intgdc.com/tools/gdc-java-8-jre:2fce51b
 
 ARG RVM_VERSION=stable
 ARG JRUBY_VERSION=9.2.5.0
@@ -6,7 +6,7 @@ ARG JRUBY_VERSION=9.2.5.0
 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:0dec94a"
+LABEL parent_image="harbor.intgdc.com/tools/gdc-java-8-jre:2fce51b"
 
 # which is required by RVM
 RUN yum install -y curl which patch make git maven \
@@ -14,7 +14,7 @@ RUN yum install -y curl which patch make git maven \
     && rm -rf /var/cache/yum
 
 # Install + verify RVM with gpg (https://rvm.io/rvm/security)
-RUN gpg2 --quiet --no-tty --logger-fd 1 --keyserver hkp://keys.gnupg.net \
+RUN gpg2 --quiet --no-tty --logger-fd 1 --keyserver hkp://ipv4.pool.sks-keyservers.net \
          --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
                      7D2BAF1CF37B13E2069D6956105BD0E739499BDB \
     && echo 409B6B1796C275462A1703113804BB82D39DC0E3:6: | \
@@ -37,22 +37,32 @@ RUN rvm install jruby-${JRUBY_VERSION} && gem update --system \
 WORKDIR /src
 
 RUN groupadd -g 48 apache \
+    && groupadd -g 65065 gdcshare \
     && useradd -u 48 -m --no-log-init -r -g apache -G rvm apache \
+    && usermod -a -G gdcshare apache \
     && chown apache: /src
 
 USER apache
 
 ADD ./bin ./bin
+ADD --chown=apache:apache ./ci ./ci
 ADD --chown=apache:apache ./lib ./lib
 ADD ./SDK_VERSION .
 ADD ./VERSION .
 ADD ./Gemfile .
 ADD ./gooddata.gemspec .
 
-RUN mkdir -p tmp
-COPY spec/lcm/redshift_driver_pom.xml tmp/pom.xml
-RUN mvn -f tmp/pom.xml clean install -P binary-packaging
-RUN cp -rf tmp/target/*.jar ./lib/gooddata/cloud_resources/redshift/drivers/
+#build redshift dependencies
+RUN mvn -f ci/redshift/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/redshift/target/*.jar ./lib/gooddata/cloud_resources/redshift/drivers/
+
+#build snowflake dependencies
+RUN mvn -f ci/snowflake/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/snowflake/target/*.jar ./lib/gooddata/cloud_resources/snowflake/drivers/
+
+#build bigquery dependencies
+RUN mvn -f ci/bigquery/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/bigquery/target/*.jar ./lib/gooddata/cloud_resources/bigquery/drivers/
 
 RUN bundle install
 

data/README.md

@@ -9,6 +9,8 @@ The best documentation for the GoodData API can be found using these resources:
  * http://developer.gooddata.com/api
  * https://secure.gooddata.com/gdc
  * http://rubydoc.info/gems/gooddata/frames
+ 
+Feel free to check out the [GoodData community website](http://community.gooddata.com/) if you have any questions about the GoodData Analytics platform, our API, or this library.
 
 ## Status
 
@@ -19,6 +21,21 @@ The best documentation for the GoodData API can be found using these resources:
 [![Build Status](https://travis-ci.org/gooddata/gooddata-ruby.png)](https://travis-ci.org/gooddata/gooddata-ruby)
 [![Coverage Status](https://coveralls.io/repos/gooddata/gooddata-ruby/badge.png)](https://coveralls.io/r/gooddata/gooddata-ruby)
 
+## Supported versions
+ 
+In order to make the user experience with integrating GoodData Ruby SDK as smooth and secure as possible and to ensure that the SDK is using the latest features of the platform, we only provide support to the two most recent major versions of Ruby SDK. 
+ 
+The most recent majors will be supported in the following modes:
+ 
+- The latest major version will receive all new functionality and all bug fixes. 
+- The previous major version will only receive fixes to critical issues and security fixes. These fixes will be applied on top of last released version of the previous major.
+- GoodData customer support will provide support for the latest major and previous major version only.
+
+- The customers are encouraged to always use the latest version of the Ruby SDK.
+- In case of using older versions, the user might face API incompatibility, performance or security issues.
+ 
+Please follow the installation instructions in the repository to update to the newest version.
+
 ## Install
 
 If you are using bundler, add

data/SDK_VERSION

@@ -1 +1 @@
-2.1.9
+2.1.14

data/VERSION

@@ -1 +1 @@
-3.7.14
+3.7.24

data/bin/run_brick.rb

@@ -8,6 +8,9 @@ DEFAULT_BRICK = 'hello_world_brick'
 BRICK_PARAM_PREFIX = 'BRICK_PARAM_'
 HIDDEN_BRICK_PARAMS_PREFIX = 'HIDDEN_BRICK_PARAM_'
 
+# MSF-17345 Set umask so files are group-writable
+File.umask(0002)
+
 brick_type = !ARGV.empty? ? ARGV[0] : DEFAULT_BRICK
 
 def get_brick_params(prefix)

data/bin/test_projects_cleanup.rb

@@ -90,7 +90,11 @@ def clean_up!(client, force, days)
   delete_project_by_title(/LCM spec Client With Conflicting LDM Changes/, projects, days, force)
   delete_project_by_title(/LCM spec master project/, projects, days, force)
   delete_project_by_title(/users brick load test/, projects, days, force)
-  delete_project_by_title(/#transfer_processes and #transfer_schedules test/, projects, days, force)
+  delete_project_by_title(/transfer_processes and #transfer_schedules test/, projects, days, force)
+  delete_project_by_title(/DailyUse Project for gooddata-ruby integration tests/, projects, days, force)
+  delete_project_by_title(/^New project$/, projects, days, force)
+  delete_project_by_title(/RubyGem Dev Week test/, projects, days, force)
+  delete_project_by_title(/My project from blueprint/, projects, days, force)
   delete_ads_by_title(/Development ADS/, client, days, force)
   delete_ads_by_title(/Production ADS/, client, days, force)
   delete_ads_by_title(/TEST ADS/, client, days, force)
@@ -112,7 +116,7 @@ dev_client = init_client(username, password, "https://#{config[:dev_server]}")
 prod_client = init_client(username, password, "https://#{config[:prod_server]}")
 
 force = options[:force]
-days = options[:days] || 14
+days = options[:days] || 3
 clean_up!(dev_client, force, days)
 clean_up!(prod_client, force, days)
 

data/ci/bigquery/pom.xml

@@ -0,0 +1,54 @@
+<?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-bigquery-driver</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.auth</groupId>
+            <artifactId>google-auth-library-oauth2-http</artifactId>
+            <version>0.16.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.cloud</groupId>
+            <artifactId>google-cloud-bigquery</artifactId>
+            <version>1.102.0</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>
+</project>

data/ci/redshift/pom.xml

@@ -0,0 +1,73 @@
+<?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-redshift-driver</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazon.redshift</groupId>
+            <artifactId>redshift-jdbc42-no-awssdk</artifactId>
+            <version>1.2.36.1060</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <version>1.11.633</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-redshift</artifactId>
+            <version>1.11.633</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sts</artifactId>
+            <version>1.11.633</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+            <scope>compile</scope>
+        </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/ci/snowflake/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-snowflake-driver</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.snowflake</groupId>
+            <artifactId>snowflake-jdbc</artifactId>
+            <version>3.6.22</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/dev-gooddata-sso.pub.encrypted

@@ -1,40 +1,40 @@
-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
-PHRjAjc=
+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
+MUk4BaY=