cloud-maker 0.3.0 → 0.4.0

data/bin/cloud-maker

@@ -4,6 +4,17 @@ require 'cloud-maker'
 class CloudMakerCLI < Thor
   include Thor::Actions
 
+  CONFIG_PATH = '~/.cloud-maker.yaml'
+
+  def initialize(*args)
+    super
+    begin
+      @global_options = YAML::load(File.open(File.expand_path(CONFIG_PATH)))
+    rescue
+      @global_options = {}
+    end
+  end
+
   map "--version" => :version, "-v" => :version
 
   desc "user_data [INSTANCE_CONFIG_YAML]", "Generate the Cloud Init user data for an instance described by INSTANCE_CONFIG_YAML"
@@ -28,6 +39,37 @@ class CloudMakerCLI < Thor
     say "cloud-maker #{Gem::Specification.find_by_name('cloud-maker').version.version}"
   end
 
+  desc "authorize_github", "Fetch an API authorization token from github."
+  def authorize_github
+    say "This will generate an OAuth token for use when fetching #{"github://".cyan} urls. It will be saved in #{CONFIG_PATH.cyan}."
+    say "You can remove this authorization from the GitHub interface if needed."
+    say "Your password will not be saved to disk.".green
+    user = ask("What is your GitHub #{"username".cyan}?")
+    password = ask("What is your GitHub #{"password".cyan}?")
+    begin
+      response = JSON.parse(RestClient::Request.new(
+        :method => "POST",
+        :url => 'https://api.github.com/authorizations',
+        :user => user,
+        :password => password,
+        :payload => {
+          :note => "CloudMaker",
+          :note_url => "https://github.com/airbnb/cloud-maker",
+          :scopes => ["repo"]
+        }.to_json,
+        :headers => {
+          :content_type => 'application/json'
+        }
+      ).execute)
+      @global_options['github_token'] = response["token"]
+      save_options!
+      say "Your GitHub credentials have been successfully updated.".green
+    rescue Exception => e
+      say e.to_s.red
+      say "Your GitHub credentials could not be updated.".red
+    end
+  end
+
   desc "terminate [AWS_INSTANCE_ID]", "Terminate the specified AWS instance"
   method_option :aws_access_key_id,
     :desc => "Your AWS access key id",
@@ -167,8 +209,32 @@ class CloudMakerCLI < Thor
     puts
   end
 
+  def save_options!
+    path = File.expand_path(CONFIG_PATH)
+    File.open(path, 'w+') {|f| f.write(@global_options.to_yaml)}
+  end
+
   def build_config(instance_config_yaml, options)
-    config = CloudMaker::Config.from_yaml(instance_config_yaml, 'import_ec2' => true)
+    begin
+      config = CloudMaker::Config.from_yaml(instance_config_yaml, 'import_ec2' => true, 'github_token' => @global_options['github_token'])
+    rescue CloudMaker::Config::GitHubContentNotFound => e
+      say e.to_s.red
+      if @global_options['github_token']
+        say "You do have GitHub OAuth configured, however you can redo the configuration if the current OAuth token is no longer valid.".yellow
+      else
+        say "You don't have a GitHub OAuth token configured, if this is a private repo doing so is necessary.".yellow
+      end
+      if yes?("Would you like to configure OAuth and retry now?")
+        authorize_github
+        retry
+      else
+        exit 1
+      end
+    rescue Exception => e
+      say e.to_s.red
+      exit 1
+    end
+
     options.set.each_pair {|key, val| config[key] = val}
 
     config['tags'] ||= {}

data/lib/cloud-maker.rb

@@ -1,8 +1,10 @@
+require 'json'
 require 'yaml'
 require 'thor'
 require 'colorize'
 require 'deep_merge'
 require 'aws-sdk'
+require 'rest-client'
 
 require 'cloud_maker/config'
 require 'cloud_maker/ec2'

data/lib/cloud_maker/config.rb

@@ -1,5 +1,19 @@
 module CloudMaker
   class Config
+    class ContentNotFound < RuntimeError
+      attr_accessor :path
+      def initialize(message, path)
+        super(message)
+        self.path = path
+      end
+    end
+    class GitHubContentNotFound < ContentNotFound
+    end
+    class HTTPContentNotFound < ContentNotFound
+    end
+    class FileContentNotFound < ContentNotFound
+    end
+
     # Public: Gets/Sets the CloudMaker specific properties. The options hash
     # is formatted as:
     #    {
@@ -84,9 +98,23 @@ module CloudMaker
       self.cloud_config = cloud_config
 
       self.import(self.class.new(EC2::CLOUD_MAKER_CONFIG)) if (extra_options['import_ec2'])
+
+      # It's important here that reverse duplicates the imports array as executing the import will
+      # add the imported configs imports to the list and we do NOT want to reimport those as well.
       self.imports.reverse.each do |import_path|
-        self.import(self.class.from_yaml(import_path))
+        self.import(self.class.from_yaml(import_path, self.extra_options))
       end
+      self['tags'] ||= {}
+      self['tags']['cloud_maker_config'] = self.config_name
+    end
+
+    def config_name
+      files = self.imports.dup
+      files.push self.extra_options['config_path'] if self.extra_options['config_path']
+
+      files.reverse.map { |import|
+        import[import.rindex('/')+1..-1].gsub(/\..*/, '').gsub(/[^\w]/, '-')
+      }.join(':')
     end
 
     # Public: Check if the CloudMaker config is in a valid state.
@@ -208,14 +236,42 @@ module CloudMaker
       # options - Any options to pass through as options to CloudMaker::Config::initialize
       #
       # Returns a new Config
-      # Raises: Exception if the file doesn't exist.
+      # Raises: GitHubContentNotFound, HTTPContentNotFound, or FileContentNotFound if the file doesn't exist.
       # Raises: SyntaxError if the YAML file is invalid.
       def from_yaml(instance_config_yaml, options={})
-        begin
-          full_path = File.expand_path(instance_config_yaml)
-          cloud_yaml = File.open(full_path, "r") #Right_AWS will base64 encode this for us
-        rescue
-          raise "ERROR: The path to the CloudMaker config is incorrect"
+        if instance_config_yaml =~ /\Agithub:\/\//
+          begin
+            user, repo, *path = instance_config_yaml.split('/')[2..-1]
+            begin
+              if options['github_token']
+                response = RestClient.get(
+                  "https://api.github.com/repos/#{user}/#{repo}/contents/#{path.join('/')}",
+                  "Authorization" => "token #{options['github_token']}"
+                )
+              else
+                response = RestClient.get("https://api.github.com/repos/#{user}/#{repo}/contents/#{path.join('/')}")
+              end
+              cloud_yaml = Base64.decode64(JSON.parse(response)['content'])
+            rescue
+              raise GitHubContentNotFound.new(
+                "Unable to access the configuration #{instance_config_yaml} from GitHub.",
+                instance_config_yaml
+              )
+            end
+          end
+        elsif instance_config_yaml =~ /\Ahttps?:\/\//
+          begin
+            cloud_yaml = RestClient.get(instance_config_yaml)
+          rescue
+            raise HTTPContentNotFound.new("Unable to access the configuration via HTTP from #{instance_config_yaml}.", instance_config_yaml)
+          end
+        else
+          begin
+            full_path = File.expand_path(instance_config_yaml)
+            cloud_yaml = File.open(full_path, "r") #Right_AWS will base64 encode this for us
+          rescue
+            raise FileContentNotFound.new("Unable to access the configuration via your local file system from #{full_path}.", instance_config_yaml)
+          end
         end
 
         # loading a blank config file returns false, it's an odd degenerate case but handling
@@ -340,6 +396,7 @@ module CloudMaker
     def import(cloud_maker_config)
       self.options = cloud_maker_config.options.deep_merge!(self.options)
       self.includes = cloud_maker_config.includes.concat(self.includes).uniq
+      self.imports = cloud_maker_config.imports.concat(self.imports).uniq
       self.cloud_config = cloud_maker_config.cloud_config.deep_merge!(self.cloud_config)
       self.extra_options = cloud_maker_config.extra_options.deep_merge!(self.extra_options)
     end

data/lib/cloud_maker/ec2.rb

@@ -100,7 +100,6 @@ module CloudMaker
       else
         region = ec2 # .instances.create will just put things in the default region
       end
-
       instance = region.instances.create(
         :image_id => cloud_maker_config['ami'],
         :security_groups => cloud_maker_config['security_group'],
@@ -110,7 +109,7 @@ module CloudMaker
         :user_data => user_data
       )
 
-      instance.tags.set(cloud_maker_config["tags"]) if cloud_maker_config["tags"]
+      instance.tags.set(cloud_maker_config['tags']) if cloud_maker_config['tags']
       instance.associate_elastic_ip(cloud_maker_config["elastic_ip"]) if cloud_maker_config["elastic_ip"]
 
       archiver = S3Archiver.new(
@@ -174,7 +173,8 @@ module CloudMaker
           :private_ip_address => instance.private_ip_address,
           :key_name => instance.key_name,
           :owner_id => instance.owner_id,
-          :status => instance.status
+          :status => instance.status,
+          :tags => instance.tags.inject({}) {|hash, tag| hash[tag.first] = tag.last;hash}
         }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -128,5 +128,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Launch and perform initial configuration of cloud servers.
+summary: Extends Ubuntu CloudInit to launch and configure cloud servers.
 test_files: []