Second tentative fix for issue #17

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-- 2.0.0
+- 2.3.3
 script:
 - bundle install
 - travis_wait bundle exec rake

README.md

@@ -26,6 +26,7 @@ It defines the state of IAM using DSL, and updates IAM according to DSL.
   * Fix for Password Policy ([RP#22](https://github.com/winebarrel/miam/pull/22))
   * Fix `--target` option for Policies ([RP#21](https://github.com/winebarrel/miam/pull/21))
   * Fix for `Rate exceeded` ([PR#23](https://github.com/winebarrel/miam/pull/23))
+  * Fix for non-User credentials  ([PR#17](https://github.com/winebarrel/miam/pull/17))
 
 ## Installation
 

lib/miam/client.rb

@@ -5,7 +5,8 @@ def initialize(options = {})
     @options = {:format => :ruby}.merge(options)
     aws_config = options.delete(:aws_config) || {}
     @iam = Aws::IAM::Client.new(aws_config)
-    @driver = Miam::Driver.new(@iam, options)
+    @sts = Aws::STS::Client.new(aws_config)
+    @driver = Miam::Driver.new(@iam, @sts, options)
     @password_manager = options[:password_manager] || Miam::PasswordManager.new('-', options)
   end
 

lib/miam/driver.rb

@@ -4,9 +4,11 @@ class Miam::Driver
   MAX_POLICY_SIZE = 2048
   MAX_POLICY_VERSIONS = 5
 
-  def initialize(iam, options = {})
+  def initialize(iam, sts, options = {})
     @iam = iam
+    @sts = sts
     @options = options
+    @account_id = nil
   end
 
   def create_user(user_name, attrs)
@@ -473,7 +475,8 @@ def unless_dry_run
 
   def account_id
     # https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
-    @account_id ||= @iam.get_user.user.arn.split(':').fetch(4)
+    # http://docs.aws.amazon.com/STS/latest/APIReference/API_GetCallerIdentity.html
+    @account_id ||= @sts.get_caller_identity.account
   end
 
   def policy_arn(policy_name, policy_path)

lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.4.beta8'
+  VERSION = '0.2.4.beta9'
 end