aws_student_accounts 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ee4734b87a0f54963c15ea30d20b7850033965
-  data.tar.gz: 5ecfe71ef0faa3fadd3443919a88af827c2594a8
+  metadata.gz: 214ce914dd480e0fa8ebaacae1405bee21317ad0
+  data.tar.gz: 422c6422eb49a6a18f4f8550c2f6050056a29382
 SHA512:
-  metadata.gz: 01c95b0019e0844bb058d65dfc46d967632ba5eccfe95f455d3d8cc9000a71226efe90eed3c443a04baffc09967ca97e3b5ecc7a59be4a2dceea3145b06e3014
-  data.tar.gz: fdf2a412089a871ef4cf9681ef623fbc5cee32159e48ca276376379694067cfb3313b9e5506df5b6a3fa95769d2ed3b733add75b6c56ddf8164c2d4963fdca40
+  metadata.gz: 1f6ccac770d7207599dc5a8465bb5eb2e1fef760a3b59299fb8f28aafb3fd53849a24d76a7a7fddc1a6fb46dd0ae56623113c665e1a94a7cf9c543ffc08cc4c7
+  data.tar.gz: f60b541126fa6df354329df090f4cb5bb82ee71619a3e728709617be0413e2eaa92cc02af2bcdb766dcfff4801fce62b2f60078badbdddcee16a3069acf61b6a

data/lib/aws_student_accounts/app.rb

@@ -41,43 +41,44 @@ class AwsStudentAccounts::App < Thor
 
   desc "create-students", "Create a student IAM account for all AWS accounts"
   common_options
-  method_option :signin_urls, desc: "File mapping usernames to account signin URLs",
-    type: :string, aliases: "-s", required: true
   def create_students(path_to_student_folders="students")
     load_and_verify_options
     @io_semaphore = Mutex.new
 
-    signin_urls = YAML.load_file(options[:signin_urls])
-
     @users_credentials = ThreadSafe::Hash.new
     @users_passwords = ThreadSafe::Hash.new
 
     FileUtils.mkdir_p(path_to_student_folders)
     FileUtils.chdir(path_to_student_folders) do
       Parallel.each(fog_credentials, in_threads: fog_credentials.size) do |username, credentials|
-        create_student_user(username, credentials, signin_urls)
+        create_student_user(username, credentials)
       end
 
-      File.open("students-fog-api.yml", "w") do |f|
-        f << @users_credentials.to_yaml
-      end
-      say "Stored all user API credentials: #{File.expand_path('students-fog-api.yml')}"
+      # don't rewrite the shared file if only re-creating credentials for one person
+      # FIXME: update these files rather than rewriting?
+      # TODO: make backups of shared files before rewriting
+      unless options[:only]
+        File.open("students-fog-api.yml", "w") do |f|
+          f << @users_credentials.to_yaml
+        end
+        say "Stored all user API credentials: #{File.expand_path('students-fog-api.yml')}"
 
-      File.open("students-console-passwords.md", "w") do |f|
-        f << "# Student AWS logins\n\n"
-        fog_credentials.each do |username, credentials|
-          if user_login = @users_passwords[username]
-            f << <<-EOS
-## #{user_login[:username]}
+        File.open("students-console-passwords.md", "w") do |f|
+          f << "# Student AWS logins\n\n"
+          fog_credentials.each do |username, credentials|
+            if user_login = @users_passwords[username]
+              f << <<-EOS
+  ## #{user_login[:username]}
 
-* Sign-in URL: #{user_login[:url]}
-* Username: #{user_login[:username]}
-* Password: #{user_login[:password]}
+  * Sign-in URL: #{user_login[:url]}
+  * Username: #{user_login[:username]}
+  * Password: #{user_login[:password]}
 
-            EOS
+              EOS
+            end
           end
+          say "Stored all user passwords: #{File.expand_path('students-console-passwords.md')}"
         end
-        say "Stored all user passwords: #{File.expand_path('students-console-passwords.md')}"
       end
     end
   end
@@ -187,14 +188,7 @@ class AwsStudentAccounts::App < Thor
     say *args
   end
 
-  def create_student_user(account, admin_credentials, signin_urls)
-    unless account_signin_url = signin_urls[account]
-      @io_semaphore.synchronize do
-        user_say account, "Admin account #{account} missing from #{options[:signin_urls]}, skipping", :red
-      end
-      return
-    end
-
+  def create_student_user(account, admin_credentials)
     begin
       iam = Fog::AWS::IAM.new(admin_credentials)
 
@@ -245,18 +239,35 @@ class AwsStudentAccounts::App < Thor
         aws_access_key_id: access_key_id,
         aws_secret_access_key: secret_access_key
       }
-      begin
-        user_compute = Fog::Compute::AWS.new(user_credentials)
-        server_count = user_compute.servers.size
-        @io_semaphore.synchronize do
-          user_say username, "Verify credentials: "
-          say "OK ", :green
-          say "(#{server_count} vms)"
-        end
-      rescue => e
-        @io_semaphore.synchronize do
-          user_say username, "Verify credentials: "
-          say e.message, :red
+      retries = 5
+      signin_url = nil
+      while retries > 0
+        begin
+          user_compute = Fog::Compute::AWS.new(user_credentials)
+          server_count = user_compute.servers.size
+          @io_semaphore.synchronize do
+            user_say username, "Verify credentials: "
+            say "OK ", :green
+            say "(#{server_count} vms)"
+          end
+
+          signin_url = account_signin_url(user_compute)
+          break
+        rescue => e
+          retries = retries - 1
+          if retries <= 0
+            @io_semaphore.synchronize do
+              user_say username, "Verify credentials: "
+              say e.message, :red
+            end
+          else
+            @io_semaphore.synchronize do
+              user_say username, "Verify credentials: "
+              say "failed ", :yellow
+              say "retrying..."
+            end
+            sleep 1
+          end
         end
       end
 
@@ -264,12 +275,12 @@ class AwsStudentAccounts::App < Thor
       user_login = {
         password: password,
         username: username.to_s,
-        url: account_signin_url
+        url: signin_url
       }
       @users_passwords[username] = user_login
 
       write_fog_file(username, user_credentials)
-      write_password_file(account_signin_url, user_login)
+      write_password_file(signin_url, user_login)
     rescue => e
       @io_semaphore.synchronize do
         say "#{e.class}: #{e.message}", :red
@@ -336,7 +347,12 @@ class AwsStudentAccounts::App < Thor
     @io_semaphore.synchronize do
       user_say username, "Created console-passwords.md", :green
     end
+  end
 
+  def account_signin_url(aws_compute)
+    any_sg = aws_compute.security_groups.first
+    account_num = any_sg.owner_id
+    "https://#{account_num}.signin.aws.amazon.com/console"
   end
 
   def destroy_everything(account, aws_region, compute)

data/lib/aws_student_accounts/version.rb

@@ -1,3 +1,3 @@
 module AwsStudentAccounts
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_student_accounts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dr Nic Williams