Skip to content

Commit fa2d176

Browse files
author
gdgate
authored
Merge pull request #1757 from dangdinh/TMA-1714
BUGFIX: TMA-1714 Update rotate password and properly template path of lcm test Reviewed-by: https://github.com/sangtm
2 parents 0fe1703 + 042926d commit fa2d176

9 files changed

Lines changed: 58 additions & 53 deletions

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ jobs:
344344
script: bundle exec rake test:unit
345345
os: osx
346346
rvm: jruby-9.1.14
347-
osx_image: xcode9
347+
osx_image: xcode9.4
348348

349349
- stage: gem-release
350350
name: deploy MRI gem

‎spec/environment/bigquery_encrypted‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
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
39-
k0TOlBOhcqXh4jEwvTrf3FPQ
1+
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
39+
xzSB1BlLTL0W69k9sluzT+PS

‎spec/environment/secrets.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ global:
44
s3_secret_access_key: Vgcneom+Ej3t3Ewq2SBTqQ1UosWDYF2Ve2MXCcEDp8983vkOF/xsjvIPq+2eekdPFnjdpt0Dly/hf13wy97y4g==
55
s3_bucket_name: dGoZeEC1JB5xtiTidNOdPalT/FTVETfenwffrIo63jQ=
66
redshift_password: tBGGOvHlRlJwZ0ciW3LcBW7wPIQXM/WjpP8MyKDq4zo=
7-
redshift_access_key: Xib+XJ7T1WK2rkNXMC8pD1WITcTG5sj7NKrIe4JBK+QgFmtoexgjt3kDlZA9xoNb
8-
redshift_secret_key: bXey3z6dmbq06OrIX6rTyIYeL5+ZLsJfcAQFXfbIUKFa9wibr2+286ZF/v6Jeg2n2A/sIOmDcM+E4Ih28rfK4Q==
7+
redshift_access_key: 94Ti6/jaRHeyZsiQnYdulo8RAoLSahxlTUb3AzvlNkrND38yvBcHnL7JYBJkZ4bS
8+
redshift_secret_key: 1JHYwvoIQinjgdKJXQL6RNGFhx4o4M9DiQf9q4jV+dq6xCPLDBCP/8tXBd0H9y8xdOOI78mY/aOQWjiPzgizLA==
9+
snowflake_password: 1zg1PDRMQq2DhBG3SwQOA8/POUkeek3gurrmV4MT2Go=
910
development:
1011
dev_token: 8qWaLsyWwAUJ7MJJTBdriUvtaWKNidnzmfxVThCrL0c=
1112
prod_token: RitXvhFjpJ8KEpqUqZm57iV3bwVU1zBGDrXNklvwkaE=

‎spec/helpers/rotate_encryption_key_helper.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ def rotate_encryption_key(current_key, new_key)
1919
end
2020
end
2121
File.write(yaml_file, secrets.to_yaml)
22+
# Update BigQuery encryption key in bigquery_encrypted file
23+
bigquery_encrypted_file = 'spec/environment/bigquery_encrypted'
24+
File.write(bigquery_encrypted_file, GoodData::Helpers.encrypt(GoodData::Helpers.decrypt(File.read(bigquery_encrypted_file), current_key), new_key))
2225
# Update PGP encryption key in rubydev_secret_keys.gpg.encrypted file
2326
secret_keys_file = 'rubydev_secret_keys.gpg.encrypted'
2427
File.write(secret_keys_file, GoodData::Helpers.encrypt(GoodData::Helpers.decrypt(File.read(secret_keys_file), current_key), new_key))

‎spec/lcm/integration/spec/others/data_helper_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
"url"=> "jdbc:snowflake://gooddata.snowflakecomputing.com",
116116
"authentication"=> {
117117
"basic"=> {
118-
"userName"=> "cornflake",
119-
"password"=> ConnectionHelper::SECRETS[:redshift_password]
118+
"userName"=> "mekong-qa",
119+
"password"=> ConnectionHelper::SECRETS[:snowflake_password]
120120
}
121121
},
122122
"database"=> "PHONG_DEV",

‎spec/lcm/integration/spec/others/lcm_include_deprecated_spec.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require_relative '../../support/constants'
22
require_relative '../../support/configuration_helper'
33
require_relative '../../support/lcm_helper'
4+
require_relative '../../support/comparison_helper'
45
require_relative '../brick_runner'
56
require_relative '../shared_contexts_for_lcm'
67

‎spec/lcm/integration/spec/others/lcm_upgrade_custom_v2_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../../params/release_brick.json.erb', client: @prod_rest_client
5555
$client_projects = BrickRunner.provisioning_brick context: @test_context, template_path: '../../params/provisioning_brick.json.erb', client: @prod_rest_client
56-
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../params/rollout_brick.json.erb', client: @prod_rest_client
56+
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../../params/rollout_brick.json.erb', client: @prod_rest_client
5757

5858
$master_before = $master_projects.first
5959

‎spec/lcm/slow/nfs_release_table_spec.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
describe '1 - Initial Release' do
2424
before(:all) do
25-
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../params/release_brick.json.erb', client: @prod_rest_client
25+
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../../params/release_brick.json.erb', client: @prod_rest_client
2626
$master = $master_projects.first
2727
end
2828

@@ -45,7 +45,7 @@
4545

4646
describe '2 - Initial Provisioning' do
4747
before(:all) do
48-
$client_projects = BrickRunner.provisioning_brick context: @test_context, template_path: '../params/provisioning_brick.json.erb', client: @prod_rest_client
48+
$client_projects = BrickRunner.provisioning_brick context: @test_context, template_path: '../../params/provisioning_brick.json.erb', client: @prod_rest_client
4949
end
5050

5151
it 'creates client projects only for filtered segments' do
@@ -70,7 +70,7 @@
7070

7171
describe '3 - Initial Rollout' do
7272
before(:all) do
73-
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../params/rollout_brick.json.erb', client: @prod_rest_client
73+
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../../params/rollout_brick.json.erb', client: @prod_rest_client
7474
end
7575

7676
it_behaves_like 'a synchronization brick' do
@@ -116,7 +116,7 @@
116116

117117
describe '5 - Subsequent Release' do
118118
before(:all) do
119-
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../params/release_brick.json.erb', client: @prod_rest_client
119+
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../../params/release_brick.json.erb', client: @prod_rest_client
120120
$master = $master_projects.first
121121
end
122122

@@ -139,7 +139,7 @@
139139

140140
describe '6 - Subsequent Rollout' do
141141
before(:all) do
142-
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../params/rollout_brick.json.erb', client: @prod_rest_client
142+
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../../params/rollout_brick.json.erb', client: @prod_rest_client
143143
end
144144

145145
it_behaves_like 'a synchronization brick' do

‎spec/lcm/slow/vertica_end_to_end_spec.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
describe '1 - Initial Release' do
9595
before(:all) do
96-
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../../slow/params/release_brick.json.erb', client: @prod_rest_client
96+
$master_projects = BrickRunner.release_brick context: @test_context, template_path: '../../../slow/params/release_brick.json.erb', client: @prod_rest_client
9797
end
9898

9999
it_behaves_like 'a HLL fact synchronizer' do
@@ -103,7 +103,7 @@
103103

104104
describe '2 - Initial Provisioning' do
105105
before(:all) do
106-
$client_projects = BrickRunner.provisioning_brick context: @test_context, template_path: '../../slow/params/provisioning_brick.json.erb', client: @prod_rest_client
106+
$client_projects = BrickRunner.provisioning_brick context: @test_context, template_path: '../../../slow/params/provisioning_brick.json.erb', client: @prod_rest_client
107107
end
108108

109109
it_behaves_like 'a HLL fact synchronizer' do
@@ -113,7 +113,7 @@
113113

114114
describe '3 - Initial Rollout' do
115115
before(:all) do
116-
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../../slow/params/rollout_brick.json.erb', client: @prod_rest_client
116+
$client_projects = BrickRunner.rollout_brick context: @test_context, template_path: '../../../slow/params/rollout_brick.json.erb', client: @prod_rest_client
117117
end
118118

119119
it_behaves_like 'a HLL fact synchronizer' do

0 commit comments

Comments
 (0)