cloudhealth-setup 0.0.13 → 0.0.14

data/cloudhealth-setup.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'cloudhealth-setup'
-  s.version     = '0.0.13'
-  s.date        = '2013-08-31'
+  s.version     = '0.0.14'
+  s.date        = '2013-11-25'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['CloudHealth Technologies']
   s.email       = ['support@cloudhealthtech.com']
@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency("nokogiri", "= 1.5.8")
-  s.add_dependency("fog", "= 1.12.1")
-  s.add_dependency("json", "= 1.8.0")
-  s.add_dependency("excon", "= 0.23.0")
+  s.add_dependency("fog", "= 1.15.0")
+  s.add_dependency("multi_json", "= 1.7.7")
+  s.add_dependency("excon", "= 0.25.3")
   s.add_dependency("mixlib-cli", "= 1.3.0")
   s.add_dependency("mechanize", "= 2.5.1")
   s.add_dependency("highline", "= 1.6.19")
+  s.add_dependency("nokogiri", "= 1.5.8")
+  s.add_dependency("json_pure", "= 1.8.1")
 
   s.bindir        = "bin"
   s.files         = Dir.glob('{bin,lib}/**/*') + %w[cloudhealth-setup.gemspec]

data/lib/cht/aws.rb

@@ -1,6 +1,3 @@
-require "highline/system_extensions"
-include HighLine::SystemExtensions
-
 class Setup
   def iam
     begin
@@ -26,7 +23,7 @@ class Setup
       if @input_file.nil? || @input_file.empty?
         # Single account mode
         puts "Could not login to your account with the provided Amazon Web Services credentials. Please check your AWS Access Key and Secret Access Key and try again. If issue persists contact support@cloudhealthtech.com."
-        exit
+        windows_exit
       else
         # Multi account mode
         raise SetupFailed, "Could not login to your account with the provided Amazon Web Services credentials. Please check your AWS Access Key and Secret Access Key and try again. If issue persists contact support@cloudhealthtech.com."
@@ -116,10 +113,11 @@ class Setup
             puts "    User #{@aws_ro_name} exists... continuing due to --user-exists"
             puts "    Note: CSV Output file will NOT be complete. Since we did not create the aws read only user"
             puts "          You must fill in the blanks of the CSV if you plan on importing the CSV on the website."
+            puts "          Consider running update instead."
           else
             #TODO This should not exit() in multi-account import mode, it should be raised up and caught. e.g. SetupFailed
-            puts "User #{@aws_ro_name} exists already, If this was your intention please re-run with --user-exists and ensure you update the CSV manually or choose another username via -r <name>"
-            exit
+            puts "User #{@aws_ro_name} exists already, If this was your intention please re-run with --user-exists and ensure you update the CSV manually or choose another username via -r <name>. If your intention was to just update, please run the update process on this script instead."
+            windows_exit
           end
         else
           puts "    Creating user... "
@@ -270,4 +268,34 @@ class Setup
     end
     pw
   end
+
+  def update_ro_user
+    ro_username = if user_exists
+                    @aws_ro_name
+                  else
+                    ask("What is your cloudhealth read only username?")
+                  end
+    iam_user = @iam.get_user(ro_username)
+    if iam_user.nil?
+      puts "Could not find your cloudhealth ro user, exiting..."
+      windows_exit
+    end
+    @aws_ro_name = ro_username unless @aws_ro_name.nil?
+    if user_has_policy
+      @iam.delete_user_policy(@aws_ro_name,"CHTRoPolicy")
+    end
+    @iam.put_user_policy(@aws_ro_name, "CHTRoPolicy", aws_ro_policy)
+    puts "Cloudhealth RO user #{@aws_ro_name} policy updated"
+  end
+
+  def update_s3_bucket
+    unless @s3.directories.collect{|d| d.key}.include?(@setup_bucket)
+      puts "Could not find S3 bucket #{@setup_bucket}, Please retry after verifying bucket exists"
+    end
+    if bucket_has_policy
+      @s3.delete_bucket_policy(@setup_bucket)
+    end
+    @s3.put_bucket_policy(@setup_bucket, bucket_policy)
+    puts "Cloudhealth billing bucket #{@setup_bucket} policy updated"
+  end
 end

data/lib/cht/error_handling.rb

@@ -1,14 +1,43 @@
 class SetupFailed < StandardError
 end
 
+class ReSetup < StandardError
+end
+
+class RealExit < StandardError
+end
+
 class Setup
+  def self.immediate_exit
+    # We should actually detect windows here then wait much longer
+    puts "Cloudhealth setup finished"
+    if ENV["OCRA_EXECUTABLE"]
+      sleep 2
+      raise RealExit
+    end
+    exit
+  end
+
+  def windows_exit
+    # We should actually detect windows here then wait much longer
+    puts "Cloudhealth setup finished"
+    if ENV["OCRA_EXECUTABLE"]
+      sleep
+    end
+    exit
+  end
+
+  def self.rerun
+    raise ReSetup
+  end
+
   def critical_failure(message)
     puts message
     #raise SetupFailed, message
   end
 
   def warning(e)
-    if @verbose
+    if @verbose || ENV["OCRA_EXECUTABLE"]
       puts e
       puts e.backtrace
     end

data/lib/cht/mechanize.rb

@@ -74,7 +74,7 @@ class Setup
       #TODO: Fix when multi input account works
       #raise SetupFailed, e
       puts e
-      exit
+      windows_exit
     end
   end
 
@@ -85,7 +85,7 @@ class Setup
       if @input_file.nil? || @input_file.empty?
         # Single account mode
         puts "Could not login to your account with the provided Amazon Web Services credentials. Please check your provided email address and password and try again. If issue persists contact support@cloudhealthtech.com."
-        exit
+        windows_exit
       else
         # Multi account mode
         raise SetupFailed, "Could not login to your account with the provided Amazon Web Services credentials. Please check your provided email address and password and try again. If issue persists contact support@cloudhealthtech.com."
@@ -194,7 +194,13 @@ class Setup
         prog_access_form['s3BucketName'] = @setup_bucket
         prog_access_form.submit
       else
-        puts "    Access already enabled..."
+        if paf_enabled.value == @setup_bucket
+          puts "    Access already enabled on bucket #{@setup_bucket}..."
+        else
+          puts "    S3 Bucket is currently set to #{paf_enabled.value}, You requested it be set to #{@setup_bucket} -- Changing it."
+          prog_access_form['s3BucketName'] = @setup_bucket
+          prog_access_form.submit
+        end
       end
       puts "    Setup of programmatic access to billing finished"
     rescue => e

data/lib/cht/output.rb

@@ -1,5 +1,21 @@
 class Setup
   def self.write_csv(accounts, filename)
+    if filename.nil?
+      if ENV["OCRA_EXECUTABLE"]
+        # We are on windows, in OCRA
+        win_desktop = ENV['HOME'] + '/Desktop'
+        win_filename = win_desktop + "/cloudhealth-accounts.csv"
+        filename = ask("Please give me full path to save output csv to (Hit enter for default: #{win_filename} ): ")
+        if filename.empty?
+          filename = win_filename
+        end
+      else
+        filename = ask("Please give me the full path to the save output csv to: (Hit enter for default: ./cloudhealth-setup.csv): ")
+        if filename.empty?
+          filename = "./cloudhealth-setup.csv"
+        end
+      end
+    end
     file_exists = File.exists?(filename)
     mode = if file_exists
              if @overwrite_file
@@ -14,7 +30,7 @@ class Setup
            end
 
     count = 0
-    CSV.open(filename, mode) do |csv|
+    CSV.open(File.expand_path(filename), mode) do |csv|
       unless mode == "ab"
         csv << ["Account ID", "Console URL", "IAM Username", "IAM Password", "AWS Access Key", "AWS Access Secret", "S3 Bucket", "Is Consolidated?"]
       end

data/lib/cloudhealth-setup.rb

@@ -1,19 +1,24 @@
-gem "fog", "1.12.1"
-gem "json", "1.8.0"
-gem "excon", "0.23.0"
+gem "fog", "1.15.0"
+gem "multi_json", "1.7.7"
+gem "excon", "0.25.3"
 gem "mixlib-cli", "1.3.0"
 gem "mechanize", "2.5.1"
 gem "highline", "1.6.19"
 gem "nokogiri", "1.5.8"
+gem "json_pure", "1.8.1"
 
 require "fog"
 require "mixlib/cli"
-require "json"
+require "multi_json"
+require "json/pure"
 require "mechanize"
 require "excon"
 require "highline/import"
 require "securerandom"
 require "csv"
+require "highline/system_extensions"
+
+include HighLine::SystemExtensions
 
 # Ruby 1.8.7 hack for compatability
 unless Kernel.respond_to?(:require_relative)
@@ -30,14 +35,12 @@ require_relative "cht/policy"
 require_relative "cht/error_handling"
 require_relative "cht/output"
 
-
 class MyCLI
   include Mixlib::CLI
 
   option :output_file,
     :short => "-o OUTFILE",
     :long => "--output-file OUTFILE",
-    :default => "./cloudhealth-accounts.csv",
     :description => "Output CSV"
 
   option :overwrite_file,
@@ -126,7 +129,7 @@ class Setup
   attr_accessor :aws_key, :aws_secret, :aws_user, :aws_pass, :output_file, :input_file, :aws_url, :setup_bucket, :aws_ro_name, :aws_acct_alias, :account_name, :aws_account_id
 
   def initialize(options)
-    manual_input = ensure_options(options)
+    manual_input = ensure_options(options) unless defined?(Ocra)
     options.merge!(manual_input)
     @aws_key = options[:aws_key]
     @aws_secret = options[:aws_secret]
@@ -144,6 +147,7 @@ class Setup
     @mfa = options[:multi_factor_code] || nil
     @created_account = {}
     @iam = iam
+    @simple = options[:simple] || false
     @s3 = s3
     @browser = mech_browser
     @mode = ARGV[0]
@@ -189,19 +193,55 @@ class Setup
       output_opts[:setup_bucket] = ask("Input S3 Bucket name for billing: ")
     end
 
+    if input[:aws_acct_alias].nil?
+      if input[:setup_mode] == "install"
+        output_opts[:aws_acct_alias] = ask("Alias you would like to setup for your AWS Account (Optional, only for initial install, hit enter otherwise): ")
+        output_opts.delete(:aws_acct_alias) if output_opts[:aws_acct_alias].empty? #Catch enter/no input
+      end
+    end
+
     output_opts
 
   end
 
   def self.run
     cli = MyCLI.new
-    cli.banner = "Usage: cloudhealth-setup test|install|uninstall (options)"
+    setup_modes = ["test", "install", "uninstall", "update", "help"]
+    cli.banner = "Usage: cloudhealth-setup #{setup_modes.join('|')} (options)"
     cli.parse_options
     accounts_to_setup = []
     accounts_processed = []
-    if ARGV[0].nil?
-      puts cli.opt_parser
-      exit
+    setup_mode = if setup_modes.include?(ARGV[0])
+                  ARGV[0]
+                 else
+                   # ARGV[0] is a cli option, not a mode
+                   nil
+                 end
+
+    setup_mode = "install" if defined?(Ocra)
+
+    if setup_mode.nil?
+      puts ""
+      puts "CloudHealth Setup"
+      puts ""
+      choose do |menu|
+        menu.prompt = "Please choose what you want to do:"
+        menu.choice(:install) { setup_mode = "install" }
+        menu.choice(:uninstall) { setup_mode = "uninstall" }
+        menu.choice(:test) { setup_mode = "test" }
+        menu.choice(:update) { setup_mode = "update"}
+        menu.choice(:help) {
+          puts cli.opt_parser
+          Setup.run
+        }
+        menu.choice(:quit) {
+          setup_mode = "quit"
+          Setup.immediate_exit
+        }
+      end
+      cli.config[:simple] = true
+      cli.config[:setup_mode] = setup_mode
+      puts "Continuing with #{setup_mode}..."
     end
 
     if cli.config[:input_file]
@@ -215,10 +255,10 @@ class Setup
     accounts_to_setup.each do |account_options|
       new_account = Setup.new(account_options)
 
-      case ARGV[0]
+      new_account.check_iam_credentials
+      new_account.check_web_credentials
+      case setup_mode
       when "install"
-        new_account.check_iam_credentials
-        new_account.check_web_credentials
         new_account.setup_monthly_report
         new_account.setup_s3_bucket
         new_account.setup_prog_access
@@ -241,11 +281,31 @@ class Setup
         new_account.test_consolidated
       when "uninstall"
         new_account.uninstall_ro_user
+      when "update"
+        new_account.update_s3_bucket
+        new_account.update_ro_user
       else
         puts cli.opt_parser
       end
     end
-    Setup.write_csv(accounts_processed, cli.config[:output_file]) if ARGV[0] == "install"
+    Setup.write_csv(accounts_processed, cli.config[:output_file]) if setup_mode == "install"
+    if ENV['OCRA_EXECUTABLE']
+      Setup.run
+    end
   end
 end
+
+begin
 Setup.run
+rescue RealExit
+  exit
+rescue SystemExit
+  unless ENV['OCRA_EXECUTABLE']
+    exit
+  end
+rescue Exception => e
+  puts "Ran into a problem, Please contact Cloudhealth Support with this error: #{e}"
+  if ENV['OCRA_EXECUTABLE']
+    Setup.run
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudhealth-setup
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: json
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.25.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.25.3
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: mixlib-cli
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +90,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 1.6.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,15 +106,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 1.6.19
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.19
+        version: 1.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.19
+        version: 1.5.8
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: Configures an Amazon AWS account for use with the CloudHealth service,
   including creating a least privilege read only AWS user and enabling the retrieval
   of cost and usage information.
@@ -143,7 +159,6 @@ 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

data/lib/cloudhealth-accounts.csv

@@ -1,4 +0,0 @@
-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