From 9c140b7d26faaaa939dc3f2461fafc8cc434e47c Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Tue, 4 Dec 2018 23:47:27 +1300 Subject: DRY up refresh service The two pieces of code are identical so use a private method --- app/services/clusters/refresh_service.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'app') diff --git a/app/services/clusters/refresh_service.rb b/app/services/clusters/refresh_service.rb index 51859a002c0..c203f495b7c 100644 --- a/app/services/clusters/refresh_service.rb +++ b/app/services/clusters/refresh_service.rb @@ -7,12 +7,7 @@ module Clusters # Create all namespaces that are missing for each project cluster.all_projects.missing_kubernetes_namespace(cluster_namespaces).each do |project| - kubernetes_namespace = cluster.find_or_initialize_kubernetes_namespace_for_project(project) - - ::Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService.new( - cluster: cluster, - kubernetes_namespace: kubernetes_namespace - ).execute + create_or_update_namespace(cluster, project) end end @@ -21,13 +16,19 @@ module Clusters # Create all namespaces that are missing for each cluster project.all_clusters.missing_kubernetes_namespace(project_namespaces).each do |cluster| - kubernetes_namespace = cluster.find_or_initialize_kubernetes_namespace_for_project(project) - - ::Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService.new( - cluster: cluster, - kubernetes_namespace: kubernetes_namespace - ).execute + create_or_update_namespace(cluster, project) end end + + private + + def create_or_update_namespace(cluster, project) + kubernetes_namespace = cluster.find_or_initialize_kubernetes_namespace_for_project(project) + + ::Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService.new( + cluster: cluster, + kubernetes_namespace: kubernetes_namespace + ).execute + end end end -- cgit v1.2.3