Merge pull request #327 from voxpupuli/modulesync

bastelfreak · web-flow · commit a7bd41997521 · 2020-08-16T16:52:00.000+02:00
modulesync 3.0.0
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -33,6 +33,8 @@ By participating in this project you agree to abide by its terms.
 
 Please be prepared to repeat some of these steps as our contributors review your code.
 
+Also consider sending in your profile code that calls this component module as an acceptance test or provide it via an issue. This helps reviewers a lot to test your use case and prevents future regressions!
+
 ## Writing proper commits - short version
 
 * Make commits of logical units.
diff --git a/.msync.yml b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.12.0'
+modulesync_config_version: '3.0.0'
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -152,7 +152,7 @@ Style/Attr:
   Enabled: True
 
 Style/BracesAroundHashParameters:
-  Enabled: True
+  Enabled: False
 
 Style/CaseEquality:
   Enabled: True
@@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # this is broken on ruby1.9
 Layout/IndentHeredoc:
   Enabled: False
diff --git a/Gemfile b/Gemfile
@@ -11,9 +11,9 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.4.0',  :require => false
-  gem 'coveralls',                   :require => false
-  gem 'simplecov-console',           :require => false
+  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'coveralls',                 :require => false
+  gem 'simplecov-console',         :require => false
 end
 
 group :development do
diff --git a/examples/jira_mysql_install.pp b/examples/jira_mysql_install.pp
@@ -1,5 +1,4 @@
 node default {
-
   class { 'mysql::server':
     root_password    => 'strongpassword',
   }
@@ -20,5 +19,4 @@
   }
 
   include jira::facts
-
 }
diff --git a/examples/jira_mysql_nativessl_install.pp b/examples/jira_mysql_nativessl_install.pp
@@ -1,5 +1,4 @@
 node default {
-
   $cert = hiera('cert')
   $key = hiera('key')
 
@@ -57,5 +56,4 @@
   }
 
   include jira::facts
-
 }
diff --git a/examples/jira_postgres_install.pp b/examples/jira_postgres_install.pp
@@ -1,5 +1,4 @@
 node default {
-
   class { 'postgresql::globals':
     manage_package_repo => true,
     version             => '9.3',
@@ -17,5 +16,4 @@
   }
 
   include jira::facts
-
 }
diff --git a/examples/jira_postgres_nginx_install.pp b/examples/jira_postgres_nginx_install.pp
@@ -1,5 +1,4 @@
 node default {
-
   class { 'nginx': }
 
   -> class { 'postgresql::globals':
@@ -27,12 +26,12 @@
 
   nginx::resource::upstream { 'jira':
     ensure  => present,
-    members => [ 'localhost:8080' ],
+    members => ['localhost:8080'],
   }
 
   nginx::resource::vhost { 'jira_vhost':
     ensure               => present,
-    server_name          => [ $facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname'] ],
+    server_name          => [$facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname']],
     listen_port          => '80',
     proxy                => 'http://jira',
     proxy_read_timeout   => '300',
@@ -44,5 +43,4 @@
       'proxy_redirect'                      => 'off',
     },
   }
-
 }
diff --git a/examples/jira_postgres_nginx_ssl_install.pp b/examples/jira_postgres_nginx_ssl_install.pp
@@ -1,5 +1,4 @@
 node default {
-
   class { 'nginx': }
 
   -> class { 'postgresql::globals':
@@ -27,12 +26,12 @@
 
   nginx::resource::upstream { 'jira':
     ensure  => present,
-    members => [ 'localhost:8080' ],
+    members => ['localhost:8080'],
   }
 
   nginx::resource::vhost { 'jira_vhost':
     ensure               => present,
-    server_name          => [ $facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname'] ],
+    server_name          => [$facts['networking']['ip'], $facts['networking']['fqdn'], $facts['networking']['hostname']],
     proxy                => 'http://jira',
     proxy_read_timeout   => '300',
     rewrite_to_https     => true,
@@ -47,5 +46,4 @@
       'proxy_redirect'                      => 'off',
     },
   }
-
 }
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -14,7 +14,6 @@
 #   limitations under the License.
 # -----------------------------------------------------------------------------
 class jira::config inherits jira {
-
   File {
     owner => $jira::user,
     group => $jira::group,
@@ -59,7 +58,7 @@
   -> file { "${jira::homedir}/dbconfig.xml":
     content => template("jira/dbconfig.${jira::db}.xml.erb"),
     mode    => '0600',
-    require => [ Class['jira::install'],File[$jira::homedir] ],
+    require => [Class['jira::install'],File[$jira::homedir]],
     notify  => Class['jira::service'],
   }
 
@@ -91,17 +90,16 @@
   file { "${jira::homedir}/jira-config.properties":
     content => template('jira/jira-config.properties.erb'),
     mode    => '0600',
-    require => [ Class['jira::install'],File[$jira::homedir] ],
+    require => [Class['jira::install'],File[$jira::homedir]],
     notify  => Class['jira::service'],
   }
 
   if $jira::datacenter {
     file { "${jira::homedir}/cluster.properties":
       content => template('jira/cluster.properties.erb'),
       mode    => '0600',
-      require => [ Class['jira::install'],File[$jira::homedir] ],
+      require => [Class['jira::install'],File[$jira::homedir]],
       notify  => Class['jira::service'],
     }
   }
-
 }
diff --git a/manifests/facts.pp b/manifests/facts.pp
@@ -26,7 +26,6 @@
   },
   # lint:endignore
 ) inherits jira::params {
-
   # Puppet Enterprise supplies its own ruby version if your using it.
   # A modern ruby version is required to run the executable fact
   if $facts['puppetversion'] =~ /Puppet Enterprise/ {
@@ -60,5 +59,4 @@
     content => template('jira/facts.rb.erb'),
     mode    => '0500',
   }
-
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -157,14 +157,13 @@
   Integer $session_validationinterval                               = 5,
   String $session_lastvalidation                                    = 'session.lastvalidation',
 ) inherits jira::params {
-
   if $datacenter and !$shared_homedir {
     fail("\$shared_homedir must be set when \$datacenter is true")
   }
 
   if $tomcat_redirect_https_port {
     unless ($tomcat_native_ssl) {
-        fail('You need to set native_ssl to true when using tomcat_redirect_https_port')
+      fail('You need to set native_ssl to true when using tomcat_redirect_https_port')
     }
   }
 
@@ -263,7 +262,7 @@
     }
   }
 
-  $merged_jira_config_properties = merge({'jira.websudo.is.disabled' => !$enable_secure_admin_sessions}, $jira_config_properties)
+  $merged_jira_config_properties = merge( { 'jira.websudo.is.disabled' => !$enable_secure_admin_sessions }, $jira_config_properties)
 
   if $javahome == undef {
     fail('You need to specify a value for javahome')
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -14,7 +14,6 @@
 #   limitations under the License.
 # -----------------------------------------------------------------------------
 class jira::install {
-
   include 'archive'
 
   if $jira::manage_user {
@@ -32,7 +31,6 @@
       managehome       => true,
       uid              => $jira::uid,
       gid              => $jira::gid,
-
     }
   }
 
@@ -94,7 +92,7 @@
         require => [
           File[$jira::installdir],
           User[$jira::user],
-          File[$jira::extractdir] ],
+        File[$jira::extractdir]],
       }
     }
     'archive': {
diff --git a/manifests/mysql_connector.pp b/manifests/mysql_connector.pp
@@ -6,7 +6,6 @@
   $installdir   = $jira::mysql_connector_install,
   $download_url = $jira::mysql_connector_url,
 ) {
-
   require staging
 
   $file = "${product}-${version}.${format}"
@@ -34,5 +33,4 @@
     ensure => link,
     target => "${installdir}/${product}-${version}/${product}-${version}-bin.jar",
   }
-
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -3,47 +3,46 @@
 # Defines default values for jira module
 #
 class jira::params {
-
-  Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ] }
+  Exec { path => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] }
 
   case $facts['os']['family'] {
     /RedHat/: {
       if $facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =='2018' {
-        $json_packages         = [ 'rubygem-json' ]
+        $json_packages         = ['rubygem-json']
         $service_file_location = '/etc/init.d/jira'
         $service_file_template = 'jira/jira.initscript.erb'
         $service_file_mode     = '0755'
         $service_lockfile      = '/var/lock/subsys/jira'
         $service_provider      = undef
       } elsif versioncmp($facts['os']['release']['major'], '7') >= 0 {
-        $json_packages         = [ 'rubygem-json' ]
+        $json_packages         = ['rubygem-json']
         $service_file_location = '/usr/lib/systemd/system/jira.service'
         $service_file_template = 'jira/jira.service.erb'
         $service_file_mode     = '0644'
         $service_lockfile      = '/var/lock/subsys/jira'
         $service_provider      = 'systemd'
       } elsif versioncmp($facts['os']['release']['major'], '6') >= 0 {
-        $json_packages         = [ 'rubygem-json', 'ruby-json' ]
+        $json_packages         = ['rubygem-json', 'ruby-json']
         $service_file_location = '/etc/init.d/jira'
         $service_file_template = 'jira/jira.initscript.erb'
         $service_file_mode     = '0755'
         $service_lockfile      = '/var/lock/subsys/jira'
         $service_provider      = undef
       } else {
-        fail("\"${module_name}\" provides no service parameters
+      fail("\"${module_name}\" provides no service parameters
             for \"${facts['os']['family']}\" - \"${$facts['os']['release']['major']}\"")
       }
     }
     /Debian/: {
-      $json_packages         = [ 'ruby-json' ]
+      $json_packages         = ['ruby-json']
       $service_file_location = '/lib/systemd/system/jira.service'
       $service_file_template = 'jira/jira.service.erb'
       $service_file_mode     = '0644'
       $service_lockfile      = '/var/lock/subsys/jira'
       $service_provider      = 'systemd'
     }
     default: {
-      $json_packages         = [ 'rubygem-json', 'ruby-json' ]
+      $json_packages         = ['rubygem-json', 'ruby-json']
       $service_file_location = '/etc/init.d/jira'
       $service_file_template = 'jira/jira.initscript.erb'
       $service_file_mode     = '0755'
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #-----------------------------------------------------------------------------
-class jira::service(
+class jira::service (
 
   Boolean $service_manage = $jira::service_manage,
   String $service_ensure  = $jira::service_ensure,
@@ -27,7 +27,6 @@
   $service_provider       = $jira::params::service_provider,
 
 ) inherits jira::params {
-
   file { $service_file_location:
     content => template($service_file_template),
     mode    => $service_file_mode,
diff --git a/manifests/sso.pp b/manifests/sso.pp
@@ -2,7 +2,7 @@
 #
 # Install confluence SSO via crowd, See README.md for more.
 #
-class jira::sso(
+class jira::sso (
   $application_name                                                 = $jira::application_name,
   $application_password                                             = $jira::application_password,
   Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl] $application_login_url = $jira::application_login_url,
@@ -13,9 +13,8 @@
   $session_validationinterval                                       = $jira::session_validationinterval,
   $session_lastvalidation                                           = $jira::session_lastvalidation,
 ) {
-
   file { "${jira::webappdir}/atlassian-jira/WEB-INF/classes/crowd.properties":
-    ensure  => present,
+    ensure  => file,
     content => template('jira/crowd.properties'),
     mode    => '0660',
     owner   => $jira::user,
diff --git a/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml b/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
diff --git a/spec/acceptance/nodesets/ec2/image_templates.yaml b/spec/acceptance/nodesets/ec2/image_templates.yaml
diff --git a/spec/acceptance/nodesets/ec2/rhel-73-x64.yml b/spec/acceptance/nodesets/ec2/rhel-73-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml b/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml b/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml b/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-modulesync_config_version: '2.12.0'`
	`1`	`+modulesync_config_version: '3.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`node default {`
`2`		`-`
`3`	`2`	`class { 'mysql::server':`
`4`	`3`	`root_password => 'strongpassword',`
`5`	`4`	`}`
`@@ -20,5 +19,4 @@`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`include jira::facts`
`23`		`-`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`node default {`
`2`		`-`
`3`	`2`	`$cert = hiera('cert')`
`4`	`3`	`$key = hiera('key')`
`5`	`4`
`@@ -57,5 +56,4 @@`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`include jira::facts`
`60`		`-`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`node default {`
`2`		`-`
`3`	`2`	`class { 'postgresql::globals':`
`4`	`3`	`manage_package_repo => true,`
`5`	`4`	`version => '9.3',`
`@@ -17,5 +16,4 @@`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`include jira::facts`
`20`		`-`
`21`	`19`	`}`