Merge pull request #2 from orenmaor/ability-to-use-iam

Ability to use iam role

CHANGELOG.md

@@ -1,6 +1,9 @@
 Changes
 =======
 
+# 1.1.6 / 2017-02-22
+* Removed the requirement for `aws_access_key_id` and `aws_secret_access_key` attributes values.
+
 # 1.1.5 / 2017-01-31
 * Implementing a better way to handle AWS CloudWatch Logs configurations,
   now each log has a configuration file that is provisioned via Chef Resources.

README.md

@@ -9,7 +9,7 @@ Agent and deploy it's configurations automatically.
 
 Add this cookbook to your base recipe:
 ```ruby
-cookbook 'aws-cloudwatchlogs', '~> 1.1.5'
+cookbook 'aws-cloudwatchlogs', '~> 1.1.6'
 ```
 
 You need to configure the following node attributes via an `environment` or `role`:
@@ -47,6 +47,7 @@ default['aws_cwlogs']['log']['syslog'] = {
    'log_group_name' => '/var/log/syslog'
 }
 ```
+**Note**: If you do not specify aws credentials, it will attempt to use the AWS IAM Role assigned to the instance instead.
 
 Once you defined the attributes, you will need to reference `aws_cwlogs` resource in your recipe:
 ```ruby

metadata.rb

@@ -4,6 +4,6 @@
 license 'Apache 2.0'
 description 'Installs/Configures AWS CloudWatch Logs Agent'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.1.5'
+version '1.1.6'
 source_url 'https://github.com/amalucelli/chef-cloudwatchlogs' if respond_to? :source_url
 issues_url 'https://github.com/amalucelli/chef-cloudwatchlogs/issues' if respond_to? :issues_url

recipes/default.rb

@@ -22,16 +22,6 @@
    return
 end
 
-if node['aws_cwlogs']['aws_access_key_id'].nil?
-   log('AWS Access Key is necessary for this cookbook.') { level :error }
-   return
-end
-
-if node['aws_cwlogs']['aws_secret_access_key'].nil?
-   log('AWS Secret Access Key is necessary for this cookbook.') { level :error }
-   return
-end
-
 # only install if it isn't installed
 include_recipe 'aws-cloudwatchlogs::install' unless ::File.exist?(node['aws_cwlogs']['path'])
 # always reconfigure aws cloudwatch logs configuration files

templates/default/aws.conf.erb

@@ -2,5 +2,9 @@
 cwlogs = cwlogs
 [default]
 region = <%= @awsRegion %>
+<% if ! @awsAccessKey.nil? %>
 aws_access_key_id = <%= @awsAccessKey %>
+<% end %>
+<% if ! @awsSecretKey.nil? %>
 aws_secret_access_key = <%= @awsSecretKey %>
+<% end %>