From 97c49a148f29d86b12946616c77855a65a88d426 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Mon, 12 Nov 2018 12:31:56 +1300 Subject: Further improve some private methods Now we can rescue directly, no need for yield ! --- lib/gitlab/kubernetes/helm/api.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb index afaa0301e35..06841ec7b76 100644 --- a/lib/gitlab/kubernetes/helm/api.rb +++ b/lib/gitlab/kubernetes/helm/api.rb @@ -89,19 +89,13 @@ module Gitlab end def service_account_exists?(resource) - resource_exists? do - kubeclient.get_service_account(resource.metadata.name, resource.metadata.namespace) - end + kubeclient.get_service_account(resource.metadata.name, resource.metadata.namespace) + rescue ::Kubeclient::ResourceNotFoundError + false end def cluster_role_binding_exists?(resource) - resource_exists? do - kubeclient.get_cluster_role_binding(resource.metadata.name) - end - end - - def resource_exists? - yield + kubeclient.get_cluster_role_binding(resource.metadata.name) rescue ::Kubeclient::ResourceNotFoundError false end -- cgit v1.2.1