cloudhealth-setup 0.0.10 → 0.0.12

data/cloudhealth-setup.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'cloudhealth-setup'
-  s.version     = '0.0.10'
+  s.version     = '0.0.12'
   s.date        = '2013-08-31'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['CloudHealth Technologies']

data/lib/cht/mechanize.rb

@@ -29,8 +29,31 @@ class Setup
             puts "The login page returned error code #{login_page.code}"
             raise SetupFailed, "   Could not login to AWS Web Console, Amazon may be experiencing issues or the credentials you provided are incorrect. HTTP Code: #{login_page.code}"
           end
+
+        # A Captcha can be present if they failed to login too many times, Lets detect it here.
+        captcha_form = login_page.form_with(:id => 'ap_signin_form')
+        unless captcha_form.nil?
+          captcha_on = captcha_form.field_with(:id => 'ap_captcha_guess')
+          unless captcha_on.nil?
+            raise SetupFailed, "  Your account currently has a captcha on the login screen, This is most likely due to failed logins. Please login to your account at http://aws.amazon.com/ to stop the Captcha and then retry cloudhealth-setup."
+          end
+        end
+
+        mfa_form = login_page.form_with(:id => 'ap_signin_form')
+        unless mfa_form.nil?
+          if @mfa.nil?
+            @mfa = ask("Multi-Factor Authentication detected, please enter 6 digit pin: ") do |q|
+              q.responses[:not_valid] = "You must enter a 6 digit MFA pin."
+              q.responses[:invalid_type] = "You must enter a 6 digit MFA pin."
+              q.validate = lambda {|p| p.length == 6 }
+            end
+          end
+          mfa_form['tokenCode'] = @mfa
+          mfa_form.submit
+        end
       end
 
+
       account_id_search = page.search('//span[@class="txtxxsm"]/text()')
       unless account_id_search.nil? || account_id_search.size == 0 || @created_account[:account_id]
         firstw, secondw, account_id_long = account_id_search.first.content.strip.split(" ")
@@ -48,7 +71,10 @@ class Setup
 
       page
     rescue => e
-      raise SetupFailed, e
+      #TODO: Fix when multi input account works
+      #raise SetupFailed, e
+      puts e
+      exit
     end
   end
 
@@ -184,11 +210,20 @@ class Setup
       detailed_billing_form = page.form_with(:name=>'hourlyOptInForm')
       bill_enabled = detailed_billing_form.field_with(:name => "buttonOptionHourly")
 
+      detailed_billing_tag_form = page.form_with(:name => 'hourlyWithResourcesAndTagsOptInForm')
+      tag_bill_enabled = detailed_billing_tag_form = detailed_billing_tag_form.field_with(:name => "buttonOptionHourlyWithResourcesAndTags")
+
       if bill_enabled.value == "EnableHourly"
         puts "[ ] Detailed billing report not setup -- Disabled"
       elsif bill_enabled.value == "DisableHourly"
         puts "[X] Detailed billing report setup -- Enabled"
       end
+
+      if tag_bill_enabled.value == "EnableHourlyWithResourcesAndTags"
+        puts "[ ] Detailed billing report w/ tags & resources not setup -- Disabled"
+      elsif tag_bill_enabled.value == "DisableHourlyWithResourcesAndTags"
+        puts "[X] Detailed billing report w/ tags & resources setup -- Enabled"
+      end
     rescue => e
       puts "    We were unable to test detailed billing reports."
       puts "    This setting can be enabled/tested manually under Billing Preferences from the AWS account page."
@@ -200,18 +235,32 @@ class Setup
     begin
       puts "Setting up detailed billing report..."
       page = get_page
+
+      # This is the regular detailed billing report
       detailed_billing_form = page.form_with(:name=>'hourlyOptInForm')
       bill_enabled = detailed_billing_form.field_with(:name => "buttonOptionHourly")
 
+      # This is the detailed billing report with tags and resources
+      detailed_billing_tag_form = page.form_with(:name => 'hourlyWithResourcesAndTagsOptInForm')
+      tag_bill_enabled = detailed_billing_tag_form.field_with(:name => "buttonOptionHourlyWithResourcesAndTags")
+
       if bill_enabled.value == "EnableHourly"
         puts "    Enabling detailed billing report... "
         detailed_billing_form.submit
       elsif bill_enabled.value == "DisableHourly"
-        puts "    Report already enabled... "
+        puts "    Detailed report already enabled... "
+      end
+
+      if tag_bill_enabled.value == "EnableHourlyWithResourcesAndTags"
+        puts "    Enabling detailed billing report w/ tags & resources... "
+        detailed_billing_tag_form.submit
+      elsif tag_bill_enabled.value == "DisableHourlyWithResourcesAndTags"
+        puts "    Detailed report w/ resources & tags already enabled... "
       end
       puts "    Report setup finished"
+
     rescue => e
-      puts "    We were unable to enable detailed billing reports."
+      puts "    we were unable to enable detailed billing reports."
       puts "    This setting can be enabled manually under Billing Preferences from the AWS account page."
       warning(e)
     end

data/lib/cht/policy.rb

@@ -72,6 +72,7 @@ class Setup
             "elasticbeanstalk:RequestEnvironmentInfo",
             "elasticbeanstalk:RetrieveEnvironmentInfo",
             "elasticloadbalancing:Describe*",
+            "elasticmapreduce:Describe*",
             "iam:List*",
             "iam:Get*",
             "redshift:Describe*",

data/lib/cloudhealth-accounts.csv

@@ -0,0 +1,4 @@
+Account ID,Console URL,IAM Username,IAM Password,AWS Access Key,AWS Access Secret,S3 Bucket,Is Consolidated?
+495052634639,https://495052634639.signin.aws.amazon.com/,some-new-aws-ro-user,576501261b83d6fd9203011822875fcc,AKIAJGMSIZUEXP2WLQWA,DgwWvYt0YaZrLw9AkRusWmjlrD5KDXAM5F4TqCwo,tst-mfa-3fweew,false
+495052634639,https://495052634639.signin.aws.amazon.com/,some-new-aws-ro-user2,0251ee4449b2d65d8b3a220bb19b1eb3,AKIAIC7MUEK5XPLVDFVA,iapRZL97kafIJjpv/4W6qZotSaVggZaIri60gbVN,new-mfa-test-for-mejoshp,false
+495052634639,https://495052634639.signin.aws.amazon.com/,some-new-aws-ro-user4,7830926c652bfb821607d71df9c2e200,AKIAIBVYS72XJNYDQWKA,jTOHuMUvChcdZhJDJn1p+9i9bGQvZYU9ItumsurU,tst-for-mfa,false

data/lib/cloudhealth-setup.rb

@@ -74,6 +74,11 @@ class MyCLI
     :long => "--aws-secret SECRET",
     :description => "AWS Secret"
 
+  option :multi_factor_code,
+    :short => "-m CODE",
+    :long => "--multi-factor CODE",
+    :description => "Multi-Factor Authentication Token / Code"
+
   option :setup_bucket,
     :short => "-b BUCKET",
     :long => "--setup-billing-bucket BUCKET",
@@ -136,6 +141,7 @@ class Setup
     @verbose = options[:verbose]
     @overwrite_file = options[:overwrite_file]
     @ro_user_exists = options[:ro_user_exists]
+    @mfa = options[:multi_factor_code] || nil
     @created_account = {}
     @iam = iam
     @s3 = s3
@@ -180,7 +186,7 @@ class Setup
     end
 
     if input[:setup_bucket].nil?
-      output_opts[:setup_bucket] = ask("Input S3 Bucket name to setup for billing: ")
+      output_opts[:setup_bucket] = ask("Input S3 Bucket name for billing: ")
     end
 
     output_opts
@@ -242,3 +248,4 @@ class Setup
     Setup.write_csv(accounts_processed, cli.config[:output_file]) if ARGV[0] == "install"
   end
 end
+Setup.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudhealth-setup
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -143,6 +143,7 @@ files:
 - lib/cht/mechanize.rb
 - lib/cht/output.rb
 - lib/cht/policy.rb
+- lib/cloudhealth-accounts.csv
 - lib/cloudhealth-setup.rb
 - cloudhealth-setup.gemspec
 homepage: http://www.cloudhealthtech.com