roark 0.0.1 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.0 (06/18/2013):
+
+* Sanitize stack name to remove invalid characters.
+* Add authorize option to CLI.
+
 ## 0.0.1 (06/14/2013):
 
 * initial release

data/README.md

@@ -6,6 +6,8 @@ Howard Roark, master architect and builder of AMIs.
 
 ## Overview
 
+Roark was built to solve the challenge of automating AMI builds across multiple AWS accounts and regions.
+
 * Roark builds AMIs from an Instance created by a Cloud Formation Stack.
 * Roark expects to be provided with a Cloud Formation Template that can be used to create this stack.
 * This template should create an Instance that is fully configured at bootstrap (via userdata, CloudInit, etc).
@@ -41,7 +43,9 @@ Create AMI
                  -r AWS_REGION \
                  -t PATH_TO_CLOUD_FORMATION_TEMPLATE \
                  -p 'Parameter1=value1' \
-                 -p 'Parameter2=value2'
+                 -p 'Parameter2=value2' \
+                 -a '123456789012' \
+                 -a '123456789013'
 
 Destroy AMI
 

data/lib/roark/ami.rb

@@ -110,6 +110,15 @@ module Roark
       end
     end
 
+    def authorize_account_ids(account_ids)
+      begin
+        authorize account_ids
+      rescue AWS::Errors::Base => e
+        return Response.new :code => 1, :message => e.message
+      end
+      Response.new :code => 0, :message => 'Authorizations completed successfully.'
+    end
+
     def available?
       state == :available
     end
@@ -132,14 +141,26 @@ module Roark
 
     private
 
+    def instance_name
+      @name.downcase.gsub /[^a-zA-Z0-9\-]/, '-'
+    end
+
+    def authorize(account_ids)
+      ec2_ami_authorizations.add :ami_id => @ami_id, :account_ids => account_ids
+    end
+
     def instance
-      @instance ||= Instance.new :aws => @aws, :name => @name
+      @instance ||= Instance.new :aws => @aws, :name => instance_name
     end
 
     def ec2_ami_state
       @ec2_ami_state ||= Roark::Aws::Ec2::AmiState.new @aws
     end
 
+    def ec2_ami_authorizations
+      @ec2_ami_authorizations ||= Roark::Aws::Ec2::AmiAuthorizations.new @aws
+    end
+
     def ec2_destroy_ami
       @ec2_destroy_ami ||= Roark::Aws::Ec2::DestroyAmi.new @aws
     end

data/lib/roark/ami_create_workflow.rb

@@ -2,15 +2,16 @@ module Roark
   class AmiCreateWorkflow
 
     def initialize(args)
-      @ami        = args[:ami]
-      @parameters = args[:parameters]
-      @template   = args[:template]
-      @logger     = Roark.logger
+      @account_ids = args[:account_ids]
+      @ami         = args[:ami]
+      @parameters  = args[:parameters]
+      @template    = args[:template]
+      @logger      = Roark.logger
     end
 
     def execute
       %w(create_instance wait_for_instance stop_instance wait_for_instance_to_stop
-         create_ami wait_for_ami destroy_instance).each do |m|
+         create_ami wait_for_ami destroy_instance authorize_account_ids).each do |m|
         response = self.send m.to_sym
         return response unless response.success?
       end
@@ -19,7 +20,7 @@ module Roark
 
     def create_instance
       @ami.create_instance :parameters => @parameters,
-                             :template   => @template
+                           :template   => @template
     end
 
     def wait_for_instance
@@ -46,5 +47,9 @@ module Roark
       @ami.destroy_instance
     end
 
+    def authorize_account_ids
+      @ami.authorize_account_ids @account_ids
+    end
+
   end
 end

data/lib/roark/aws/connection.rb

@@ -10,16 +10,18 @@ module Roark
         @region            = args[:region]
       end
 
+      def config
+        { :access_key_id     => @access_key_id,
+          :secret_access_key => @secret_access_key,
+          :region            => @region }
+      end
+
       def cf
-        @cf ||= AWS::CloudFormation.new :access_key_id     => @access_key_id,
-                                        :secret_access_key => @secret_access_key,
-                                        :region            => @region
+        @cf ||= AWS::CloudFormation.new config
       end
 
       def ec2
-        @ec2 ||= AWS::EC2.new :access_key_id     => @access_key_id,
-                              :secret_access_key => @secret_access_key,
-                              :region            => @region
+        @ec2 ||= AWS::EC2.new config
       end
 
     end

data/lib/roark/aws/ec2/ami_authorizations.rb

@@ -0,0 +1,26 @@
+module Roark
+  module Aws
+    module Ec2
+      class AmiAuthorizations
+
+        def initialize(connection)
+          @connection = connection
+          @logger     = Roark.logger
+        end
+
+        def add(args)
+          account_ids = args[:account_ids]
+          ami_id      = args[:ami_id]
+
+          ami         = @connection.ec2.images[ami_id]
+
+          account_ids.each do |a|
+            @logger.info "Authorizing account '#{a}'."
+            ami.permissions.add a
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/roark/aws/ec2.rb

@@ -1,4 +1,5 @@
 require 'roark/aws/ec2/ami_state'
+require 'roark/aws/ec2/ami_authorizations'
 require 'roark/aws/ec2/create_ami'
 require 'roark/aws/ec2/destroy_ami'
 require 'roark/aws/ec2/instance_status'

data/lib/roark/cli/create.rb

@@ -5,7 +5,7 @@ module Roark
       include Shared
 
       def initialize
-        @options = { :parameters => {}, :region => 'us-east-1' }
+        @options = { :account_ids => [], :parameters => {}, :region => 'us-east-1' }
         @logger  = Roark.logger
       end
 
@@ -14,6 +14,8 @@ module Roark
 
         validate_required_options [:name, :template]
 
+        validate_account_ids_format
+
         unless File.exists? @options[:template]
           @logger.error "Template #{@options[:template]} does not exist."
           exit 1
@@ -23,9 +25,10 @@ module Roark
 
         ami = Roark::Ami.new :aws => aws, :name => @options[:name]
 
-        ami_create_workflow = Roark::AmiCreateWorkflow.new :ami      => ami,
-                                                           :template   => template,
-                                                           :parameters => @options[:parameters]
+        ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @options[:account_ids],
+                                                           :ami         => ami,
+                                                           :template    => template,
+                                                           :parameters  => @options[:parameters]
         response = ami_create_workflow.execute
 
         unless response.success?
@@ -40,6 +43,10 @@ module Roark
         OptionParser.new do |opts|
           opts.banner = "Usage: roark create [options]"
 
+          opts.on("-a", "--account_id [ACCOUNT_ID]", "AWS Account ID to Authorize. Can be specified multiple times.") do |o|
+            @options[:account_ids] << o
+          end
+
           opts.on("-n", "--name [NAME]", "Name of AMI") do |o|
             @options[:name] = o
           end

data/lib/roark/cli/shared.rb

@@ -10,6 +10,15 @@ module Roark
         end
       end
 
+      def validate_account_ids_format
+        @options[:account_ids].each do |a|
+          unless a =~ /^[0-9]{12}$/
+            @logger.error "Account '#{a}' invalid. IDs must be 12 digits without dashes."
+            exit 1
+          end
+        end
+      end
+
       def command_name
         self.class.name.split('::').last.downcase
       end

data/lib/roark/version.rb

@@ -1,3 +1,3 @@
 module Roark
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/ami_create_workflow_spec.rb

@@ -7,9 +7,11 @@ describe Roark::AmiCreateWorkflow do
     Roark.logger logger_stub
     Roark.logger.stub :info => true
     @ami_mock            = mock 'ami mock'
-    @ami_create_workflow = Roark::AmiCreateWorkflow.new :ami        => @ami_mock,
-                                                        :parameters => { 'key' => 'val' },
-                                                        :template   => 'template'
+    @account_ids = ['123456789012', '123456789013']
+    @ami_create_workflow = Roark::AmiCreateWorkflow.new :account_ids => @account_ids,
+                                                        :ami         => @ami_mock,
+                                                        :parameters  => { 'key' => 'val' },
+                                                        :template    => 'template'
   end
 
   it "should create and execute a new workflow" do
@@ -22,6 +24,7 @@ describe Roark::AmiCreateWorkflow do
     @ami_mock.should_receive(:create_ami).and_return @response_stub
     @ami_mock.should_receive(:wait_for_ami).and_return @response_stub
     @ami_mock.should_receive(:destroy_instance).and_return @response_stub
+    @ami_mock.should_receive(:authorize_account_ids).with(@account_ids).and_return @response_stub
     expect(@ami_create_workflow.execute.success?).to be_true
   end
 

data/spec/ami_spec.rb

@@ -8,7 +8,7 @@ describe Roark::Ami do
     @aws_mock = mock "aws connection mock"
     @aws_mock.stub :region => 'us-west-1'
     init_args = { :aws    => @aws_mock,
-                  :name   => 'test-ami' }
+                  :name   => 'Intu_BaselineImage.1.2.3' }
 
     @ami = Roark::Ami.new init_args
   end
@@ -18,7 +18,7 @@ describe Roark::Ami do
       @instance_mock = mock 'instance mock'
       Roark::Instance.should_receive(:new).
                       with(:aws  => @aws_mock,
-                           :name => 'test-ami').
+                           :name => 'intu-baselineimage-1-2-3').
                       and_return @instance_mock
       @instance_mock.stub :instance_id => 'i-1234abcd'
     end
@@ -212,6 +212,21 @@ describe Roark::Ami do
         expect(@ami.destroy.success?).to be_true
       end
     end
+    
+    describe "#authorize_account_ids" do
+      it "should call authorize with the given account ids" do
+        @ami.ami_id = 'ami-12345678'
+        account_ids = ['123456789012']
+        ec2_ami_authorizations_mock = mock 'ami authorizations'
+        Roark::Aws::Ec2::AmiAuthorizations.should_receive(:new).
+                                           with(@aws_mock).
+                                           and_return ec2_ami_authorizations_mock
+        ec2_ami_authorizations_mock.should_receive(:add).
+                                    with :ami_id      => "ami-12345678",
+                                         :account_ids => account_ids
+        expect(@ami.authorize_account_ids(account_ids).success?).to be_true
+      end
+    end
   end
 
 end

data/spec/aws/connection_spec.rb

@@ -23,4 +23,5 @@ describe Roark::Aws::Connection do
       expect(@connection.ec2).to eq(ec2_mock)
     end
   end
+
 end

data/spec/aws/ec2/ami_authorizations_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Roark::Aws::Ec2::AmiAuthorizations do
+
+  describe "#add" do
+    it "should authorize an array of account ids to an ami" do
+      Roark.logger stub 'logger stub'
+      Roark.logger.stub :info => true, :warn => true
+      account_ids      = ['123456789012', '123456789013']
+      permissions_mock = mock 'permissions'
+      image_stub       = stub 'image', :permissions => permissions_mock
+      images_stub      = stub :images => { 'ami-12345678' => image_stub }
+      connection_stub  = stub 'connection', :ec2 => images_stub
+      account_ids.each { |account_id| permissions_mock.should_receive(:add).with(account_id) }
+      @authorize_ami = Roark::Aws::Ec2::AmiAuthorizations.new connection_stub
+      @authorize_ami.add :ami_id      => 'ami-12345678',
+                         :account_ids => account_ids
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roark
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70138264485580 !ruby/object:Gem::Requirement
+  requirement: &70191115678740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70138264485580
+  version_requirements: *70191115678740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70138264485160 !ruby/object:Gem::Requirement
+  requirement: &70191115678320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138264485160
+  version_requirements: *70191115678320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70138264484700 !ruby/object:Gem::Requirement
+  requirement: &70191115677860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138264484700
+  version_requirements: *70191115677860
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70138264484200 !ruby/object:Gem::Requirement
+  requirement: &70191115677360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: 1.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *70138264484200
+  version_requirements: *70191115677360
 description: Library and CLI to build AMIs from Instances created via Cloud Formation.
 email:
 - brett@weav.net
@@ -83,6 +83,7 @@ files:
 - lib/roark/aws/cloud_formation/stack_status.rb
 - lib/roark/aws/connection.rb
 - lib/roark/aws/ec2.rb
+- lib/roark/aws/ec2/ami_authorizations.rb
 - lib/roark/aws/ec2/ami_state.rb
 - lib/roark/aws/ec2/create_ami.rb
 - lib/roark/aws/ec2/destroy_ami.rb
@@ -101,6 +102,7 @@ files:
 - spec/ami_spec.rb
 - spec/aws/cloud_formation/create_stack_spec.rb
 - spec/aws/connection_spec.rb
+- spec/aws/ec2/ami_authorizations_spec.rb
 - spec/aws/ec2/ami_state_spec.rb
 - spec/aws/ec2/create_ami_spec.rb
 - spec/aws/ec2/destroy_ami_spec.rb
@@ -124,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3230223580493760541
+      hash: -2496970937823058822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3230223580493760541
+      hash: -2496970937823058822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -145,6 +147,7 @@ test_files:
 - spec/ami_spec.rb
 - spec/aws/cloud_formation/create_stack_spec.rb
 - spec/aws/connection_spec.rb
+- spec/aws/ec2/ami_authorizations_spec.rb
 - spec/aws/ec2/ami_state_spec.rb
 - spec/aws/ec2/create_ami_spec.rb
 - spec/aws/ec2/destroy_ami_spec.rb