aws_log_cleaner 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e2389006bc57357e377983859742cbc22cf614
-  data.tar.gz: b16f3d00ad984644d75e1d2f5ce7feacfd6b9812
+  metadata.gz: 930d1449b8c7ba7ec0ec21761574836bf9ea3154
+  data.tar.gz: 79fe79bff4d046ebee699b745c0c94d46f899814
 SHA512:
-  metadata.gz: 4fd78ad333f4748349f7d2bfaf532b9a1fcce5dec84bc77a4202e0aa700b5c28b3b6a5072cb8ecd9e551742017ff92da9ab39c6d7b7243b34b85450cc83352f1
-  data.tar.gz: bd455736d9d2629f4faf02dce2fbf271675bcffd55957803709532990ea2c61277984848d21ca4be19041d26b35057e631119be98281fe812f928db8bb60afc8
+  metadata.gz: 76ea2614ada694c445e8aa976fc7daa9ddfc6a06267f19e3021d23abd3de801ce5eafffc63d8bd311a442b9342e889e75a1f0ae38ee6eb0d06e254361f2e787b
+  data.tar.gz: e458dbc7b89fe8dfdf02e70bb4b4e25399e3c76f2763d9aa43606599d238a4bc55a9522f79b62c1d1b9e81e0b0b6790cc87a86fe15fadc68c0fa58a2db7094b1

data/.travis.yml

@@ -1,11 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-- 2.1.6
-before_install: gem install bundler -v 1.14.6
+  - 2.1.6
+before_install: 
+  - gem install bundler -v 1.14.6
 os:
-- linux
-- osx
+  - linux
+  - osx
 deploy:
   provider: rubygems
   api_key:

data/bin/aws_log_cleaner

@@ -9,13 +9,14 @@ USAGE = <<ENDUSAGE.freeze
 ENDUSAGE
 
 HELP = <<ENDHELP.freeze
-   -h, --help       Show this help.
-   -p, --plan       Runs the plan command.
-   -a, --apply      Applys the deletion. Preview what will be deleted with [-p]
-   -l, --like       The search term returned logs should contain.
-   -r, --region     The region to run in.
-   -k, --access_key The access key to use for AWS.
-   -s, --secret     The secret to use for AWS.
+   -h,  --help       Show this help.
+   -p,  --plan       Runs the plan command.
+   -a,  --apply      Applys the deletion. Preview what will be deleted with [-p]
+   -l,  --like       The search term returned logs should contain.
+   -r,  --region     The region to run in.
+   -k,  --access_key The access key to use for AWS.
+   -s,  --secret     The secret to use for AWS.
+   -P,  --profile    The profile to use for AWS Credentials.
 ENDHELP
 
 args = { region: nil, access_key: nil, secret: nil }
@@ -30,6 +31,7 @@ ARGV.each do |arg|
   when '-r', '--region'     then next_arg         = :region
   when '-k', '--access_key' then next_arg         = :access_key
   when '-s', '--secret'     then next_arg         = :secret
+  when '-P', '--profile'    then next_arg         = :profile
   else
     if next_arg
       args[next_arg] = arg
@@ -47,8 +49,24 @@ end
 
 like = args[:like].nil? ? '' : args[:like].downcase
 
+credentials_args = 
+  if args[:access_key] && args[:secret]
+    {
+      access_key: args[:access_key],
+      secret: args[:secret]
+    }
+  elsif args[:profile]
+    {
+      profile: args[:profile]
+    }
+  else 
+    nil
+  end
+
+credentials_args[:region] = args[:region] unless args[:region].nil? 
+
 log_cleaner = \
-  AwsLogCleaner::AwsLogCleaner.new(args[:access_key], args[:secret], args[:region])
+  AwsLogCleaner::AwsLogCleaner.new(credentials_args)
 
 if args[:plan]
   puts "== PLAN MODE ==\n\n"

data/lib/aws_log_cleaner/aws_credentials.rb

@@ -9,17 +9,60 @@ module AwsLogCleaner
 
     attr_reader :credentials, :region
 
-    def initialize(access_key = nil, secret = nil, region = nil)
-      key_id = access_key || ENV['AWS_ACCESS_KEY_ID']
-      secret = secret || ENV['AWS_SECRET_ACCESS_KEY']
-      @region = region || ENV['AWS_DEFAULT_REGION']
+    def initialize(credential_args = nil)      
+      key_id, secret, profile, region = parse_credential_arguments(credential_args)
 
+      set_credentials(key_id, secret, profile, region)
+
+      return @credentials
+    end
+
+    private
+
+    def raise_credentials_error
+      raise "Could not load credentials."
+    end
+
+    def parse_credential_arguments(credential_args)
+      if credential_args.nil?
+        key_id  = ENV['AWS_ACCESS_KEY_ID']
+        secret  = ENV['AWS_SECRET_ACCESS_KEY']
+        region = ENV['AWS_REGION']
+      else
+        if credential_args[:profile] \
+          && (credential_args[:access_key] || credential_args[:secret] )
+          raise 'Cannot pass a profile and a secret'
+        end
+
+        if credential_args[:profile]
+          profile = credential_args[:profile]
+        else
+          key_id = credential_args[:access_key]
+          secret = credential_args[:secret]
+        end        
+        region = credential_args[:region] || ENV['AWS_DEFAULT_REGION']
+      end 
+      return key_id, secret, profile, region
+    end
+
+    def set_credentials(key_id, secret, profile, region)
+      @region = region
       @credentials =
         if key_id.nil? && secret.nil?
-          Aws::SharedCredentials.new
+          begin
+            profile.nil? ? Aws::SharedCredentials.new : Aws::SharedCredentials.new(profile_name: profile)
+          rescue Aws::Errors::NoSuchProfileError
+            raise_credentials_error
+          end
         else
           Aws::Credentials.new(key_id, secret)
         end
+
+        if (@credentials.credentials.nil? || @region.nil?) \
+          || @credentials.credentials.set? == false
+          raise_credentials_error
+        end
     end
+    
   end
 end

data/lib/aws_log_cleaner/version.rb

@@ -1,3 +1,3 @@
 module AwsLogCleaner
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/aws_log_cleaner.rb

@@ -12,8 +12,8 @@ module AwsLogCleaner
   # Application wrapper
   class AwsLogCleaner
 
-    def initialize(access_key = nil, secret = nil, region = nil)
-      credentials = AwsCredentials.new(access_key, secret, region)
+    def initialize(credentials_args)
+      credentials = AwsCredentials.new(credentials_args)
       cloud_watch_logs = CloudWatchLogs.new(credentials)
       api_gateway = ApiGateway.new(credentials)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_log_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - dbaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler