Remove references to now deprecated attributes

Signed-off-by: Brian Dwyer <bdwyer@IEEE.org>
bdwyertech · Aug 7, 2018 · 1b72df0 · 1b72df0
1 parent c70d720
commit 1b72df0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/libraries/helper.rb b/libraries/helper.rb
@@ -2,7 +2,7 @@
 
 #
 # Cookbook:: wildfly
-# Library:: config
+# Library:: Helper
 #
 # Copyright:: 2018, Brian Dwyer - Intelligent Digital Services
 #
@@ -25,17 +25,19 @@ module Helper
 
     # => Search for a WildFly Instance and grab its Configuration Properties
     def wildfly_cfg(resource_name = 'wildfly')
+      resource_name ||= 'wildfly'
       resource_type = 'wildfly'
 
       rc = Chef.run_context.resource_collection if Chef.run_context
       result = rc.find(resource_type => resource_name) rescue nil # rubocop: disable RescueModifier
 
       cfg = {}
       unless result
-        cfg['user']    = Chef.node['wildfly']['user']
-        cfg['group']   = Chef.node['wildfly']['group']
-        cfg['dir']     = Chef.node['wildfly']['base']
-        cfg['service'] = Chef.node['wildfly']['service']
+        Chef::Log.warn("WildFly::Helper:: Could not detect resource #{resource_name}... Returning sane defaults.")
+        cfg['user']    = resource_name
+        cfg['group']   = resource_name
+        cfg['dir']     = ::File.join(::File::SEPARATOR, 'opt', resource_name)
+        cfg['service'] = resource_name
         cfg['port']    = '9990'
         return cfg
       end

diff --git a/recipes/mysql_datasources.rb b/recipes/mysql_datasources.rb
@@ -29,7 +29,7 @@
 
 mysql['jndi']['datasources'].each do |source|
   # => Configure MySQL Datasource
-  template ::File.join(wildfly['base'], 'standalone', 'deployments', "#{::File.basename(source['jndi_name'])}-ds.xml") do
+  template ::File.join(WildFly::Helper.wildfly_cfg['dir'], 'standalone', 'deployments', "#{::File.basename(source['jndi_name'])}-ds.xml") do
     source 'mysql-ds.xml.erb'
     user wildfly['user']
     group wildfly['group']

diff --git a/recipes/postgres_datasources.rb b/recipes/postgres_datasources.rb
@@ -29,7 +29,7 @@
 
 postgres['jndi']['datasources'].each do |source|
   # => Configure PostgreSQL Datasource
-  template ::File.join(wildfly['base'], 'standalone', 'deployments', "#{::File.basename(source['jndi_name'])}-ds.xml") do
+  template ::File.join(WildFly::Helper.wildfly_cfg['dir'], 'standalone', 'deployments', "#{::File.basename(source['jndi_name'])}-ds.xml") do
     source 'postgres-ds.xml.erb'
     user wildfly['user']
     group wildfly['group']

diff --git a/resources/mysql_connector.rb b/resources/mysql_connector.rb
@@ -26,7 +26,7 @@
 mysql = node['wildfly']['mysql']
 
 # => Define the Resource Properties
-property :instance, String, required: false
+property :instance, String, name_property: true
 property :base_dir, String, default: lazy { WildFly::Helper.wildfly_cfg(instance)['dir'] }
 property :url,      String, default: mysql['url']
 property :checksum, String, default: mysql['checksum']

diff --git a/resources/postgres_connector.rb b/resources/postgres_connector.rb
@@ -25,7 +25,7 @@
 postgresql = node['wildfly']['postgresql']
 
 # => Define the Resource Properties
-property :instance, String, required: false
+property :instance, String, name_property: true
 property :base_dir, String, default: lazy { WildFly::Helper.wildfly_cfg(instance)['dir'] }
 property :url,      String, default: postgresql['url']
 property :checksum, String, default: postgresql['checksum']