hashicorptools 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40948d480fbe605a1cdd463dd25f016b9a8caab0bd7b1ee3c85a1f72065b97f
-  data.tar.gz: 2aff29bee1f1f7bd76b7e0685295b3d5acb173f4a01f362bc843825ac08a6230
+  metadata.gz: 1dfcc2c084abef69cad0b5b5860982b1389e399e23e539a979eb7fd32dd245e9
+  data.tar.gz: b5d51aa37497b9d61f6d7c0b7e1bcfc0e76fb6bee9857eb51e02ba2ddf8df350
 SHA512:
-  metadata.gz: 9db81bb211352e0a183432e031b2b7e596e5ba1005d9e662ab18c46476ce96430b258af6950a2dc8b92d03b87f83d3bf18a550b3ba8c4e908669a1fa98ef20da
-  data.tar.gz: f7442712eced0611f8695b9acc7186abf4950485f3f48c430d779fa6a1f9980cb9dc552029e74c583726783b8b848df72c020205c94b80c76a03ae0cefeef567
+  metadata.gz: bad4f2253923af3acadf6c59846834a07bf8905dddbd8ccf1ca41920c98544dde39592c936b22f07d77763c86382e82a3983502a15c515a4b29b4b76bc90b4b6
+  data.tar.gz: 467388e24b4ea0f583dd1536834f21ed5e9c820feaf19f3347d0002b3106f91481886d6bd44549978c5bf652ceebf1bf116f5193304b4881a5c95abb6fb39252

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-2.6.6

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - "2.2.5"
+  - "2.6.6"
+# TravisCI uses Bundler 1 by default, but we want Bundler 2
+# https://docs.travis-ci.com/user/languages/ruby/#bundler-20
+before_install:
+  - gem install bundler

data/Gemfile

@@ -1,21 +1,16 @@
 source "http://rubygems.org"
 
-# try to slowly migrate to v2 of the aws api
 gem 'aws-sdk', '~> 2'
-
-gem 'dynect_rest', '= 0.4.6'
-
-gem 'aws-sdk-v1', '~> 1.67'
 gem 'dotenv', '~> 2.2', '>= 2.2.1'
-gem 'thor', '= 0.20.0'
-gem 'activesupport', '~> 5.1', '>= 5.1.4'
-gem 'byebug', '~> 10.0', '>= 10.0.2'
-gem 'git', '~> 1.3'
+gem 'thor', '>= 0.20.0'
+gem 'activesupport', '>= 5.1.4'
+gem 'byebug', '>= 10.0.2'
+gem 'git', '> 1.3'
 
 group :development do
-  gem 'rspec', '~> 3.7'
-  gem 'rdoc', '~> 3.12'
-  gem 'bundler', '~> 1.0'
-  gem 'juwelier', '~> 2.4', '>= 2.4.7'
+  gem 'rspec', '> 3.7'
+  gem 'rdoc', '> 3.12'
+  gem 'bundler', '> 2.0'
+  gem 'juwelier', git: 'https://github.com/flajann2/juwelier.git'
   gem 'simplecov', '>= 0'
 end

data/VERSION

@@ -1 +1 @@
-0.2.3
+1.0.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.2.3 ruby lib
+# stub: hashicorptools 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.2.3"
+  s.version = "1.0.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 = "2018-12-03"
+  s.date = "2020-07-30"
   s.description = "Wrappers for terraform and packer".freeze
   s.email = "systems@controlshiftlabs.com".freeze
   s.executables = ["ec2_host".freeze]
@@ -37,62 +37,43 @@ Gem::Specification.new do |s|
     "lib/hashicorptools/ec2_utilities.rb",
     "lib/hashicorptools/host.rb",
     "lib/hashicorptools/packer.rb",
-    "lib/hashicorptools/terraform.rb",
     "lib/hashicorptools/update_launch_configuration.rb",
     "lib/hashicorptools/variables.rb",
-    "spec/hashicorptools_spec.rb",
+    "spec/ec2_utilities_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/woodhull/hashicorptools".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.6".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.1", "~> 2.2"])
-      s.add_runtime_dependency(%q<thor>.freeze, ["= 0.20.0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
-      s.add_runtime_dependency(%q<byebug>.freeze, [">= 10.0.2", "~> 10.0"])
-      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, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.7", "~> 2.4"])
-      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.1", "~> 2.2"])
-      s.add_dependency(%q<thor>.freeze, ["= 0.20.0"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
-      s.add_dependency(%q<byebug>.freeze, [">= 10.0.2", "~> 10.0"])
-      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, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>.freeze, [">= 2.4.7", "~> 2.4"])
-      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<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.4"])
+    s.add_runtime_dependency(%q<byebug>.freeze, [">= 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, [">= 0"])
+    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.1", "~> 2.2"])
-    s.add_dependency(%q<thor>.freeze, ["= 0.20.0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 5.1.4", "~> 5.1"])
-    s.add_dependency(%q<byebug>.freeze, [">= 10.0.2", "~> 10.0"])
-    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, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>.freeze, [">= 2.4.7", "~> 2.4"])
+    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.4"])
+    s.add_dependency(%q<byebug>.freeze, [">= 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, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end

data/lib/hashicorptools.rb

@@ -2,9 +2,7 @@ require 'bundler/setup'
 require 'dotenv'
 require 'thor'
 require 'active_support/all'
-require 'aws-sdk-v1'
 require 'aws-sdk'
-require 'dynect_rest'
 
 module Hashicorptools
 end
@@ -13,7 +11,6 @@ require_relative 'hashicorptools/variables'
 require_relative 'hashicorptools/ec2_utilities'
 require_relative 'hashicorptools/auto_scaling_group'
 require_relative 'hashicorptools/packer'
-require_relative 'hashicorptools/terraform'
 require_relative 'hashicorptools/host'
 require_relative 'hashicorptools/update_launch_configuration'
 require_relative 'hashicorptools/code_deploy'

data/lib/hashicorptools/ami_configs/standard-ami.json

@@ -15,6 +15,7 @@
         }
       ],
       "region": "us-east-1",
+      "ami_regions": ["us-east-1", "eu-central-1"],
       "run_tags": {
         "kind": "packer",
         "role": "AMI builder"

data/lib/hashicorptools/auto_scaling_group.rb

@@ -2,7 +2,7 @@ require "timeout"
 
 module Hashicorptools
   class AutoScalingGroup
-    attr_accessor :name
+    attr_accessor :name, :region
 
     def initialize(attrs = {})
       attrs.each do |key,value|
@@ -115,15 +115,15 @@ module Hashicorptools
     end
 
     def autoscaling
-      @autoscaling ||= Aws::AutoScaling::Client.new(region: 'us-east-1')
+      @autoscaling ||= Aws::AutoScaling::Client.new(region: region)
     end
 
     def ec2
-      @ec2 ||= Aws::EC2::Client.new(region: 'us-east-1')
+      @ec2 ||= Aws::EC2::Client.new(region: region)
     end
 
     def elb
-      @elb ||= Aws::ElasticLoadBalancing::Client.new(region: 'us-east-1')
+      @elb ||= Aws::ElasticLoadBalancing::Client.new(region: region)
     end
 
     def groups

data/lib/hashicorptools/code_deploy.rb

@@ -7,52 +7,98 @@ require 'logger'
 require 'thor'
 
 module Hashicorptools
+  class RegionDeployment
+    attr_accessor :aws_region, :environment
+
+    def initialize(aws_region:, environment:)
+      @aws_region = aws_region
+      @environment = environment
+    end
+
+    def create_deployment(commit_id, commit_message)
+      client = Aws::CodeDeploy::Client.new(region: aws_region)
+      response = client.create_deployment({
+                                            application_name: application_name,
+                                            deployment_group_name: "#{application_name}-#{@environment}",
+                                            revision: {
+                                              revision_type: 'GitHub',
+                                              git_hub_location: {
+                                                repository: "controlshift/#{application_name}",
+                                                commit_id: commit_id
+                                              }
+                                            },
+                                            description: (commit_message || "commit #{commit_id}").slice(0,99)
+                                          })
+      output "created deployment #{response.deployment_id}"
+      output "https://console.aws.amazon.com/codedeploy/home?region=#{aws_region}#/deployments/#{response.deployment_id}"
+    end
+
+    private
+
+    def application_name
+      raise "implement me"
+    end
+
+    def output(text)
+      puts "[#{aws_region}] #{text}"
+    end
+  end
+
   class CodeDeploy < Thor
+    AWS_REGION_US_EAST_1 = 'us-east-1'
 
     desc 'deploy', 'deploy latest code to environment'
-    option :environment, :required => true
-    option :branch, default: 'master'
+    option :environment, required: true
+    option :branch
+    option :aws_regions, type: :array
     option :commit
     def deploy
       g = Git.open('..')
 
+      # We set defaults (depending on environment) for aws_regions if not passed in
+      aws_regions = options[:aws_regions] || default_regions
+
       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
 
+      puts "Deploying to environment #{options[:environment]} - regions: #{aws_regions.join(', ')}
+            commit: #{commit.sha}
+            message: #{commit.message}"
 
-      puts "deploying commit: #{commit.sha} #{commit.message}"
+      puts "Deploying for regions: #{aws_regions}"
 
-      create_deployment(commit.sha, commit.message)
+      threads = []
+      aws_regions.each_slice(2) do |aws_regions_batch|
+        puts "Deploying for batch of regions: #{aws_regions_batch}"
+        aws_regions_batch.each do |aws_region|
+          thread = Thread.new{ region_deployment(aws_region).create_deployment(commit.sha, commit.message) }
+          threads.push(thread)
+        end
+
+        threads.each_with_index do |thread, index|
+          begin
+            thread.join
+          rescue Exception => e
+            # Don't quit whole program on exception in thread, just print exception and exit thread
+            puts "[#{aws_regions[index]}] EXCEPTION: #{e}"
+          end
+        end
+      end
     end
 
     private
 
-    def create_deployment(commit_id, commit_message = nil)
-      Dotenv.load
-
-      client = Aws::CodeDeploy::Client.new
-      response = client.create_deployment({
-                                            application_name: application_name,
-                                            deployment_group_name: "#{application_name}-#{options[:environment]}",
-                                            revision: {
-                                              revision_type: 'GitHub',
-                                              git_hub_location: {
-                                                repository: "controlshift/#{application_name}",
-                                                commit_id: commit_id
-                                              }
-                                            },
-                                            description: (commit_message || "commit #{commit_id}").slice(0,99)
-                                          })
-      puts "created deployment #{response.deployment_id}"
-      puts "https://console.aws.amazon.com/codedeploy/home?region=#{ENV['AWS_REGION']}#/deployments/#{response.deployment_id}"
+    def region_deployment(aws_region)
+      RegionDeployment.new(aws_region: aws_region, environment: options[:environment])
     end
 
-    def application_name
-      raise "implement me"
+    def default_regions
+      [AWS_REGION_US_EAST_1]
     end
   end
 end

data/lib/hashicorptools/ec2_utilities.rb

@@ -5,7 +5,8 @@ module Hashicorptools
     end
 
     def amis(tag = tag_name)
-      sort_by_created_at(  ec2.images.with_owner('self').with_tag('Name', tag).to_a )
+      images = ec2.describe_images({owners: ['self'], filters: [{name: 'tag:Name', values: [tag]}]}).images
+      sort_by_created_at(images)
     end
 
     def ec2
@@ -17,17 +18,15 @@ module Hashicorptools
               'us-east-1'
             end
 
-      @_ec2 = AWS::EC2.new(region: reg)
+      @_ec2 = Aws::EC2::Client.new(region: reg)
     end
 
     def vpc_with_name(name)
-      vpcs = ec2.client.describe_vpcs({filters: [{name: 'tag:Name', values: [name]}]}).vpc_set
-      vpcs.first
+      ec2.describe_vpcs({filters: [{name: 'tag:Name', values: [name]}]}).vpcs.first
     end
 
     def internet_gateway_for_vpc(vpc_id)
-      igs = ec2.client.describe_internet_gateways({filters: [{name: 'attachment.vpc-id', values: [vpc_id]}]}).internet_gateway_set
-      igs.first
+      ec2.describe_internet_gateways({filters: [{name: 'attachment.vpc-id', values: [vpc_id]}]}).internet_gateways.first
     end
 
     def sort_by_created_at(collection)

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
@@ -45,7 +45,7 @@ module Hashicorptools
 
     desc "clean_snapshots", "clean obsolete EBS snapshots not associated with any AMI"
     def clean_snapshots
-      snapshots = ec2.snapshots.with_owner('self')
+      snapshots = ec2.describe_snapshots({owner_ids: ['self']}).snapshots
       snapshots.each do |snapshot|
         match = snapshot.description.match(/Created by CreateImage\(.+\) for (ami-[0-9a-f]+) from vol-.+/)
         if match.nil?
@@ -54,23 +54,28 @@ module Hashicorptools
         end
 
         ami_id = match[1]
-        unless ec2.images[ami_id].exists?
-          puts "Removing obsolete snapshot #{snapshot.id} - #{snapshot.description}"
-          snapshot = AWS::EC2::Snapshot.new(snapshot.id)
-          snapshot.delete
+        unless Aws::EC2::Image.new(ami_id, region: region).exists?
+          puts "Removing obsolete snapshot #{snapshot.snapshot_id} - #{snapshot.description}"
+          ec2.delete_snapshot({snapshot_id: snapshot.snapshot_id})
         end
       end
     end
 
     desc "boot", "start up an instance of the latest version of AMI"
     def boot
-      run_instances_resp = ec2.run_instances(image_id: current_ami('base-image').image_id,
+      run_instances_resp = ec2.run_instances({
+        image_id: current_ami('base-image').image_id,
         min_count: 1,
         max_count: 1,
-        instance_type: "t2.micro")
+        instance_type: "t2.micro"
+      })
 
-      ec2.create_tags( resources: run_instances_resp.instances.collect{|i| i.instance_id },
-          tags: [ {key: 'Name', value: "packer test boot #{tag_name}"}, {key: 'environment', value: 'packer-development'}, {key: 'temporary', value: 'kill me'}])
+      ec2.create_tags({
+        resources: run_instances_resp.instances.collect(&:instance_id),
+        tags: [ {key: 'Name', value: "packer test boot #{tag_name}"},
+                {key: 'environment', value: 'packer-development'},
+                {key: 'temporary', value: 'kill me'}]
+      })
 
       require 'byebug'
       byebug
@@ -104,7 +109,7 @@ module Hashicorptools
     end
 
     def ami_building_subnet_id
-      ec2.client.describe_subnets({filters: [{name: "vpc-id", values: [ami_building_vpc_id]}]}).subnet_set.first.subnet_id
+      ec2.describe_subnets({filters: [{name: "vpc-id", values: [ami_building_vpc_id]}]}).subnets.first.subnet_id
     end
 
     def format_variable(key, value)
@@ -127,39 +132,52 @@ 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 regional_ec2_client(client_region=region)
+      @_regional_ec2_clients = {} if @_regional_ec2_clients.nil?
+      @_regional_ec2_clients[client_region] ||= 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 = regional_ec2_client(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)
+          regional_ec2_client(region_to_clean).deregister_image({
+            image_id: ami.image_id
+          })
+          delete_ami_snapshots(ebs_mappings, snapshot_region: region_to_clean)
         end
 
         puts "Currently active AMIs..."
@@ -167,15 +185,26 @@ 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)
-      ebs_mappings.each do |volume, attributes|
-        puts "Deleting snapshot #{attributes[:snapshot_id]}"
-        snapshot = AWS::EC2::Snapshot.new(attributes[:snapshot_id])
-        snapshot.delete
+    def amis_in_region(ami_region)
+      images = regional_ec2_client(ami_region).describe_images({
+        owners: ['self'],
+        filters: [{name: 'tag:Name', values: [tag_name]}]
+      }).images
+      sort_by_created_at(images)
+    end
+
+    def delete_ami_snapshots(ebs_mappings, snapshot_region:)
+      ec2_client = regional_ec2_client(snapshot_region)
+
+      ebs_mappings.each do |ebs_mapping|
+        unless ebs_mapping.ebs.nil?
+          puts "Deleting snapshot #{ebs_mapping.ebs.snapshot_id}"
+          ec2_client.delete_snapshot({snapshot_id: ebs_mapping.ebs.snapshot_id})
+        end
       end
     end
   end

data/lib/hashicorptools/update_launch_configuration.rb

@@ -1,8 +1,9 @@
 module Hashicorptools
   class UpdateLaunchConfiguration < Thor
     desc 'deploy ASG_NAME', 'recycle instances in the ASG with no downtime'
+    option :aws_region, default: 'us-east-1'
     def deploy(asg_name)
-      asg = AutoScalingGroup.new(name: asg_name)
+      asg = AutoScalingGroup.new(name: asg_name, region: options[:aws_region])
       if asg.group.nil?
         raise "could not find asg #{asg_name}"
       end

data/lib/hashicorptools/variables.rb

@@ -1,12 +1,8 @@
 module Hashicorptools
   module Variables
-    def aws_credentials_settings(settings_overrides = {})
-      {aws_access_key: ENV['AWS_ACCESS_KEY_ID'],
-       aws_secret_key: ENV['AWS_SECRET_ACCESS_KEY']}.merge(settings_overrides)
-    end
 
     def variables(settings_overrides = {})
-      aws_credentials_settings(settings_overrides).collect{|key,value| format_variable(key, value)}.join(' ')
+      settings_overrides.collect{|key,value| format_variable(key, value)}.join(' ')
     end
 
     protected

data/spec/ec2_utilities_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Hashicorptools::Ec2Utilities, type: :helper do
+  let(:including_class) { Class.new { include Hashicorptools::Ec2Utilities } }
+
+  subject { including_class.new }
+
+  describe '#ec2' do
+    it 'should return a client' do
+      client = subject.ec2
+      expect(client).to be_a Aws::EC2::Client
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,65 +25,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: dynect_rest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.6
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.67'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.67'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.20.0
 - !ruby/object:Gem::Dependency
@@ -93,9 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,9 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -113,9 +79,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,85 +86,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.2
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.7
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.7
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -242,10 +196,9 @@ files:
 - lib/hashicorptools/ec2_utilities.rb
 - lib/hashicorptools/host.rb
 - lib/hashicorptools/packer.rb
-- lib/hashicorptools/terraform.rb
 - lib/hashicorptools/update_launch_configuration.rb
 - lib/hashicorptools/variables.rb
-- spec/hashicorptools_spec.rb
+- spec/ec2_utilities_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/woodhull/hashicorptools
 licenses:
@@ -266,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer

data/lib/hashicorptools/terraform.rb

@@ -1,299 +0,0 @@
-module Hashicorptools
-  class Terraform < Thor
-    TERRAFORM_VERSION = '0.11.0'
-
-    include Ec2Utilities
-    include Variables
-
-    desc 'bootstrap', 'terraform a new infrastructure from scratch'
-    option :environment, :required => true
-    def bootstrap
-      apply
-    end
-
-    desc 'init', 'install providers into local terraform'
-    option :environment, :required => true
-    def init
-
-    end
-
-    [:apply, :plan, :destroy, :pull, :refresh].each do |cmd|
-      desc cmd, "terraform #{cmd}"
-      option :environment, :required => true
-      option :debug, :required => false
-
-      define_method cmd do
-        send("_#{cmd}")
-      end
-
-      no_commands do
-        define_method "_#{cmd}" do |settings_overrides = {}|
-          enforce_version!
-          raise 'invalid environment' unless ['staging', 'production'].include?(options[:environment])
-
-          execute(state_path, var_file_path) do
-
-            settings_overrides
-              .merge!({ app_environment: options[:environment] }
-              .merge(env_variable_keys)
-              .merge(settings)
-              .merge(shared_plan_variables))
-
-            send("before_#{cmd}")
-
-            terraform_command = "terraform #{cmd} #{variables(settings_overrides)} -state #{state_path} #{var_file_param} #{config_directory}"
-
-            if (options[:debug])
-              puts "[DEBUG] running command: '#{terraform_command}"
-            end
-
-            result = system terraform_command
-
-            if result
-              send("after_#{cmd}")
-            end
-          end
-        end
-
-        define_method "before_#{cmd}" do
-          # no-op
-        end
-      end
-
-      no_commands do
-        define_method "before_shared_#{cmd}" do
-          # no-op
-        end
-
-        define_method "after_#{cmd}" do
-          # no-op
-        end
-
-        define_method "after_shared_#{cmd}" do
-          # no-op
-        end
-      end
-
-      desc cmd, "terraform #{cmd} for shared plan"
-      option :debug, :required => false
-      define_method "shared_#{cmd}" do
-        enforce_version!
-
-        execute(shared_state_path) do
-          send("before_shared_#{cmd}")
-
-          terraform_command = "terraform #{cmd} #{variables(env_variable_keys.merge(settings))} -state #{shared_state_path} #{shared_config_directory}"
-          if (options[:debug])
-            puts "[DEBUG] running command: '#{terraform_command}"
-          end
-          result = system terraform_command
-
-          if result
-            send("after_shared_#{cmd}")
-          end
-        end
-      end
-    end
-
-    desc 'output', 'terraform output'
-    option :environment, :required => true
-    option :name, :required => true
-    def output
-      execute(state_path) do
-        system output_cmd(state_path, options[:name])
-      end
-    end
-
-    desc 'shared_output', 'terraform output for shared plan'
-    option :name, :required => true
-    def shared_output
-      execute(shared_state_path) do
-        system output_cmd(shared_state_path, options[:name])
-      end
-    end
-
-    desc 'taint', 'terraform taint'
-    option :environment, :required => true
-    option :name, :required => true
-    option :module, :required => false
-    def taint
-      execute(state_path) do
-        if options[:module].present?
-          system "terraform taint -module #{options[:module]} -state #{state_path} #{options[:name]}"
-        else
-          system "terraform taint -state #{state_path} #{options[:name]}"
-        end
-      end
-    end
-
-    desc 'shared_taint', 'terraform taint for shared plan'
-    option :name, :required => true
-    option :module, :required => false
-    def shared_taint
-      execute(shared_state_path) do
-        if options[:module].present?
-          system "terraform taint -module #{options[:module]} -state #{shared_state_path} #{options[:name]}"
-        else
-          system "terraform taint -state #{shared_state_path} #{options[:name]}"
-        end
-      end
-    end
-
-    desc 'show', 'terraform show'
-    option :environment, :required => true
-    def show
-      execute(state_path) do
-        system "terraform show #{state_path}"
-      end
-    end
-
-    desc 'shared_show', 'terraform show for shared plan'
-    def shared_show
-      execute(shared_state_path) do
-        system "terraform show #{shared_state_path}"
-      end
-    end
-
-    desc "console", "interactive session"
-    def console
-      require 'pry-byebug'
-      binding.pry
-    end
-
-    protected
-
-    def var_file_param
-      File.exist?(var_file_path) ?
-        "-var-file #{var_file_path}" :
-        ""
-    end
-
-    def execute(state_file_path, var_file_path=nil)
-      begin
-        yield
-      rescue StandardError => e
-        puts e.message
-        puts e.backtrace
-      end
-    end
-
-    def state_path
-      "#{config_environment_path}/#{options[:environment]}.tfstate"
-    end
-
-    def shared_state_path
-      "#{shared_config_directory}/shared.tfstate"
-    end
-
-    def var_file_path
-      "#{config_environment_path}/variables.tfvars"
-    end
-
-    def config_directory
-      "config/infrastructure/#{infrastructure}"
-    end
-
-    def shared_config_directory
-      "config/infrastructure/#{infrastructure}/shared"
-    end
-
-    def config_environment_path
-      "#{config_directory}/environments/#{options[:environment]}"
-    end
-
-    def infrastructure
-      raise 'implement me'
-    end
-
-    def output_cmd(state_file_path, name=nil)
-      "terraform output -state=#{state_file_path} #{name}"
-    end
-
-    def output_variable(state_file_path, name)
-      `#{output_cmd(state_file_path, name)}`.chomp
-    end
-
-    def output_variables(state_file_path)
-      raw_plan_output = `#{output_cmd(state_file_path)}`
-      parse_key_value_variables(raw_plan_output)
-    end
-
-    def var_file_variables
-      raise "Vars file #{var_file_path} does not exist" unless File.exist?(var_file_path)
-
-      raw_var_file_variables = File.read(var_file_path)
-      parse_key_value_variables(raw_var_file_variables)
-    end
-
-    def terraform_version
-      version_string = `terraform version`.chomp
-      version = /(\d+.\d+.\d+)/.match(version_string)
-      version[0]
-    end
-
-    def enforce_version!
-      if Gem::Version.new(terraform_version) < Gem::Version.new(TERRAFORM_VERSION)
-        raise "Terraform #{terraform_version} is out of date, please upgrade"
-      end
-    end
-
-    def settings
-      {} # override me to pass more variables into the terraform plan.
-    end
-
-    def asg_launch_config_name(asg_name)
-      asg_client = Aws::AutoScaling::Client.new(region: 'us-east-1')
-      group = asg_client.describe_auto_scaling_groups(auto_scaling_group_names: [asg_name]).auto_scaling_groups.first
-      group.try(:launch_configuration_name)
-    end
-
-    def env_variable_keys
-      {} # override me to pass environmental variables into the terraform plan
-    end
-
-    def shared_plan_variables
-      if File.exist?(shared_state_path)
-        output_variables(shared_state_path)
-      else
-        {}
-      end
-    end
-
-    def fetch_terraform_modules
-      system "terraform get -update=true #{config_directory}"
-    end
-
-    def current_tfstate
-      return @current_tfstate if defined?(@current_tfstate)
-      raw_conf = File.read(state_path)
-      @current_tfstate = JSON.parse(raw_conf)
-    end
-
-    def read_config_file(path)
-      File.new('config/' + path).read
-      template = ERB.new File.new("config/#{path}").read, nil, "%"
-      template.result(OpenStruct.new(options).instance_eval { binding })
-    end
-
-    def dynect
-      @dynect ||= DynectRest.new("controlshiftlabs", ENV['DYNECT_USERNAME'], ENV['DYNECT_PASSWORD'], "controlshiftlabs.com")
-    end
-
-    def dns_record_exists?(parent_node_fqdn, record)
-      dynect.node_list(nil, parent_node_fqdn).include?(record.fqdn)
-    end
-
-    private
-
-    def parse_key_value_variables(vars_string)
-      vars = {}
-      vars_string.split("\n").each do |string_var|
-        next if string_var.blank?
-        key, value = string_var.split("=")
-        vars[key.strip] = value.strip.gsub('"', '')
-      end
-
-      vars
-    end
-  end
-end

data/spec/hashicorptools_spec.rb

@@ -1,8 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Hashicorptools" do
-  it "fails" do
-    pending
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end