Skip to content

Commit 90eea3f

Browse files
Guilherme Santossantos1709
authored andcommitted
GRIF-524 - Refactor of integration-e2e to run on github CI
1 parent 8dd57d0 commit 90eea3f

15 files changed

+107
-43
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,7 @@ deprecations.txt
4545

4646
# test cache files
4747
spec/cache/
48+
49+
# local/ci execution
50+
lib/gooddata/cloud_resources/*/*/*.jar
51+
ci/*/target/

docker-compose.lcm.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
version: '2'
21
services:
32
appstore:
43
image: gooddata/appstore
54
build:
65
context: .
76
dockerfile: Dockerfile.jruby
8-
links:
9-
- localstack
7+
working_dir: /src
108
environment:
119
- GD_ENV
1210
- GDC_LOG_LEVEL
@@ -57,16 +55,17 @@ services:
5755
- GD_STG_DEFAULT_PASSWORD
5856
volumes:
5957
- .:/src
60-
volumes_from:
61-
- bundle
62-
mem_limit: 2500m
58+
- bundle_cache:/src/bundle
59+
deploy:
60+
resources:
61+
limits:
62+
memory: 2500m
6363
localstack:
6464
image: hahihula/localstack_dockerfile
6565
expose:
6666
- "4572"
6767
environment:
6868
- SERVICES=s3:4572
69-
bundle:
70-
image: busybox
71-
volumes:
72-
- /bundle
69+
70+
volumes:
71+
bundle_cache:

gooddata.gemspec

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
5656
s.add_dependency 'unf', '~> 0.1.4'
5757
end
5858
s.add_development_dependency 'simplecov', '~> 0.12'
59-
s.add_development_dependency 'webmock', '~> 2.3.1'
59+
s.add_development_dependency 'webmock', '~> 3.26.0'
6060
s.add_development_dependency 'yard', '~> 0.9.11'
6161
s.add_development_dependency 'yard-rspec', '~> 0.1'
6262
s.add_development_dependency 'pry'
@@ -68,7 +68,12 @@ Gem::Specification.new do |s|
6868
s.add_development_dependency 'vcr', '5.0.0'
6969
s.add_development_dependency 'hashdiff', '~> 0.4'
7070

71-
s.add_development_dependency 'sqlite3' if RUBY_PLATFORM != 'java'
71+
if RUBY_PLATFORM == 'java'
72+
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
73+
s.add_development_dependency 'activerecord'
74+
else
75+
s.add_development_dependency 'sqlite3'
76+
end
7277

7378
if RUBY_VERSION >= '2.8'
7479
s.add_dependency 'activesupport', '>= 6.0.3.1'

lib/gooddata/bricks/middleware/aws_middleware.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def rewrite_for_aws_sdk_v2(config)
6060
'SDK uses SSL everywhere. To disable SSL you must ' \
6161
'configure an endpoint that uses http://.'
6262
end
63+
config.delete('endpoint') if config['endpoint'].nil? || config['endpoint'].to_s.strip.empty?
6364
config
6465
end
6566
end

lib/gooddata/rest/connection.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ def initialize(opts)
177177

178178
# Connect using username and password
179179
def connect(username, password, options = {})
180+
Psych::Parser.code_point_limit = 100_000_000
181+
180182
server = options[:server] || Helpers::AuthHelper.read_server
181183
options = DEFAULT_LOGIN_PAYLOAD.merge(options)
182184
headers = options[:headers] || {}

spec/environment/environment.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def initial_secrets(env)
4949
s3_bucket_name: ENV['RT_S3_BUCKET_NAME'],
5050
s3_access_key_id: ENV['RT_S3_ACCESS_KEY'],
5151
s3_secret_access_key: ENV['RT_S3_SECRET_KEY'],
52+
s3_session_token: ENV['RT_S3_SESSION_TOKEN'],
5253
redshift_password: ENV['REDSHIFT_PASSWORD'],
5354
redshift_access_key: ENV['REDSHIFT_ACCESS_KEY'],
5455
redshift_secret_key: ENV['REDSHIFT_SECRET_KEY'],

spec/lcm/integration/params/provisioning_brick.json.erb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
"aws_client": {
3737
"access_key_id": "${s3_access_key}",
3838
"secret_access_key": "${s3_secret_access_key}",
39-
"endpoint": "<%= s3_endpoint %>"
39+
"session_token": "${s3_session_token}",
40+
"endpoint": "<%= s3_endpoint %>",
41+
"region": "<%= s3_region %>"
4042
}
4143
},
4244
"gd_encoded_hidden_params": {
@@ -53,5 +55,6 @@
5355
"GDC_USERNAME": "<%= config[:username] %>",
5456
"GDC_PASSWORD": "<%= config[:password] %>",
5557
"s3_secret_access_key": "<%= s3_secret_access_key %>",
56-
"s3_access_key": "<%= s3_access_key %>"
58+
"s3_access_key": "<%= s3_access_key %>",
59+
"s3_session_token": "<%= s3_session_token %>"
5760
}

spec/lcm/integration/params/release_brick.json.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"SEGMENTS": <%= segments %>,
1111
"DATA_PRODUCT": "<%= data_product %>",
1212
"TOKENS": {
13-
"pg": "<%= config[:prod_token] %>",
14-
"vertica": "<%= config[:vertica_prod_token] %>"
13+
"pg": "<%= config[:prod_token] %>"
1514
},
1615
<% if defined? jdbc_url %>
1716
"ads_client": {

spec/lcm/integration/params/release_brick_delete_old_master_project.json.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"SEGMENTS": <%= segments %>,
77
"DATA_PRODUCT": "<%= data_product %>",
88
"TOKENS": {
9-
"pg": "<%= config[:prod_token] %>",
10-
"vertica": "<%= config[:vertica_prod_token] %>"
9+
"pg": "<%= config[:prod_token] %>"
1110
},
1211
<% if defined? jdbc_url %>
1312
"ads_client": {

spec/lcm/integration/params/release_brick_set_master_project.json.erb

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,33 @@
33
"CLIENT_GDC_PROTOCOL": "https",
44
"CLIENT_GDC_HOSTNAME": "<%= config[:prod_server] %>",
55
"gd_encoded_params": {
6+
"SEGMENTS": <%= segments %>,
7+
"DATA_PRODUCT": "<%= data_product %>",
8+
"TOKENS": {
9+
"pg": "<%= config[:prod_token] %>"
10+
},
611
<% if defined? jdbc_url %>
712
"ads_client": {
813
"username": "${GDC_USERNAME}",
914
"password": "${GDC_PASSWORD}",
1015
"jdbc_url": "<%= jdbc_url %>"
1116
},
1217
<% end %>
13-
"SEGMENTS": <%= segments %>,
14-
"DATA_PRODUCT": "<%= data_product %>"
18+
"technical_user": [
19+
"${GDC_USERNAME}"
20+
],
21+
"development_client": {
22+
"protocol": "https",
23+
"hostname": "<%= config[:dev_server] %>",
24+
"username": "${GDC_USERNAME}",
25+
"password": "${GDC_PASSWORD}"
26+
}
1527
},
28+
"production_tag": "dashboard, metric",
1629
"release_table_name": "<%= release_table_name %>",
1730
"fail_early": "true",
1831
"strict": "true",
1932
"GDC_USERNAME": "<%= config[:username] %>",
2033
"GDC_PASSWORD": "<%= config[:password] %>",
21-
"set_master_project": "<%= master_project_id %>"
34+
"GDC_LOG_LEVEL": "DEBUG"
2235
}

0 commit comments

Comments
 (0)