From 16248dc895b0abd2e5304e9092e0291a8b891ced Mon Sep 17 00:00:00 2001 From: Amit Rathi Date: Fri, 23 Nov 2018 01:22:52 +0530 Subject: [PATCH] Addressing review comments --- app/models/clusters/applications/cert_manager.rb | 14 ++++++++------ .../clusters/applications/create_service.rb | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb index ec0fab8ad99..922f4a880f0 100644 --- a/app/models/clusters/applications/cert_manager.rb +++ b/app/models/clusters/applications/cert_manager.rb @@ -39,18 +39,20 @@ module Clusters def cluster_issuer_file { - 'cluster_issuer.yaml': cluster_issuer_yaml_content + 'cluster_issuer.yaml': cluster_issuer_content.deep_merge(cluster_issue_overlay) } end - def cluster_issuer_yaml_content - data = YAML.load_file(cluster_issuer_file_path) - data["spec"]["acme"]["email"] = self.email - YAML.dump(data) + def cluster_issuer_content + YAML.load_file(cluster_issuer_file_path) + end + + def cluster_issue_overlay + { "spec" => { "acme" => { "email" => self.email } } } end def cluster_issuer_file_path - "#{Rails.root}/vendor/cert_manager/cluster_issuer.yaml" + Rails.root.join('vendor', 'cert_manager', 'cluster_issuer.yaml') end end end diff --git a/app/services/clusters/applications/create_service.rb b/app/services/clusters/applications/create_service.rb index 8f1b247343d..a89772e82dc 100644 --- a/app/services/clusters/applications/create_service.rb +++ b/app/services/clusters/applications/create_service.rb @@ -20,7 +20,7 @@ module Clusters end if application.has_attribute?(:email) - application.email = @current_user.email + application.email = current_user.email end if application.respond_to?(:oauth_application) -- GitLab