From 30b2d0a8feb94676da12cbb0f96898e788c7f256 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Fri, 20 Sep 2019 10:40:06 +0100 Subject: [PATCH] (FM-8553) use the dedicated rsapi function https://github.com/puppetlabs/puppet-resource_api/pull/187 implemented a dedicated function in the Resource API to load and return all transport schemas. Use it here now. --- src/ruby/puppetserver-lib/puppet/server/master.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ruby/puppetserver-lib/puppet/server/master.rb b/src/ruby/puppetserver-lib/puppet/server/master.rb index 8d69a014b2..832beaa8e7 100644 --- a/src/ruby/puppetserver-lib/puppet/server/master.rb +++ b/src/ruby/puppetserver-lib/puppet/server/master.rb @@ -97,12 +97,7 @@ def getClassInfoForEnvironment(env) def getTransportInfoForEnvironment(env) require 'puppet/resource_api/transport' - - environment = @env_loader.get!(env) - Puppet.override({current_environment: environment}) do - @transports_loader.loadall(environment) - Puppet::ResourceApi::Transport.list.values.map(&:definition) - end + Puppet::ResourceApi::Transport.list_all_transports(env).values.map(&:definition) end def getModuleInfoForEnvironment(env)