Merge pull request #2 from rjd1/0.2.1

0.2.1: removal of private class params

.fixtures.yml

@@ -5,5 +5,5 @@ fixtures:
   forge_modules:
     kafka_connect:
        repo: "rjd1/kafka_connect"
-       ref: "0.2.0"
+       ref: "0.2.1"
     stdlib: "puppetlabs/stdlib"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Release notes for the rjd1-kafka_connect module.
 
+## Release 0.2.1
+
+2023-10-19 - removal of private class params
+
+* Removed private class parameters, replaced with direct scoping
+
 ## Release 0.2.0
 
 2023-10-18 - elimination of old dependency

manifests/manage_connectors.pp

@@ -2,45 +2,14 @@
 #
 # Private class to manage individual kafka-connect connectors.
 #
-# @param connectors_absent
-#   List of connectors to ensure absent.
-# @param connectors_paused
-#   List of connectors to ensure paused.
-# @param connector_config_dir
-#   Configuration directory for connector properties files.
-# @param owner
-#   Owner to set on connector and secret file permissions.
-# @param group
-#   Group to set on connector and secret file permissions.
-# @param hostname
-#   The hostname or IP of the KC service.
-# @param rest_port
-#   Port to connect to for the REST API.
-# @param enable_delete
-#   Enable delete of running connectors.
-#   Required for the provider to actually remove when set to absent.
-# @param restart_on_failed_state
-#   Allow the provider to auto restart on FAILED connector state.
-#
 # @author https://github.com/rjd1/puppet-kafka_connect/graphs/contributors
 #
 # @api private
 #
-class kafka_connect::manage_connectors (
-  Optional[Array] $connectors_absent       = $::kafka_connect::connectors_absent,
-  Optional[Array] $connectors_paused       = $::kafka_connect::connectors_paused,
-  String          $config_dir              = $::kafka_connect::connector_config_dir,
-  String          $owner                   = $::kafka_connect::owner,
-  String          $group                   = $::kafka_connect::group,
-  String          $hostname                = $::kafka_connect::hostname,
-  Integer         $rest_port               = $::kafka_connect::rest_port,
-  Boolean         $enable_delete           = $::kafka_connect::enable_delete,
-  Boolean         $restart_on_failed_state = $::kafka_connect::restart_on_failed_state,
-) {
-
+class kafka_connect::manage_connectors {
   assert_private()
 
-  ensure_resource('file', $config_dir, {'ensure' => 'directory'})
+  ensure_resource('file', $kafka_connect::connector_config_dir, {'ensure' => 'directory'})
 
   $connectors_data = lookup(kafka_connect::connectors, Optional[Hash[String[1],Any]], deep, undef)
 
@@ -56,35 +25,35 @@
         config => $connector_config
       }
 
-      if ($connectors_absent and $connector_name in $connectors_absent) {
+      if ($kafka_connect::connectors_absent and $connector_name in $kafka_connect::connectors_absent) {
         $connector_ensure = 'absent'
       } else {
         $connector_ensure = 'present'
       }
 
-      if ($connectors_paused and $connector_name in $connectors_paused) {
-        $conn_state_ensure = 'PAUSED'
+      if ($kafka_connect::connectors_paused and $connector_name in $kafka_connect::connectors_paused) {
+        $connector_state_ensure = 'PAUSED'
       } else {
-        $conn_state_ensure = undef
+        $connector_state_ensure = undef
       }
 
-      file { "${config_dir}/${connector_file_name}" :
+      file { "${kafka_connect::connector_config_dir}/${connector_file_name}" :
         ensure  => $connector_ensure,
-        owner   => $owner,
-        group   => $group,
+        owner   => $kafka_connect::owner,
+        group   => $kafka_connect::group,
         mode    => '0640',
         content => to_json($connector_full_config),
         before  => Manage_connector[$connector_name],
       }
 
       manage_connector { $connector_name :
         ensure                  => $connector_ensure,
-        config_file             => "${config_dir}/${connector_file_name}",
-        connector_state_ensure  => $conn_state_ensure,
-        hostname                => $hostname,
-        port                    => $rest_port,
-        enable_delete           => $enable_delete,
-        restart_on_failed_state => $restart_on_failed_state,
+        config_file             => "${kafka_connect::connector_config_dir}/${connector_file_name}",
+        connector_state_ensure  => $connector_state_ensure,
+        hostname                => $kafka_connect::hostname,
+        port                    => $kafka_connect::rest_port,
+        enable_delete           => $kafka_connect::enable_delete,
+        restart_on_failed_state => $kafka_connect::restart_on_failed_state,
       }
 
     }
@@ -104,10 +73,10 @@
 
       file { $secret_file_name :
         ensure  => 'present',
-        path    => "${config_dir}/${secret_file_name}",
+        path    => "${kafka_connect::connector_config_dir}/${secret_file_name}",
         content => $secret_content,
-        owner   => $owner,
-        group   => $group,
+        owner   => $kafka_connect::owner,
+        group   => $kafka_connect::group,
         mode    => '0600',
         notify  => Manage_connector[$secret_connectors],
       }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "rjd1-kafka_connect",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "rjd1",
   "summary": "Module to manage Kafka Connect",
   "license": "Apache-2.0",