Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move toml dependency to avoid toml missing when not needing ldap feature #370

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move toml dependency to avoid toml missing when not needing ldap feature #370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puppet/type/grafana_ldap_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

require 'toml'
require 'puppet/parameter/boolean'

Puppet::Type.newtype(:grafana_ldap_config) do
Expand Down Expand Up @@ -156,6 +155,7 @@ def generate
end

def eval_generate
require 'toml'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joshcooper do you know if it's a good idea to move the require for an external gem into the eval_generate method?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bastelfreak that should be fine, as long as that's the first code path that attempt use use toml. Alternatively, if you implement the pre_run_check lifecycle method then you could require it there.

ldap_servers = should_content

if !ldap_servers.nil? && !ldap_servers.empty?
Expand Down
Loading