From 7002ef70c656a84587b6e23ab98b67868272c650 Mon Sep 17 00:00:00 2001 From: Peter Leitzen <pleitzen@gitlab.com> Date: Mon, 28 Oct 2024 17:05:59 +0100 Subject: [PATCH] Move OpenBao setup code to EE config initializers --- config/initializers/openbao.rb | 19 ------------------- ee/config/initializers/openbao.rb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 config/initializers/openbao.rb create mode 100644 ee/config/initializers/openbao.rb diff --git a/config/initializers/openbao.rb b/config/initializers/openbao.rb deleted file mode 100644 index 3a31a1cf6af84..0000000000000 --- a/config/initializers/openbao.rb +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true - -Gitlab.ee do - OpenbaoClient.configure do |c| - c.host = if Gitlab.config.key?(:openbao) && Gitlab.config.openbao.key?(:proxy_address) - Gitlab.config.openbao.proxy_address - elsif Rails.env.test? - # This matches the listener address in - # `ee/spec/support/helpers/secrets_management/test_proxy.hcl` - "http://127.0.0.1:9900" - elsif Rails.env.development? - "http://127.0.0.1:8100" - else - "https://127.0.0.1:8100" - end - - c.base_path = 'v1' - end -end diff --git a/ee/config/initializers/openbao.rb b/ee/config/initializers/openbao.rb new file mode 100644 index 0000000000000..ced7f801c8341 --- /dev/null +++ b/ee/config/initializers/openbao.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +OpenbaoClient.configure do |c| + c.host = if Gitlab.config.key?(:openbao) && Gitlab.config.openbao.key?(:proxy_address) + Gitlab.config.openbao.proxy_address + elsif Rails.env.test? + # This matches the listener address in + # `ee/spec/support/helpers/secrets_management/test_proxy.hcl` + "http://127.0.0.1:9900" + elsif Rails.env.development? + "http://127.0.0.1:8100" + else + "https://127.0.0.1:8100" + end + + c.base_path = 'v1' +end -- GitLab