Mirror url custom port

manifests/broker.pp

@@ -67,7 +67,7 @@
 ) inherits kafka::params {
 
   validate_re($::osfamily, 'RedHat|Debian\b', "${::operatingsystem} not supported")
-  validate_re($mirror_url, '^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})(:[\d]{2,5})?([\/\w \.-]*)*\/?$', "${mirror_url} is not a valid url")
+  validate_re($mirror_url, $kafka::params::mirror_url_regex, "${mirror_url} is not a valid url")
   validate_hash($config)
   validate_bool($install_java)
   validate_absolute_path($package_dir)

manifests/consumer.pp

@@ -62,7 +62,7 @@
 ) inherits kafka::params {
 
   validate_re($::osfamily, 'RedHat|Debian\b', "${::operatingsystem} not supported")
-  validate_re($mirror_url, '^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$', "${mirror_url} is not a valid url")
+  validate_re($mirror_url, $kafka::params::mirror_url_regex, "${mirror_url} is not a valid url")
   validate_bool($install_java)
   validate_absolute_path($package_dir)
   validate_bool($service_restart)

manifests/mirror.pp

@@ -84,7 +84,7 @@
 ) inherits kafka::params {
 
   validate_re($::osfamily, 'RedHat|Debian\b', "${::operatingsystem} not supported")
-  validate_re($mirror_url, '^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$', "${mirror_url} is not a valid url")
+  validate_re($mirror_url, $kafka::params::mirror_url_regex, "${mirror_url} is not a valid url")
   validate_integer($num_streams)
   validate_integer($num_producers)
   validate_bool($abort_on_send_failure)

manifests/params.pp

@@ -355,4 +355,6 @@
     'topic'                      => '',
     'value-serializer'           => 'kafka.serializer.DefaultEncoder',
   }
+
+  $mirror_url_regex = '^(https?:\/\/)([\da-z\.-]+)\.([a-z\.]{2,6})(:[\d]{2,5})?(\/[\w \.-]*)*\/?$'
 }

manifests/producer.pp

@@ -64,7 +64,7 @@
 ) inherits kafka::params {
 
   validate_re($::osfamily, 'RedHat|Debian\b', "${::operatingsystem} not supported")
-  validate_re($mirror_url, '^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$', "${mirror_url} is not a valid url")
+  validate_re($mirror_url, $kafka::params::mirror_url_regex, "${mirror_url} is not a valid url")
   validate_bool($install_java)
   validate_absolute_path($package_dir)
   validate_bool($service_restart)

spec/classes/broker_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples_param_validation'
 
 describe 'kafka::broker', type: :class do
   let :facts do
@@ -11,14 +12,18 @@
       service_provider: 'upstart'
     }
   end
-  let :params do
+  let :common_params do
     {
       config: {
         'zookeeper.connect' => 'localhost:2181'
       }
     }
   end
 
+  let :params do
+    common_params
+  end
+
   it { is_expected.to contain_class('kafka::broker::install').that_comes_before('Class[kafka::broker::config]') }
   it { is_expected.to contain_class('kafka::broker::config').that_comes_before('Class[kafka::broker::service]') }
   it { is_expected.to contain_class('kafka::broker::service').that_comes_before('Class[kafka::broker]') }
@@ -40,12 +45,7 @@
     describe 'kafka::broker::service' do
       context 'service_install false' do
         let :params do
-          {
-            config: {
-              'zookeeper.connect' => 'localhost:2181'
-            },
-            service_install: false
-          }
+          common_params.merge(service_install: false)
         end
         it { is_expected.not_to contain_file('kafka.service') }
 
@@ -87,12 +87,7 @@
     describe 'kafka::broker::service' do
       context 'service_install false' do
         let :params do
-          {
-            config: {
-              'zookeeper.connect' => 'localhost:2181'
-            },
-            service_install: false
-          }
+          common_params.merge(service_install: false)
         end
         it { is_expected.not_to contain_file('kafka.service') }
 
@@ -134,4 +129,6 @@
       end
     end
   end
+
+  it_validates_parameter 'mirror_url'
 end

spec/classes/consumer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples_param_validation'
 
 describe 'kafka::consumer', type: :class do
   let :facts do
@@ -12,7 +13,7 @@
     }
   end
 
-  let :params do
+  let :common_params do
     {
       service_config: {
         'topic'     => 'demo',
@@ -21,6 +22,10 @@
     }
   end
 
+  let :params do
+    common_params
+  end
+
   it { is_expected.to contain_class('kafka::consumer::install').that_comes_before('Class[kafka::consumer::service]') }
   it { is_expected.to contain_class('kafka::consumer::service').that_comes_before('Class[kafka::consumer]') }
   it { is_expected.to contain_class('kafka::consumer') }
@@ -77,31 +82,21 @@
 
       context 'service_requires_zookeeper disabled' do
         let :params do
-          {
-            service_requires_zookeeper: false,
-            service_config: {
-              'topic'     => 'demo',
-              'zookeeper' => 'localhost:2181'
-            }
-          }
+          common_params.merge(service_requires_zookeeper: false)
         end
 
         it { should_not contain_file('kafka-consumer.service').with_content %r{^Requires=zookeeper.service$} }
       end
 
       context 'service_requires_zookeeper enabled' do
         let :params do
-          {
-            service_requires_zookeeper: true,
-            service_config: {
-              'topic'     => 'demo',
-              'zookeeper' => 'localhost:2181'
-            }
-          }
+          common_params.merge(service_requires_zookeeper: true)
         end
 
         it { should contain_file('kafka-consumer.service').with_content %r{^Requires=zookeeper.service$} }
       end
     end
   end
+
+  it_validates_parameter 'mirror_url'
 end

spec/classes/mirror_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples_param_validation'
 
 describe 'kafka::mirror', type: :class do
   let :facts do
@@ -12,7 +13,7 @@
     }
   end
 
-  let :params do
+  let :common_params do
     {
       consumer_config: {
         'group.id'          => 'kafka-mirror',
@@ -24,6 +25,10 @@
     }
   end
 
+  let :params do
+    common_params
+  end
+
   it { is_expected.to contain_class('kafka::mirror::install').that_comes_before('Class[kafka::mirror::config]') }
   it { is_expected.to contain_class('kafka::mirror::config').that_comes_before('Class[kafka::mirror::service]') }
   it { is_expected.to contain_class('kafka::mirror::service').that_comes_before('Class[kafka::mirror]') }
@@ -93,37 +98,21 @@
 
       context 'service_requires_zookeeper disabled' do
         let :params do
-          {
-            service_requires_zookeeper: false,
-            consumer_config: {
-              'group.id'          => 'kafka-mirror',
-              'zookeeper.connect' => 'localhost:2181'
-            },
-            producer_config: {
-              'bootstrap.servers' => 'localhost:9092'
-            }
-          }
+          common_params.merge(service_requires_zookeeper: false)
         end
 
         it { should_not contain_file('kafka-mirror.service').with_content %r{^Requires=zookeeper.service$} }
       end
 
       context 'service_requires_zookeeper enabled' do
         let :params do
-          {
-            service_requires_zookeeper: true,
-            consumer_config: {
-              'group.id'          => 'kafka-mirror',
-              'zookeeper.connect' => 'localhost:2181'
-            },
-            producer_config: {
-              'bootstrap.servers' => 'localhost:9092'
-            }
-          }
+          common_params.merge(service_requires_zookeeper: true)
         end
 
         it { should contain_file('kafka-mirror.service').with_content %r{^Requires=zookeeper.service$} }
       end
     end
   end
+
+  it_validates_parameter 'mirror_url'
 end

spec/classes/producer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'shared_examples_param_validation'
 
 describe 'kafka::producer', type: :class do
   let :facts do
@@ -11,7 +12,7 @@
       service_provider: 'upstart'
     }
   end
-  let :params do
+  let :common_params do
     {
       service_config: {
         'broker-list' => 'localhost:9092',
@@ -21,6 +22,10 @@
     }
   end
 
+  let :params do
+    common_params
+  end
+
   it { is_expected.to contain_class('kafka::producer::install').that_comes_before('Class[kafka::producer::config]') }
   it { is_expected.to contain_class('kafka::producer::config').that_comes_before('Class[kafka::producer::service]') }
   it { is_expected.to contain_class('kafka::producer::service').that_comes_before('Class[kafka::producer]') }
@@ -67,4 +72,6 @@
       end
     end
   end
+
+  it_validates_parameter 'mirror_url'
 end

spec/shared_examples_param_validation.rb

@@ -0,0 +1,67 @@
+
+RSpec.configure do |c|
+  c.alias_it_should_behave_like_to :it_validates_parameter, 'validates parameter:'
+end
+
+shared_examples 'mirror_url' do
+  domain_names = {
+    'foobar.com'  => true,
+    'foo.bar.com' => true,
+    '999.bar.com' => true,
+    'foo-bar.com' => true,
+    'no-tld'      => false,
+    'foo.longtld' => false
+  }
+
+  prefixes = {
+    'http://'   => true,
+    'https://'  => true,
+    'random://' => false
+  }
+
+  paths = {
+    ''                      => true,
+    '/'                     => true,
+    '/package'              => true,
+    '/package/'             => true,
+    '/another/package'      => true,
+    '/yet/another/package/' => true
+  }
+
+  ports = {
+    ''        => true,
+    ':9'      => false,
+    ':10'     => true,
+    ':99999'  => true,
+    ':100000' => false
+  }
+
+  prefixes.each do |prefix, valid_prefix|
+    context "with prefix <#{prefix}>" do
+      domain_names.each do |domain_name, valid_domain|
+        context "with domain name <#{domain_name}>" do
+          paths.each do |path, valid_path|
+            context "with path <#{path}>" do
+              ports.each do |port, valid_port|
+                context "with port <#{port}>" do
+                  mirror_url = "#{prefix}#{domain_name}#{port}#{path}"
+                  context "URL => <#{mirror_url}>" do
+                    let :params do
+                      common_params.merge(mirror_url: mirror_url)
+                    end
+
+                    if valid_domain && valid_prefix && valid_path && valid_port
+                      it { is_expected.to compile }
+                    else
+                      it { expect { is_expected.to compile }.to raise_error(%r{#{mirror_url} is not a valid url}) }
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end