hashicorptools 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a352203b9237ad1070e5fb6268a6ef6575a88d6bf9e016e62850a78b8f2fd6
-  data.tar.gz: 7f0bb691aff8809d32bd1ba4fd52eb9818d67d4afd5f99af7f8c08b9ae4f1b7c
+  metadata.gz: 254a2ff3deed5490e6c62c5b07dcddd20f60488e4f9dca3821ee931363ce37cc
+  data.tar.gz: 1e8f691dfb3e803620e949651c8a2a68c871f783182c7bf48c07a247d404e99c
 SHA512:
-  metadata.gz: 793c19ae4a5464798edbd1ef56b74bf11af0829a4795b47637ac5eb712bc9c34fe18dd60cfe742a24cfec52c6fa78382de02248825038cc5d10e9a057ced865c
-  data.tar.gz: 76c73130b8b95dcd318b5c25be3736e682673bc660c450321787dac1b14c2925dc6374693831b032e210b4a26c166ab74f11222e0ed42a2a9aa385d27f8e064d
+  metadata.gz: c48cdfba1b075d54763e14930b200cc89c7926e7d4ec6fabaf8cc3b64f7e4b87076944910ca21c07960522d126134a5c5a94db83d2c4988a6f19907b195f71ab
+  data.tar.gz: 2155084c9795853030119225cd7534e710870c9f3bba04ee97d44852e2583d9d3009e0298c27eef8d953dc42d67f8b087deb5b41d1177a02ecfd8877f655624c

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/hashicorptools.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hashicorptools 0.3.0 ruby lib
+# stub: hashicorptools 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Woodhull".freeze]
-  s.date = "2020-06-18"
+  s.date = "2020-07-17"
   s.description = "Wrappers for terraform and packer".freeze
   s.email = "systems@controlshiftlabs.com".freeze
   s.executables = ["ec2_host".freeze]
@@ -44,41 +44,27 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/hashicorptools".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "Wrappers for terraform and packer".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws-sdk>.freeze, ["~> 2"])
-      s.add_runtime_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])
-      s.add_runtime_dependency(%q<aws-sdk-v1>.freeze, ["~> 1.67"])
-      s.add_runtime_dependency(%q<dotenv>.freeze, ["~> 2.2", ">= 2.2.1"])
-      s.add_runtime_dependency(%q<thor>.freeze, ["= 0.20.0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 5.1", ">= 5.1.4"])
-      s.add_runtime_dependency(%q<byebug>.freeze, ["~> 10.0", ">= 10.0.2"])
-      s.add_runtime_dependency(%q<git>.freeze, ["~> 1.3"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.7"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])
-      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.7"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
-      s.add_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])
-      s.add_dependency(%q<aws-sdk-v1>.freeze, ["~> 1.67"])
-      s.add_dependency(%q<dotenv>.freeze, ["~> 2.2", ">= 2.2.1"])
-      s.add_dependency(%q<thor>.freeze, ["= 0.20.0"])
-      s.add_dependency(%q<activesupport>.freeze, ["~> 5.1", ">= 5.1.4"])
-      s.add_dependency(%q<byebug>.freeze, ["~> 10.0", ">= 10.0.2"])
-      s.add_dependency(%q<git>.freeze, ["~> 1.3"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.7"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.7"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+    s.add_runtime_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])
+    s.add_runtime_dependency(%q<aws-sdk-v1>.freeze, ["~> 1.67"])
+    s.add_runtime_dependency(%q<dotenv>.freeze, ["~> 2.2", ">= 2.2.1"])
+    s.add_runtime_dependency(%q<thor>.freeze, ["= 0.20.0"])
+    s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 5.1", ">= 5.1.4"])
+    s.add_runtime_dependency(%q<byebug>.freeze, ["~> 10.0", ">= 10.0.2"])
+    s.add_runtime_dependency(%q<git>.freeze, ["~> 1.3"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.7"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])
+    s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.7"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
     s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
     s.add_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])

data/lib/hashicorptools/code_deploy.rb

@@ -58,19 +58,11 @@ module Hashicorptools
       # We set defaults (depending on environment) for aws_regions if not passed in
       aws_regions = options[:aws_regions] || default_regions
 
-      # TODO restore defaulting branch to the default branch (and remove below check)
-      # once all the repos have the same default branch name of `main`
-      # Currently, `agra` is using `master` while other apps are using `main`.
-      # and we are unable to detect what the default branch is
-      # via the git client here.
-      if options[:commit].nil? && options[:branch].nil?
-        raise 'You must supply either commit or branch to deploy'
-      end
-
       commit = if options[:commit].present?
                  g.gcommit(options[:commit])
                else
-                 g.checkout(options[:branch].to_sym)
+                 branch = options[:branch].nil? ? :main : options[:branch].to_sym
+                 g.checkout(branch)
                  g.log.first
                end
 

data/lib/hashicorptools/packer.rb

@@ -33,7 +33,7 @@ module Hashicorptools
 
     desc "list", "list all available amis"
     def list
-      amis.each do |ami|
+      amis_in_region(region).each do |ami|
         puts ami.image_id
       end
     end
@@ -129,39 +129,49 @@ module Hashicorptools
       'us-east-1'
     end
 
-    def auto_scaling
-      @auto_scaling ||= Aws::AutoScaling::Client.new(region: region)
+    def auto_scaling(client_region=region)
+      @auto_scaling ||= Aws::AutoScaling::Client.new(region: client_region)
     end
 
-    def ec2_v2
-      @ec2 ||= Aws::EC2::Client.new(region: region)
+    def ec2_v2(client_region=region)
+      @ec2 ||= Aws::EC2::Client.new(region: client_region)
     end
 
-    def amis_in_use
-      launch_configs = auto_scaling.describe_launch_configurations
+    def amis_in_use(client_region)
+      launch_configs = auto_scaling(client_region).describe_launch_configurations
       image_ids = launch_configs.data['launch_configurations'].collect{|lc| lc.image_id}.flatten
 
-      ec2_reservations = ec2_v2.describe_instances
+      ec2_reservations = ec2_v2(client_region).describe_instances
       image_ids << ec2_reservations.reservations.collect{|res| res.instances.collect{|r| r.image_id}}.flatten
       image_ids.flatten
     end
 
+    def ami_regions
+      ['us-east-1', 'eu-central-1']
+    end
+
     def clean_amis
-      ami_ids = amis.collect{|a| a.image_id}
-      ami_ids_to_remove = ami_ids - amis_in_use
-      potential_amis_to_remove = amis
+      ami_regions.each do |ami_region|
+        clean_amis_for_region(ami_region)
+      end
+    end
+
+    def clean_amis_for_region(region_to_clean)
+      ami_ids = amis_in_region(region_to_clean).collect{|a| a.image_id}
+      ami_ids_to_remove = ami_ids - amis_in_use(region_to_clean)
+      potential_amis_to_remove = amis_in_region(region_to_clean)
       potential_amis_to_remove.keep_if {|a| ami_ids_to_remove.include?(a.image_id) }
 
       if potential_amis_to_remove.size > NUMBER_OF_AMIS_TO_KEEP
         amis_to_remove = potential_amis_to_remove[NUMBER_OF_AMIS_TO_KEEP..-1]
         amis_to_keep = potential_amis_to_remove[0..(NUMBER_OF_AMIS_TO_KEEP-1)]
 
-        puts "Deregistering old AMIs..."
+        puts "Deregistering old AMIs in #{region_to_clean}..."
         amis_to_remove.each do |ami|
           ebs_mappings = ami.block_device_mappings
           puts "Deregistering #{ami.image_id}"
           ami.deregister
-          delete_ami_snapshots(ebs_mappings)
+          delete_ami_snapshots(ebs_mappings, snapshot_region: region_to_clean)
         end
 
         puts "Currently active AMIs..."
@@ -169,15 +179,21 @@ module Hashicorptools
           puts ami.image_id
         end
       else
-        puts "no AMIs to clean."
+        puts "no AMIs to clean in #{region_to_clean}."
       end
     end
 
-    def delete_ami_snapshots(ebs_mappings)
+    def amis_in_region(ami_region)
+      regional_ec2_client = AWS::EC2.new(region: ami_region)
+
+      sort_by_created_at( regional_ec2_client.images.with_owner('self').with_tag('Name', tag_name).to_a )
+    end
+
+    def delete_ami_snapshots(ebs_mappings, snapshot_region:)
+      regional_ec2_client = AWS::EC2::Client.new(region: snapshot_region)
       ebs_mappings.each do |volume, attributes|
         puts "Deleting snapshot #{attributes[:snapshot_id]}"
-        snapshot = AWS::EC2::Snapshot.new(attributes[:snapshot_id])
-        snapshot.delete
+        regional_ec2_client.delete_snapshot(snapshot_id: attributes[:snapshot_id])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer