yle-aws-role 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7b053ced151afced7e073a3b35b845c9063535
-  data.tar.gz: c56becd6190bc4cc5d97547daa02257839a57319
+  metadata.gz: f0336e6ed9e03daa76c15b4659a1e6283bb2943b
+  data.tar.gz: 8884cd5b0f1d602d2f14445cd1f83cafed9e07c0
 SHA512:
-  metadata.gz: 678d27720ced0e4d0aba60780cc8409367efea5477f93aeacaa45e98cb88cf09ebf0fd5651692d32a9ed93e151c158aaca3f8936181855908adb4cd5995e0a5d
-  data.tar.gz: e980b5b1bec818f651045e98ad30241493fe67a5bef6108b158978057222cfcb71b4692c2f34fc11be48a3aeaec3fc83ff5dd5f601746a4d6f59dc8cf265bbec
+  metadata.gz: 0a90525adf5e57867a8faba1d12bcda886c06940946e8b8bac2e901a383a27d78eef1d67c8cd3d91dcbab0d1eec22442bd68e8a94bbb5bd1292e312bac77087c
+  data.tar.gz: 26eb0863413abe01edb45f28113631eb347f8d3c7d9f9c591cbfbd0af7bc8ee01d9801f8c15e6c1c21af979e03255b1e0544a26bee07a6fc730bc5ae8c40bbc8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0 / 2017-05-23
+
+- Support default role in the `Role` class
+- Support `require 'yle-aws-role'`
+
 ## 1.0.1 / 2017-05-16
 
 - Initial public release

data/lib/yle-aws-role.rb

@@ -0,0 +1 @@
+require 'yle/aws/role'

data/lib/yle/aws/role.rb

@@ -12,7 +12,7 @@ module Yle
       # Default duration in seconds when assuming a role
       DEFAULT_DURATION = 900
 
-      def self.assume_role(account_name, role_name, duration = nil)
+      def self.assume_role(account_name, role_name = nil, duration = nil)
         account_alias = accounts.find(account_name)
         if !account_alias
           raise Errors::AccountNotFoundError, "No account found for '#{account_name}'"
@@ -31,16 +31,27 @@ module Yle
         @accounts ||= Accounts.new(config['accounts'])
       end
 
+      def self.default_role_name
+        config['defaults']['role']
+      end
+
+      def self.default_duration
+        config['defaults']['duration'] || DEFAULT_DURATION
+      end
+
       attr_reader :account, :role_name, :credentials
 
-      def initialize(account_alias, role_name, duration = nil)
+      def initialize(account_alias, role_name = nil, duration = nil)
         @account = account_alias
-        @role_name = role_name
+        @role_name = role_name || Role.default_role_name
+        duration ||= Role.default_duration
+
+        raise Errors::AssumeRoleError, 'Role name not specified' if !@role_name
 
         @credentials = Aws::AssumeRoleCredentials.new(
           role_arn: role_arn,
           role_session_name: session_name,
-          duration_seconds: duration || DEFAULT_DURATION
+          duration_seconds: duration
         ).credentials
       rescue Aws::STS::Errors::ServiceError,
         Aws::Errors::MissingCredentialsError => e

data/lib/yle/aws/role/cli.rb

@@ -20,11 +20,11 @@ module Yle
             o.separator '    account         The account ID or pattern of the role account'
             o.separator '    command         Command to execute with the role. Defaults to launching new shell session.'
             o.separator ''
-            o.integer '-d', '--duration', "Duration for the role credentials. Default: #{Role::DEFAULT_DURATION}"
+            o.integer '-d', '--duration', "Duration for the role credentials. Default: #{Role.default_duration}"
             o.bool '--env', 'Print out environment variables and exit'
             o.bool '-l', '--list', 'Print out all configured account aliases'
             o.bool '-q', '--quiet', 'Be quiet'
-            o.string '-r', '--role', 'Name of the role'
+            o.string '-r', '--role', "Name of the role. Default: '#{Role.default_role_name}'"
             o.separator ''
             o.on '-h', '--help', 'Prints this help' do
               puts o
@@ -39,9 +39,14 @@ module Yle
           @account_name = opts.args.shift
           @command = opts.args
 
-          if !@account_name && !@opts[:list]
-            STDERR.puts @opts
-            exit 64
+          if !@opts[:list]
+            if !@account_name
+              STDERR.puts @opts
+              exit 64
+            elsif !(@opts[:role] || Role.default_role_name)
+              STDERR.puts 'Role name must be passed with `--role` or set in the config'
+              exit 64
+            end
           end
         rescue Slop::Error => e
           STDERR.puts e
@@ -54,12 +59,7 @@ module Yle
             return
           end
 
-          if !role_name
-            STDERR.puts 'Role name must be passed with `--role` or set in the config'
-            exit 64
-          end
-
-          Role.assume_role(account_name, role_name, duration) do |role|
+          Role.assume_role(account_name, opts[:role], opts[:duration]) do |role|
             STDERR.puts("Assumed role #{role.name}") if !opts[:quiet]
 
             if opts[:env]
@@ -90,14 +90,6 @@ module Yle
           STDERR.puts "Failed to execute '#{cmd.first}'" if ret.nil?
           exit(1) if !ret
         end
-
-        def role_name
-          opts[:role] || Role.config['defaults']['role']
-        end
-
-        def duration
-          opts[:duration] || Role.config['defaults']['duration']
-        end
       end
     end
   end

data/lib/yle/aws/role/version.rb

@@ -1,7 +1,7 @@
 module Yle
   module AWS
     class Role
-      VERSION = '1.0.1'.freeze
+      VERSION = '1.1.0'.freeze
     end
   end
 end

data/yle-aws-role.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop', '~> 4.4'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yle-aws-role
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Yleisradio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ files:
 - README.md
 - Rakefile
 - bin/asu
+- lib/yle-aws-role.rb
 - lib/yle/aws/role.rb
 - lib/yle/aws/role/accounts.rb
 - lib/yle/aws/role/cli.rb