cloud-maker 0.1.2 → 0.2.0.pre2

data/bin/cloud-maker

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'thor'
-require 'colorize'
 require 'cloud-maker'
 
 class CloudMakerCLI < Thor
@@ -23,6 +21,34 @@ class CloudMakerCLI < Thor
     puts config.to_user_data
   end
 
+  desc "terminate [AWS_INSTANCE_ID]", "Terminate the specified AWS instance"
+  def terminate(aws_instance_id)
+    say "Not implemented.".red
+  end
+
+  desc "info [AWS_INSTANCE_ID]", "Display config info about the specified AWS instance"
+  method_option :aws_access_key_id,
+    :desc => "Your AWS access key id",
+    :default => ENV['AWS_ACCESS_KEY_ID'],
+    :required => true
+  method_option :aws_secret_access_key,
+    :desc => "Your AWS secret access key",
+    :default => ENV['AWS_SECRET_ACCESS_KEY'],
+    :required => true
+  def info(aws_instance_id)
+    cloud_maker = CloudMaker::Ec2.new(
+      :aws_access_key_id => options.aws_access_key_id,
+      :aws_secret_access_key => options.aws_secret_access_key
+    )
+
+    info = cloud_maker.info(aws_instance_id)
+
+    print_config_hash(info[:cloud_config])
+    puts
+    say "Original instance state:".green
+    print_colored_hash(info[:instance])
+  end
+
   desc "launch [INSTANCE_CONFIG_YAML]", "Launch a new EC2 instance as described by INSTANCE_CONFIG_YAML"
   method_option :aws_access_key_id,
     :desc => "Your AWS access key id",
@@ -49,41 +75,57 @@ class CloudMakerCLI < Thor
 
     config = build_config(instance_config_yaml, options)
 
-    cloud_maker = CloudMaker::Ec2.new(config,
-      :aws_access_key_id => options.aws_access_key_id,
-      :aws_secret_access_key => options.aws_secret_access_key
-    )
+    print_config_hash(config.to_hash)
+
+    if yes?("Launch a new EC2 instance with the options above? (y/n)")
+      cloud_maker = CloudMaker::Ec2.new(
+        :aws_access_key_id => options.aws_access_key_id,
+        :aws_secret_access_key => options.aws_secret_access_key
+      )
 
-    if (!config.includes.empty?)
+      instance = cloud_maker.launch(config)
+      puts
+      say "Successfully launched new EC2 instance: ".green + instance[:aws_instance_id].magenta
+      puts
+      print_colored_hash(instance)
+    else
+      say "Launch aborted!".red
+    end
+  end
+
+  private
+  def print_colored_hash(hash, color=:cyan)
+    print_table hash.map {|key, val|
+      [key.to_s.dup.send(color), val.to_s]
+    }
+  end
+
+  def print_config_hash(hash)
+    puts
+    say "CloudInit configuration:".green
+    print_colored_hash hash['cloud-init']
+    puts
+
+    if (!hash['include'].empty?)
       puts
       say 'Include URLs:'.green
-      config.includes.each do |url|
+      hash['include'].each do |url|
         puts url
       end
     end
 
     puts
     say "CloudMaker configuration:".green
-    print_table config.to_hash.map {|key, val| [key.dup.cyan, val]}
-
-    puts
-    say "Configuration file:".green + " " + config.extra_options[:config_path]
+    print_colored_hash hash['cloud-maker']
     puts
 
-    if yes?("Launch a new EC2 instance with the options above? (y/n)")
-      instance = cloud_maker.launch
-      puts
-      say "Successfully launched new EC2 instance: ".green + instance[:aws_instance_id].magenta
-      puts
-      print_table instance.map {|key, val|
-        [key.to_s.cyan, val.to_s]
-      }
-    else
-      say "Launch aborted!".red
+    say "Configuration files:".green
+    [hash['extra-options']['config_path'], *hash['import']].each do |file|
+      puts file
     end
+    puts
   end
 
-  private
   def build_config(instance_config_yaml, options)
     config = CloudMaker::Config.from_yaml(instance_config_yaml)
     options.set.each_pair {|key, val| config[key] = val}
@@ -112,6 +154,4 @@ class CloudMakerCLI < Thor
   end
 end
 
-
-
 CloudMakerCLI.start

data/lib/cloud-maker.rb

@@ -1,4 +1,12 @@
+Bundler.require(ENV['CLOUDMAKER_ENV'].to_sym) if ENV['CLOUDMAKER_ENV']
+
+require 'thor'
+require 'colorize'
+require 'deep_merge'
+require 'right_aws'
+
 require 'cloud_maker/config'
 require 'cloud_maker/ec2'
 require 'cloud_maker/s3_archiver'
 require 'cloud_maker/shell_executor'
+

data/lib/cloud_maker/config.rb

@@ -1,6 +1,3 @@
-require 'yaml'
-require 'deep_merge'
-
 module CloudMaker
   class Config
     # Public: Gets/Sets the CloudMaker specific properties. The options hash
@@ -104,7 +101,13 @@ module CloudMaker
 
     # Returns a Hash of all of the CloudMaker specific properties in the configuration.
     def to_hash
-      self.options.map {|key, properties| [key, properties["value"]]}
+      {
+        'cloud-maker' => self.options.map {|key, properties| [key, properties["value"]]},
+        'cloud-init' => self.cloud_config,
+        'include' => self.includes,
+        'import' => self.imports,
+        'extra-options' => self.extra_options
+      }
     end
 
     # Public: Generates a multipart userdata string suitable for use with Cloud Init on EC2
@@ -208,7 +211,7 @@ module CloudMaker
           raise "ERROR: The path to the CloudMaker config is incorrect"
         end
 
-        CloudMaker::Config.new(YAML::load(cloud_yaml), :config_path => full_path)
+        CloudMaker::Config.new(YAML::load(cloud_yaml), 'config_path' => full_path)
       end
     end
 

data/lib/cloud_maker/ec2.rb

@@ -6,8 +6,11 @@ module CloudMaker
     attr_accessor :aws_secret_access_key
     # Public: Gets/Sets the AWS secret.
     attr_accessor :aws_access_key_id
-    # Public: Gets/Sets the CloudMaker::Config
-    attr_accessor :config
+    # Internal: Gets/Sets the RightAws::Ec2 instance.
+    attr_accessor :ec2
+
+    # Public: The name of the tag that will be used to find the name of an s3 bucket for archiving/information retrieval
+    BUCKET_TAG = 's3_archive_bucket'
 
     # Public: Creates a new Ec2 instance
     #
@@ -19,45 +22,56 @@ module CloudMaker
     #
     # Returns a new CloudMaker::Ec2 instance
     # Raises RuntimeError if any of the required options are not specified
-    def initialize(cloud_maker_config, options)
+    def initialize(options)
       required_keys = [:aws_access_key_id, :aws_secret_access_key]
       unless (required_keys - options.keys).empty?
         raise RuntimeError.new("Instantiated #{self.class} without required attributes: #{required_keys - options.keys}.")
       end
 
-      self.config = cloud_maker_config
       self.aws_access_key_id = options[:aws_access_key_id]
       self.aws_secret_access_key = options[:aws_secret_access_key]
+
+      self.ec2 = RightAws::Ec2.new(self.aws_access_key_id, self.aws_secret_access_key)
+
+    end
+
+    def info(instance_id)
+      bucket = self.ec2.describe_tags(:filters => {'resource-id' => instance_id, 'key' => BUCKET_TAG}).first[:value]
+      archiver = S3Archiver.new(
+        :instance_id => instance_id,
+        :aws_access_key_id => self.aws_access_key_id,
+        :aws_secret_access_key => self.aws_secret_access_key,
+        :bucket_name => bucket
+      )
+      archiver.load_archive
     end
 
     # Public: Launches a new EC2 instance, associates any specified elastic IPS
     # with it, adds any specified tags, and archives the launch details to S3.
     #
     # Returns a RightAws supplied Hash describing the launched instance.
-    def launch
-      ec2 = RightAws::Ec2.new(self.aws_access_key_id, self.aws_secret_access_key)
-
-      user_data = self.config.to_user_data
+    def launch(cloud_maker_config)
+      user_data = cloud_maker_config.to_user_data
 
-      instance = ec2.launch_instances(config['ami'],
-        :group_names => config['security_group'],
-        :instance_type => config['instance_type'],
-        :key_name => config['key_pair'],
+      instance = ec2.launch_instances(cloud_maker_config['ami'],
+        :group_names => cloud_maker_config['security_group'],
+        :instance_type => cloud_maker_config['instance_type'],
+        :key_name => cloud_maker_config['key_pair'],
         :user_data => user_data
       ).first
 
       instance_id = instance[:aws_instance_id]
 
-      ec2.create_tags(instance_id, self.config["tags"]) if self.config["tags"]
+      ec2.create_tags(instance_id, cloud_maker_config["tags"]) if cloud_maker_config["tags"]
 
-      if (self.config["elastic_ip"])
+      if (cloud_maker_config["elastic_ip"])
         #we can't associate IPs while the state is pending
         while instance[:aws_state] == 'pending'
           #this is going to hammer EC2 a bit, it might be necessary to add some delay in here
           instance = ec2.describe_instances([instance_id]).first
         end
 
-        ec2.associate_address(instance_id, :public_ip => self.config["elastic_ip"])
+        ec2.associate_address(instance_id, :public_ip => cloud_maker_config["elastic_ip"])
 
         instance = ec2.describe_instances([instance_id]).first # So we get the correct IP address
       end
@@ -66,9 +80,9 @@ module CloudMaker
         :instance_id => instance_id,
         :aws_access_key_id => self.aws_access_key_id,
         :aws_secret_access_key => self.aws_secret_access_key,
-        :bucket_name => self.config["s3_archive_bucket"]
+        :bucket_name => cloud_maker_config["tags"][BUCKET_TAG]
       )
-      archiver.store_archive(self.config, instance)
+      archiver.store_archive(cloud_maker_config, instance)
 
       instance
     end

data/lib/cloud_maker/s3_archiver.rb

@@ -15,6 +15,10 @@ module CloudMaker
     # Public: All archive keys will be prefixed with KEY_PREFIX/
     KEY_PREFIX = "cloud-maker"
 
+    INSTANCE_YAML = 'instance.yaml'
+    CLOUD_CONFIG_YAML = 'cloud_config.yaml'
+
+
     # Public: Creates a new S3 Archiver instance
     #
     # options - S3 configuration options
@@ -48,8 +52,9 @@ module CloudMaker
     # Returns nothing.
     def store_archive(cloud_maker_config, instance)
       userdata = cloud_maker_config.to_user_data
-      self.bucket.put(self.key + "/user_data.cloud_config", userdata)
-      self.bucket.put(self.key + "/instance.yaml", instance.to_yaml)
+      self.bucket.put(self.user_data_key, userdata)
+      self.bucket.put(self.instance_yaml_key, instance.to_yaml)
+      self.bucket.put(self.cloud_config_yaml_key, cloud_maker_config.to_hash.to_yaml)
       true
     end
 
@@ -57,13 +62,33 @@ module CloudMaker
     #
     # Returns the content of the archive.
     def load_archive
-      self.bucket.get(self.key)
+      {
+        :user_data => self.bucket.get(self.user_data_key),
+        :cloud_config => YAML::load(self.bucket.get(self.cloud_config_yaml_key)),
+        :instance => YAML::load(self.bucket.get(self.instance_yaml_key))
+      }
     end
 
+    # Internal: Returns the key for the user_data file
+    def user_data_key
+      self.prefix_key('user_data')
+    end
+
+    # Internal: Returns the key for the instance yaml file
+    def instance_yaml_key
+      self.prefix_key('instance.yaml')
+    end
+
+    # Internal: Returns the key for the cloud config yaml file
+    def cloud_config_yaml_key
+      self.prefix_key('cloud_config.yaml')
+    end
+
+
     # Public: Returns the key that the archive will be stored under
-    def key
+    def prefix_key(key)
       if self.instance_id
-        [KEY_PREFIX, self.instance_id].join('/')
+        [KEY_PREFIX, self.instance_id, key].join('/')
       else
         raise RuntimeError.new("Attempted to generate a key name without an instance id.")
       end

data/lib/cloud_maker/shell_executor.rb

@@ -1,6 +1,7 @@
 module CloudMaker
-    class ShellExecutor
-    YAML_DOMAIN = "!airbnb.com,2012-07-19"
+  class ShellExecutor
+    #If we don't use yaml.org,2002 some YAML implementations don't pickup our !shell-script nodes properly.
+    YAML_DOMAIN = "yaml.org,2002"
     YAML_TYPE = "shell-script"
 
     attr_accessor :script

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0.pre2
+  prerelease: 6
 platform: ruby
 authors:
 - Nathan Baxter
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -76,6 +76,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nathan.baxter@airbnb.cloud-maker
 executables:
@@ -104,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24