summaryrefslogtreecommitdiffstats
path: root/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup
diff options
context:
space:
mode:
authorChrisC <christophe.closset@intl.att.com>2021-02-12 16:21:40 +0100
committerChrisC <christophe.closset@intl.att.com>2021-02-15 17:58:06 +0100
commit70533b5c8fff3e9eb9e3b7bc6dd439d53036915a (patch)
tree09ad9030c676ac2e355f74dd3ca2123978111793 /catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup
parent9d724fe46a32c564f8297544a5634ccb9ccdc61c (diff)
Fix build
Fix catalog-be tests and Integration docker test this fix is not final as it just avoids concurrency issues on statics Fix Expired certificates on Vendorsoftwareproduct Issue-ID: SDC-3467 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I311470b305a29bebffbd74b6f2ad7b13193132e1
Diffstat (limited to 'catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup')
-rw-r--r--catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb2
-rw-r--r--catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb2
-rw-r--r--catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
index 5585bc0b25..dcf963fc29 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/1_create_consumer_and_user.rb
@@ -21,7 +21,7 @@ if node['basic_auth']
basic_auth_user = node['basic_auth']['user_name']
basic_auth_pass = node['basic_auth']['user_pass']
if basic_auth_enabled
- basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+ basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
else
# set default user configuration file
basic_auth_config = ""
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
index ffa1fee66b..27b1a7d5b9 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
@@ -14,7 +14,7 @@ if node['basic_auth']
basic_auth_user = node['basic_auth']['user_name']
basic_auth_pass = node['basic_auth']['user_pass']
if basic_auth_enabled
- basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+ basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
else
# set default user configuration file
basic_auth_config = ""
diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
index 04fb25f49e..0abda0d07a 100644
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/3_import_Normatives.rb
@@ -16,7 +16,7 @@ if node['basic_auth']
basic_auth_user = node['basic_auth']['user_name']
basic_auth_pass = node['basic_auth']['user_pass']
if basic_auth_enabled
- basic_auth_config = "--header " + Base64.encode64(basic_auth_user + ":" + basic_auth_pass)
+ basic_auth_config = "--header " + Base64.strict_encode64(basic_auth_user + ":" + basic_auth_pass)
else
# set default user configuration file
basic_auth_config = ""