minimal_pipeline 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a7beb45dfb7e0a657c774954190584c229ad24a18c2a9b01f826e7fa5a82ed
-  data.tar.gz: 6c4e7688bbf2ae12adeb7f61efa5bea777a2309c8c7571fd2fd3ce40d3dd3a4b
+  metadata.gz: 3dae73303640fdffd715b9d7f67ea9b9f7ecd855dd0ef75d04e1d46eae07571e
+  data.tar.gz: d0c95d8d34c210e872ab6ae0fe93e8e56d5b3287229e56a04f82a97d690e007b
 SHA512:
-  metadata.gz: 0a25fb8ad3faca11eb95fbf44a8adbd187a054462eaf67fcdedda03ecca563dbe78c7969df4def3cfa4cea17425c85cfcaaa1a4f8356df5c63286d4567446ea5
-  data.tar.gz: 97a78ae2cd3bcc02c2e4a7f57eb2e83ea845dd082934150176e09e2c4f8937184b6cf44a793b143d54d952c1573e6a409c737c7b3cc09968583c477645c02591
+  metadata.gz: 4da91ca383ed709da049eb0b843bfd21066797ed5d0b5ce9126074547c88d03ec7755de2512a4bc51c235069b5b0b7fdb3ac519be99d12ca4fe120e84a58aea9
+  data.tar.gz: c2a9d49ce298448bf6a41131bd7394ee04c231fa0d5918eaf79af51bb6123c8576f372f1e625826175ae091d045388982eb0efed145b4dcd9f60e01a06f00a68

data/lib/minimal_pipeline/ec2.rb

@@ -17,15 +17,10 @@ class MinimalPipeline
   class Ec2
     # Initializes a `Ec2` client
     # Requires environment variables `AWS_REGION` or `region` to be set.
-    # Also requires `keystore_table` and `keystore_kms_id`
     def initialize
       raise 'You must set env variable AWS_REGION or region.' \
         if ENV['AWS_REGION'].nil? && ENV['region'].nil?
-      raise 'You must set env variable keystore_kms_id.' \
-        if ENV['inventory_store_key'].nil? && ENV['keystore_kms_id'].nil?
-
       @region = ENV['AWS_REGION'] || ENV['region']
-      @kms_key_id = ENV['keystore_kms_id'] || ENV['inventory_store_key']
       @client = Aws::EC2::Client.new(region: 'us-east-1')
     end
 
@@ -43,15 +38,18 @@ class MinimalPipeline
     # Create a copy of an existing snapshot
     #
     # @param snapshot_id [String] The ID of the snapshot to copy
+    # @param kms_key_id [String] The ID of the KMS key. Omit to use default
     # @param encrypted [Boolean] Whether or not the volume is encrypted
     # @return [String] The ID of the newly created snapshot
-    def copy_snapshot(snapshot_id, encrypted = true)
-      new_snapshot_id = @client.copy_snapshot(
+    def copy_snapshot(snapshot_id, kms_key_id = nil, encrypted = true)
+      params = {
         encrypted: encrypted,
-        kms_key_id: @kms_key_id,
         source_region: @region,
         source_snapshot_id: snapshot_id
-      ).snapshot_id
+      }
+      params[:kms_key_id] = kms_key_id if kms_key_id
+
+      new_snapshot_id = @client.copy_snapshot(params).snapshot_id
 
       puts "new snapshot ID: #{new_snapshot_id}"
       wait_for_snapshot(new_snapshot_id)
@@ -76,8 +74,9 @@ class MinimalPipeline
     #
     # @param ami_id [String] The ID of the AMI to prepare
     # @param account_id [String] The ID of the AWS account to prepare
+    # @param kms_key_id [String] The ID of the KMS key. Omit to use default
     # @return [Array] Block device mappings discovered from the AMI
-    def prepare_snapshots_for_account(ami_id, account_id)
+    def prepare_snapshots_for_account(ami_id, account_id, kms_key_id = nil)
       images = @client.describe_images(image_ids: [ami_id])
       block_device_mappings = images.images[0].block_device_mappings
       new_mappings = []
@@ -85,7 +84,7 @@ class MinimalPipeline
       block_device_mappings.each do |mapping|
         snapshot_id = mapping.ebs.snapshot_id
         puts "old snapshot ID: #{snapshot_id}"
-        new_snapshot_id = copy_snapshot(snapshot_id)
+        new_snapshot_id = copy_snapshot(snapshot_id, kms_key_id)
         puts 'modifying new snapshot attribute'
         unlock_ami_for_account(new_snapshot_id, account_id)
         puts "new snapshot has been modified for the #{account_id} account"
@@ -118,13 +117,14 @@ class MinimalPipeline
     # Copy the snapshots from the original account into the new one
     #
     # @params block_device_mappings [Array] Block device mappings with snapshots
+    # @param kms_key_id [String] The ID of the KMS key. Omit to use default
     # @return [Array] Block device mappings with updated snapshot ids
-    def copy_snapshots_in_new_account(block_device_mappings)
+    def copy_snapshots_in_new_account(block_device_mappings, kms_key_id = nil)
       new_mappings = []
 
       block_device_mappings.each do |mapping|
         snapshot_id = mapping['ebs']['snapshot_id']
-        new_snapshot_id = copy_snapshot(snapshot_id)
+        new_snapshot_id = copy_snapshot(snapshot_id, kms_key_id)
         mapping['ebs']['snapshot_id'] = new_snapshot_id
         mapping['ebs'].delete('encrypted')
         new_mappings << mapping

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimal_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mayowa Aladeojebi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk