@@ -28,6 +28,7 @@

                                (:file "pprint-setup")

                                (:file "store")

                                (:file "aws-dispatcher")

+                               (:file "aws-utils")

                                (:file "domain")

                                (:file "objc-utils")

                                (:file "read-credentials")

new file mode 100644

@@ -0,0 +1,33 @@

+(in-package :mfa-tool.aws-utils)

+

+(defclass cj-organization-role ()

+  ((account :initarg :account

+            :reader account

+            :initform (error "must pass an account"))))

+

+(fw.lu:defclass+ cj-developer-role ((cj-organization-role (account)))

+  ())

+

+(defgeneric arn-for (type account resource)

+  (:method-combination list :most-specific-last)

+  (:documentation "get the arn for an aws resource")

+  (:method :around (-t account u)

+    (format nil "arn:aws:iam::~a:~a"

+            account

+            (serapeum:string-join (call-next-method)

+                                  "/")))

+  (:method list ((type (eql :mfa)) account user)

+    "mfa")

+  (:method list ((type (eql :mfa)) account (user string))

+    user)

+  (:method list ((type (eql :role)) account role)

+    "role")

+  (:method list ((type (eql :role)) account (role cj-organization-role))

+    "cjorganization")

+  (:method list ((type (eql :role)) account (role cj-developer-role))

+    "CJDeveloperAccessRole")

+  (:method list ((type (eql :role)) account (role string))

+    role))

+

+(defun cj-organization-role-arn (role)

+  (arn-for :role (account role) role))

@@ -6,37 +6,6 @@

 (defparameter *user_management_account_id* 597974043991)

-(defclass cj-organization-role ()

-  ((account :initarg :account

-            :reader account

-            :initform (error "must pass an account"))))

-(fw.lu:defclass+ cj-developer-role ((cj-organization-role (account)))

-  ())

-

-(defgeneric arn-for (type account resource)

-  (:method-combination list :most-specific-last)

-  (:documentation "get the arn for an aws resource")

-  (:method :around (-t account u)

-    (format nil "arn:aws:iam::~a:~a"

-            account

-            (serapeum:string-join (call-next-method)

-                                  "/")))

-  (:method list ((type (eql :mfa)) account user)

-    "mfa")

-  (:method list ((type (eql :mfa)) account (user string))

-    user)

-  (:method list ((type (eql :role)) account role)

-    "role")

-  (:method list ((type (eql :role)) account (role cj-organization-role))

-    "cjorganization")

-  (:method list ((type (eql :role)) account (role cj-developer-role))

-    "CJDeveloperAccessRole")

-  (:method list ((type (eql :role)) account (role string))

-    role))

-

-(defun cj-organization-role-arn (role)

-  (arn-for :role (account role) role))

-

 (defun read-new-mfa-token ()

   (format *query-io* "~&New MFA token: ")

   (finish-output *query-io*)

@@ -114,8 +114,9 @@

   (let ((accounts (gethash "Accounts" accounts))

         (result ()))

     (mapc (lambda (account)

-            (push (cons (format nil "~a (~a)" 

+            (push (cons (format nil "~a: ~a (~a)" 

                                 (gethash "Name" account)

+                                (gethash "Id" account)

                                 (gethash "Type" account))

                         (gethash "Id" account))

                   result))

@@ -1,3 +1,14 @@

+(defpackage :mfa-tool.aws-utils

+  (:use :cl)

+  (:export #:cj-organization-role

+           #:cj-developer-role

+           #:arn-for

+           #:cj-organization-role-arn))

+

 (defpackage :mfa-tool

   (:use :cl)

+  (:import-from :mfa-tool.aws-utils

+                #:cj-organization-role-arn

+                #:cj-developer-role

+                #:arn-for)

   (:export :main))