(SIMP-6270) Updating bracketize function (#32)

* (SIMP-6270) Updating bracketize function

* fixed bad regex in template, and made test

* updated tests

* Add bug fix note

CHANGELOG

@@ -1,3 +1,8 @@
+* Fri Mar 22 2019 Joseph Sharkey <[email protected]> - 6.1.2-0
+- Use simplib::bracketize in lieu of deprecated Puppet 3 bracketize
+- Fix template bug that prevented some IPv6 addresses from being
+  properly formatted in /etc/hosts.allow.
+
 * Tue Mar 19 2019 Liz Nemsick <[email protected]> - 6.1.2-0
 - Use simplib::nets2ddq in lieu of deprecated Puppet 3 nets2ddq
 

metadata.json

@@ -21,8 +21,8 @@
       "version_requirement": ">= 2.2.0 < 6.0.0"
     },
     {
-      "name": "simp-simplib",
-      "version_requirement": ">= 3.8.0 < 4.0.0"
+      "name": "simp/simplib",
+      "version_requirement": ">= 3.15.0 < 4.0.0"
     }
   ],
   "requirements": [

spec/defines/allow_spec.rb

@@ -7,6 +7,27 @@
         let(:title) { 'foo_bar' }
         let(:params) { {:pattern => 'localhost'} }
         it { is_expected.to contain_concat__fragment("tcpwrappers_#{title}") }
+
+        context 'with ipv6' do 
+          let(:title) { 'foo_bar' }
+          let(:params) { { :pattern => '2001:0db8:85a3:0000:0000:8a2e:0370:7334' } }
+          it { is_expected.to contain_concat__fragment("tcpwrappers_#{title}")\
+            .with_content(/\[2001:0db8:85a3:0000:0000:8a2e:0370:7334\]/) }
+        end
+
+        context 'with ipv6 cidr' do 
+          let(:title) { 'foo_bar' }
+          let(:params) { { :pattern => '2001:0db8:85a3:0000:0000:8a2e:0370:7334/64' } }
+          it { is_expected.to contain_concat__fragment("tcpwrappers_#{title}")\
+            .with_content(/\[2001:0db8:85a3:0000:0000:8a2e:0370:7334\]\/64/) }
+        end
+
+        context 'with triggered nets2ddq' do 
+          let(:title) { 'foo_bar' }
+          let(:params) { { :pattern => 'localhost myhost 129.3.0.1 2001:0db8:85a3:0000:0000:8a2e:0370:7334 2001:0db8:85a3:0000:0000:8a2e:0370:7334/64 234.216.15.14/16' } }
+          it { is_expected.to contain_concat__fragment("tcpwrappers_#{title}")\
+            .with_content(/localhost,myhost,129.3.0.1,\[2001:0db8:85a3:0000:0000:8a2e:0370:7334\],\[2001:0db8:85a3:0000:0000:8a2e:0370:7334\]\/64,234.216.0.0\/255.255.0.0/) }
+        end
       end
     end
   end

templates/tcpwrappers.allow.erb

@@ -1,17 +1,12 @@
 <%
-
 lpattern = Array.new
-
 Array(@pattern).flatten.each do |ptn|
   if ptn == 'any'
     lpattern.push('ALL')
-  elsif ptn !~ /[[:alpha:]]/
-    lpattern.push(scope.function_bracketize([scope.call_function('simplib::nets2ddq', [ptn])]))
   else
-    lpattern.push(ptn)
+    lpattern.push(scope.call_function('simplib::bracketize',[scope.call_function('simplib::nets2ddq', [ptn])]))
   end
 end
-
 if @svc
   _name = @svc
 else