Merge pull request #922 from puppetlabs/CONT-1036_remove_validate_re

(cont-1036) remove validate_re depreciated function

Author: jordanbreen28

manifests/compose.pp

@@ -37,15 +37,11 @@
   Optional[String]               $version      = $docker::params::compose_version,
   Optional[String]               $install_path = $docker::params::compose_install_path,
   Optional[String]               $symlink_name = $docker::params::compose_symlink_name,
-  Optional[String]               $proxy        = undef,
+  Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']]    $proxy   = undef,
   Optional[String]               $base_url     = $docker::params::compose_base_url,
   Optional[String]               $raw_url      = undef,
   Optional[Boolean]              $curl_ensure  = $docker::params::curl_ensure,
 ) inherits docker::params {
-  if $proxy != undef {
-    validate_re($proxy, '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$')
-  }
-
   if $facts['os']['family'] == 'windows' {
     $file_extension = '.exe'
     $file_owner     = 'Administrator'

manifests/machine.pp

@@ -24,14 +24,10 @@
   Enum[present,absent]                                 $ensure       = 'present',
   Optional[String]                                     $version      = $docker::params::machine_version,
   Optional[String]                                     $install_path = $docker::params::machine_install_path,
-  Optional[String]                                     $proxy        = undef,
+  Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']]    $proxy   = undef,
   Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]] $url          = undef,
   Optional[Boolean]                                    $curl_ensure  = $docker::params::curl_ensure,
 ) inherits docker::params {
-  if $proxy != undef {
-    validate_re($proxy, '^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$')
-  }
-
   if $facts['os']['family'] == 'windows' {
     $file_extension = '.exe'
     $file_owner     = 'Administrator'

spec/classes/compose_spec.rb

@@ -73,15 +73,15 @@
             params
           end
 
-          if params['proxy'] != :undef && !%r{^((https?)?://)?([^:^@]+:[^:^@]+@|)([\da-z.-]+)\.([\da-z.]{2,6})(:\d)?([/\w .-]*)*/?$}.match?(params['proxy'])
-            it {
-              expect(subject).to compile.and_raise_error(%r{does not match})
-            }
-
-            next
+          if title == 'when proxy is not a http proxy'
+            it 'raises an error for invalid proxy URL' do
+              expect(subject).to compile.and_raise_error(
+                %r{parameter 'proxy' expects an undef value or a match for Pattern},
+              )
+            end
+          else
+            include_examples 'compose', params, facts
           end
-
-          include_examples 'compose', params, facts
         end
       end
     end

spec/classes/machine_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-
+# Need to write test casees here
 tests = {
   'with default value' => {}
 }
@@ -42,14 +42,17 @@
             params
           end
 
-          if params['proxy'] != :undef && !'^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$'.match?(params['proxy'])
-            it {
-              expect(subject).to compile.and_raise_error(%r{})
-            }
-
-            next
-          end
-
+          # Need to write check condition for params['proxy']
+          # The block commented below currently has no test case, if in future more test cases are added to this spec file, please refer to spec/classes/compose_spec.rb and implement as required here.
+          # if title == 'when proxy is not a http proxy'
+          #  it 'raises an error for invalid proxy URL' do
+          #    is_expected.to compile.and_raise_error(
+          #      %r{parameter 'proxy' expects an undef value or a match for Pattern},
+          #    )
+          #  end
+          # else
+          # include_examples 'machine', params, facts, defaults
+          # end
           include_examples 'machine', params, facts, defaults
         end
       end