Added API parameters for user and password

lib/puppet/provider/sensu_api_config/json.rb

@@ -32,6 +32,8 @@ def create
     conf['api'] = {}
     self.port = resource[:port]
     self.host = resource[:host]
+    self.user = resource[:user] unless resource[:user].nil?
+    self.password = resource[:password] unless resource[:password].nil?
   end
 
   # Public: Remove the API configuration section.
@@ -75,4 +77,33 @@ def host
   def host=(value)
     conf['api']['host'] = value
   end
+
+  # Public: Retrieve the api username
+  #
+  # Returns the String hostname.
+  def user
+    conf['api']['user']
+  end
+
+  # Public: Set the api user
+  #
+  # Returns nothing.
+  def user=(value)
+    conf['api']['user'] = value
+  end
+
+  # Public: Retrieve the password for the api
+  #
+  # Returns the String password.
+  def password
+    conf['api']['password']
+  end
+
+  # Public: Set the api password
+  #
+  # Returns nothing.
+  def password=(value)
+    conf['api']['password'] = value
+  end
+
 end

lib/puppet/type/sensu_api_config.rb

@@ -38,6 +38,14 @@ def initialize(*args)
     defaultto 'localhost'
   end
 
+  newproperty(:user) do
+    desc "The username used for clients to authenticate against the Sensu API"
+  end
+
+  newproperty(:password) do
+    desc "The password use for client authentication against the Sensu API"
+  end
+
   autorequire(:package) do
     ['sensu']
   end

manifests/api/config.pp

@@ -18,13 +18,15 @@
     ensure  => $ensure,
     owner   => 'sensu',
     group   => 'sensu',
-    mode    => '0444',
+    mode    => '0440',
   }
 
   sensu_api_config { $::fqdn:
-    ensure  => $ensure,
-    host    => $sensu::api_host,
-    port    => $sensu::api_port,
+    ensure   => $ensure,
+    host     => $sensu::api_host,
+    port     => $sensu::api_port,
+    user     => $sensu::api_user,
+    password => $sensu::api_password,
   }
 
 }

manifests/init.pp

@@ -91,9 +91,17 @@
 #   Default: localhost
 #
 # [*api_port*]
-#   Integer.  Port of the sensu api service
+#   Integer. Port of the sensu api service
 #   Default: 4567
 #
+# [*api_user*]
+#   String.  Password of the sensu api service
+#   Default: undef
+#
+# [*api_password*]
+#   Integer. Password of the sensu api service
+#   Default: undef
+#
 # [*dashboard_host*]
 #   String.  Hostname of the dahsboard host
 #   Default: $::ipaddress
@@ -175,6 +183,8 @@
   $redis_port               = 6379,
   $api_host                 = 'localhost',
   $api_port                 = 4567,
+  $api_user                 = undef,
+  $api_password             = undef,
   $dashboard_host           = $::ipaddress,
   $dashboard_port           = 8080,
   $dashboard_user           = 'admin',

spec/classes/sensu_api_spec.rb

@@ -56,6 +56,8 @@
           :host   => 'localhost',
           :port   => 4567
         ) }
+        it { should contain_sensu_api_config('testhost.domain.com').without_api_user }
+        it { should contain_sensu_api_config('testhost.domain.com').without_api_password }
       end # defaults
 
       context 'set config params' do
@@ -69,6 +71,25 @@
           :host   => 'sensuapi.domain.com',
           :port   => 5678
         ) }
+        it { should contain_sensu_api_config('testhost.domain.com').without_api_user }
+        it { should contain_sensu_api_config('testhost.domain.com').without_api_password }
+      end # set config params
+
+      context 'set config params including authentication' do
+        let(:params) { {
+          :api          => true,
+          :api_host     => 'sensuapi.domain.com',
+          :api_port     => 5678,
+          :api_user     => 'test_user',
+          :api_password => 'test_password'
+        } }
+        it { should contain_sensu_api_config('testhost.domain.com').with(
+          :ensure   => 'present',
+          :host     => 'sensuapi.domain.com',
+          :port     => 5678,
+          :user     => 'test_user',
+          :password => 'test_password'
+        ) }
       end # set config params
 
       context 'purge config' do