From 7039d80ba230fe13b3f294086c2e2d875d805d2a Mon Sep 17 00:00:00 2001 From: Dereck Martin Date: Tue, 10 Aug 2021 09:16:22 -0400 Subject: [PATCH] Update swagger.rb Fixed a duplicate merge issue and missing block of code. --- lib/puppet/provider/harbor_project/swagger.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/puppet/provider/harbor_project/swagger.rb b/lib/puppet/provider/harbor_project/swagger.rb index 0d9361b..91019a8 100644 --- a/lib/puppet/provider/harbor_project/swagger.rb +++ b/lib/puppet/provider/harbor_project/swagger.rb @@ -69,15 +69,13 @@ def self.get_project_member_group_names(project_id) names end - def self.get_project_registry_name(project) + def self.get_registry_name(registry_id) api_instance = do_login - if api_instance[:api_version] == 2 - project.registry_id.nil? ? nil : get_registry_name(project.registry_id) - else - nil - end + registries = api_instance[:legacy_client].registries_get + filtered_registries = registries.select { |r| r.id == registry_id } + filtered_registries.empty? ? nil : filtered_registries[0].name end - + def self.get_project_registry_name(project) api_instance = do_login if api_instance[:api_version] == 2