linecook-gem 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efefc44a8a55a01bdec87e306d230cb9619591e3
-  data.tar.gz: 0191500a0c3afd6d77fe5993f25a98a3af0f7845
+  metadata.gz: 1abf2321c6f050ebebaff2cd97736d181c3438d3
+  data.tar.gz: e8482496017204409f513273352ac69b50d41295
 SHA512:
-  metadata.gz: 594899c26bf5f2e4b65f204c3599d24c72d85ea7511b1df44fe3b78baafe459ff681eb62622935bcabe0bf38d8d2a86ed0d262e14d5628f96c1f9300d7d33f1c
-  data.tar.gz: 0150a55af2e4973141ff36515526fed4815a7efe68dd81648253cbbb8162cac5c87ac29c8f8fdb2965447a451c6f6aceefcbe9f5d99f9dd485bc294d0a7ef73e
+  metadata.gz: 310b56ecc9861ab86f2ed209fe8d77b64571e3b9d664747f2f785754388595be636ca1d3fcabaaf620b5c62fc2bdd3c877e11a40dee8d4ea09af4d7fe03d47f0
+  data.tar.gz: b8a143904d6c6924cff355ebac678bae6abca2e0cac2de2ffd32698bfc58243c63b2fc73161b20d6601117ddfe977d9fd154cbb5ca5f9dc2ff2a8ff89f0e59aa

data/lib/linecook/cli.rb

@@ -63,10 +63,16 @@ class Image < Thor
     puts Linecook::ImageManager.url(image, **opts)
   end
 
-  desc 'package IMAGE', 'Package image'
-  method_options image: :string
-  def package(image)
-    Linecook::Packager.package(image)
+  desc 'package', 'Package image'
+  method_option :name, type: :string, required: false, banner: 'NAME', desc: 'Name of the image to snapshot. Specify this, or --latest with a type', aliases: '-n'
+  method_option :latest, type: :boolean, default: false, desc: 'Use the latest build for type', aliases: '-l'
+  method_option :ami, type: :boolean, default: true, desc: 'Create an ami', aliases: '-a'
+  method_option :type, type: :string, required: false, banner: 'ID', desc: 'Type of image to snapshot', aliases: '-t'
+  def package
+    fail 'Must specify image name or use latest' unless options[:name] || options[:latest]
+    fail 'Must specify type if specifying latest' if options[:latest] && !options[:type]
+    name = options[:latest] ? Linecook::ImageManager.latest(options[:type]) : options[:name]
+    Linecook::Packager.package(name, type: options[:type], ami: options[:ami])
   end
 end
 

data/lib/linecook/packager/ebs.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'open-uri'
 require 'timeout'
 require 'tmpdir'
+require 'securerandom'
 
 require 'linecook/util/ssh'
 require 'linecook/util/executor'
@@ -14,20 +15,24 @@ module Linecook
     class EBS
       include Executor
 
-      def initialize(hvm: true, size: 10, region: 'us-east-1')
+      def initialize(hvm: true, size: 10, region: nil, copy_regions: [], account_ids: [])
         @hvm = hvm
         @size = size
         @region = region
+        @copy_regions = copy_regions
+        @account_ids = account_ids
       end
 
-      def package(image, type: nil)
+      def package(image, type: nil, ami: nil)
         @image = image
+        @name = "#{File.basename(image).gsub('.squashfs', '').gsub('-decrypted', '')}-#{SecureRandom.hex(4)}"
         @type = type
         setup_remote unless instance_id
         prepare
         execute("tar -C #{@mountpoint} -cpf - . | sudo tar -C #{@root} -xpf -")
         finalize
         snapshot
+        create_ami if ami
       end
 
     private
@@ -44,7 +49,7 @@ module Linecook
         execute("echo \"UUID=\\\"$(blkid -o value -s UUID #{@rootdev})\\\" /               ext4            defaults  1 2\" > /tmp/fstab")
         execute("mv /tmp/fstab #{@root}/etc/fstab")
         chroot_exec('apt-get update')
-        chroot_exec('apt-get install -y --force-yes grub-pc grub-legacy-ec2')
+        chroot_exec('apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y --force-yes --no-upgrade install grub-pc grub-legacy-ec2')
         chroot_exec('update-grub')
         execute("grub-install --root-directory=#{@root} $(echo #{@rootdev} | sed \"s/[0-9]*//g\")") if @hvm
       end
@@ -83,10 +88,13 @@ module Linecook
         @availability_zone ||= metadata('placement/availability-zone')
       end
 
-      def client
+      def client(region: nil)
+        @client = nil if region
         @client ||= begin
+          region ||= @region
+          puts "Using AWS region #{region} for following request"
           credentials = Aws::Credentials.new(Linecook.config[:aws][:access_key], Linecook.config[:aws][:secret_key])
-          Aws::EC2::Client.new(region: @region, credentials: credentials)
+          Aws::EC2::Client.new(region: region, credentials: credentials)
         end
       end
 
@@ -125,11 +133,77 @@ module Linecook
         wait_for_state('available', 120) do
           client.describe_volumes(volume_ids: [@volume_id]).volumes.first.state
         end
-        resp = client.create_snapshot(volume_id: @volume_id, description: "Snapshot of #{File.basename(@image)}")
-        tag(resp.snapshot_id, Name: 'Linecook snapshot', image: File.basename(@image), hvm: @hvm.to_s)
+        resp = client.create_snapshot(volume_id: @volume_id, description: "Snapshot of #{@name}")
+        @snapshot_id = resp.snapshot_id
+        tag(@snapshot_id, Name: 'Linecook snapshot', image: @name, hvm: @hvm.to_s)
         client.delete_volume(volume_id: @volume_id)
       end
 
+      def create_ami
+
+        puts "Waiting for snapshot #{@snapshot_id} to be completed"
+        wait_for_state('completed', 900) do
+          client.describe_snapshots(snapshot_ids: [@snapshot_id]).snapshots.first.state
+        end
+
+        puts "Registering an AMI with for #{@name}"
+        options = {
+          name: @name,
+          virtualization_type: @hvm ? 'hvm' : 'paravirtual',
+          architecture: 'x86_64', # fixme
+          root_device_name: '/dev/sda1', # fixme when does this need to be sda?
+          block_device_mappings: [{
+            device_name: '/dev/sda1',
+            ebs: {
+              snapshot_id: @snapshot_id,
+              volume_size: @size,
+              volume_type: @hvm ? 'gp2' : 'standard', # fixme: support iops?
+              delete_on_termination: true,
+            }
+          }]
+        }
+        options.merge!({sriov_net_support: 'simple'}) if @hvm
+
+        resp = client.register_image(**options)
+        @ami_id = resp.image_id
+
+        wait_for_state('available', 300) do
+          client.describe_images(image_ids: [@ami_id]).images.first.state
+        end
+
+        amis = {
+          @region => @ami_id
+        }
+
+        @copy_regions.each do |region|
+          puts "Copying #{@ami_id} to #{region}"
+          resp = client(region: region).copy_image({
+            source_region: @region,
+            source_image_id: @ami_id,
+            name: @name,
+            description: "Copy of #{@name}",
+          })
+          ami = resp.image_id
+          puts "Waiting for #{ami} to become available in #{region}"
+          wait_for_state('available', 1800) do
+            client.describe_images(image_ids: [ami]).images.first.state
+          end
+          amis[region] = ami
+        end
+
+        unless @account_ids.empty?
+          amis.each do |region, ami|
+            puts "Updating account permissions for #{ami} in #{region}"
+            client(region: region).modify_image_attribute({
+              operation_type: 'add',
+              attribute: 'launchPermission',
+              image_id: ami,
+              user_ids: @account_ids
+            })
+          end
+        end
+      end
+
       def free_device
         prefix = device_prefix
         ('f'..'zzz').to_a.each do |suffix|

data/lib/linecook/packager/manager.rb

@@ -4,8 +4,8 @@ module Linecook
   module Packager
     extend self
 
-    def package(image, type: type)
-      provider.package(image, type: type)
+    def package(image, type: type, **args)
+      provider.package(image, type: type, **args)
     end
 
   private

data/lib/linecook/util/config.rb

@@ -58,7 +58,9 @@ module Linecook
         ebs: {
           hvm: true,
           size: 10,
-          region: 'us-east-1'
+          region: 'us-east-1',
+          copy_regions: [],
+          account_ids: []
         }
       },
       roles: {

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dale Hamel
@@ -192,6 +192,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rbnacl-libsodium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement