mirror of
https://github.com/inspec/inspec
synced 2024-09-21 06:51:56 +00:00
Moved __register down to bookkeeping section.
Signed-off-by: Ryan Davis <zenspider@chef.io>
This commit is contained in:
parent
b38a3b05f9
commit
950c79319e
1 changed files with 27 additions and 27 deletions
|
@ -76,33 +76,6 @@ module Inspec
|
|||
end
|
||||
end
|
||||
|
||||
def self.__register(name, resource_klass)
|
||||
cl = Class.new(resource_klass) do # TODO: remove
|
||||
# As best I can figure out, this anonymous class only exists
|
||||
# because we're trying to avoid having resources with
|
||||
# initialize methods from having to call super, which is,
|
||||
# quite frankly, dumb. Avoidable even with some simple
|
||||
# documentation.
|
||||
def initialize(backend, name, *args)
|
||||
supersuper_initialize(backend, name) do
|
||||
super(*args)
|
||||
end
|
||||
end
|
||||
end # Class.new
|
||||
|
||||
reg = __resource_registry rescue nil
|
||||
reg = self.__resource_registry = Inspec::Resource.registry unless reg
|
||||
|
||||
# Warn if a resource pack is overwriting a core resource.
|
||||
# Suppress warning if the resource is an AWS resource, see #3822
|
||||
|
||||
if reg.key?(name) && !name.start_with?("aws_")
|
||||
Inspec::Log.warn("Overwriting resource #{name}. To reference a specific version of #{name} use the resource() method")
|
||||
end
|
||||
|
||||
reg[name] = cl
|
||||
end # __register
|
||||
|
||||
# Support for Resource DSL plugins.
|
||||
# This is called when an unknown method is encountered
|
||||
# within a resource class definition.
|
||||
|
@ -134,6 +107,33 @@ module Inspec
|
|||
############################################################
|
||||
# Infrastructure / Bookkeeping
|
||||
|
||||
def self.__register(name, resource_klass)
|
||||
cl = Class.new(resource_klass) do # TODO: remove
|
||||
# As best I can figure out, this anonymous class only exists
|
||||
# because we're trying to avoid having resources with
|
||||
# initialize methods from having to call super, which is,
|
||||
# quite frankly, dumb. Avoidable even with some simple
|
||||
# documentation.
|
||||
def initialize(backend, name, *args)
|
||||
supersuper_initialize(backend, name) do
|
||||
super(*args)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
reg = __resource_registry rescue nil
|
||||
reg = self.__resource_registry = Inspec::Resource.registry unless reg
|
||||
|
||||
# Warn if a resource pack is overwriting a core resource.
|
||||
# Suppress warning if the resource is an AWS resource, see #3822
|
||||
|
||||
if reg.key?(name) && !name.start_with?("aws_")
|
||||
Inspec::Log.warn("Overwriting resource #{name}. To reference a specific version of #{name} use the resource() method")
|
||||
end
|
||||
|
||||
reg[name] = cl
|
||||
end # __register
|
||||
|
||||
def self.__resource_registry
|
||||
# rubocop:disable Style/AndOr
|
||||
find_class_instance_variable(:@__resource_registry) or
|
||||
|
|
Loading…
Reference in a new issue