hashicorptools 0.2.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3480aac6dcba04268d682dbd19fddb5d3fa43220e5e9b3cc0c679391749d217e
-  data.tar.gz: fe0b0c9a625b495dc830913a3a4b957ec7a1c68dc3aa98b41ac48888abea33e4
+  metadata.gz: 8678bee5e4e1f1c2a2efa53625d495e3c91eb1b1170ca29831f9f21c0b92d6a1
+  data.tar.gz: e233456a2da0aca57736ddcbe400ea97bc0366a8d5e3b11cfb9f2b77b08dee22
 SHA512:
-  metadata.gz: 16bdfd1e3ecf8152f230e5f145b70d8e0356cef6af22651294567a8b1eb33c66edc1e4582816610a8180ce53067873d4894203dd03a2b1699183b04007d9d5c2
-  data.tar.gz: e61e5e7c5418954fedf936e187d778c8f413236020cc193bd80934b95efa72135a74f4f13cef32b21553c8198978a5400501cee9de98723f5eb1c55ee4d3c9c6
+  metadata.gz: c5c10e25f54a76390e3b39434e166f4bbd754a19096063ef760feaafd01a4cfccaa971674ecf7d61f9f0165a0d71651400d62615248da3fe7940e7b21bb6d326
+  data.tar.gz: 8a09c1eaac106fbc2716a43f26384fbaab1cc2d6a0386167e187e363ed043e88efe693a0cebabb1e9d050bb3bc8bb1ed0d769ae53b40002725627f0475b6cca6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+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

@@ -3,21 +3,18 @@ source "http://rubygems.org"
 # try to slowly migrate to v2 of the aws api
 gem 'aws-sdk', '~> 2'
 
-gem 'dynect_rest'
+# this is somewhat undesirable but lets us update json gem version. We should really replace the old v1 code.
+gem 'aws-sdk-v1-ruby24', github: 'seielit/aws-sdk-v1-ruby24', ref: 'aws-sdk-v1-ruby24'
+gem 'dotenv', '~> 2.2', '>= 2.2.1'
+gem 'thor', '>= 0.20.0'
+gem 'activesupport', '>= 5.1.4'
+gem 'byebug', '>= 10.0.2'
+gem 'git', '> 1.3'
 
-gem 'aws-sdk-v1'
-gem 'dotenv'
-gem 'thor'
-gem 'activesupport'
-gem 'byebug'
-gem 'git'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "juwelier"
-  gem "simplecov", ">= 0"
+  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.2
+0.5.1

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.2 ruby lib
+# stub: hashicorptools 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.2.2"
+  s.version = "0.5.1"
 
   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-07-20"
+  s.date = "2020-07-29"
   s.description = "Wrappers for terraform and packer".freeze
   s.email = "systems@controlshiftlabs.com".freeze
   s.executables = ["ec2_host".freeze]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     ".ruby-version",
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
@@ -38,7 +37,6 @@ 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",
@@ -46,7 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/hashicorptools".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "Wrappers for terraform and packer".freeze
 
   if s.respond_to? :specification_version then
@@ -54,45 +52,42 @@ Gem::Specification.new do |s|
 
     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"])
-      s.add_runtime_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<dotenv>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<thor>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<byebug>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<git>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_runtime_dependency(%q<aws-sdk-v1-ruby24>.freeze, [">= 0"])
+      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"])
-      s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
-      s.add_dependency(%q<dotenv>.freeze, [">= 0"])
-      s.add_dependency(%q<thor>.freeze, [">= 0"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 0"])
-      s.add_dependency(%q<byebug>.freeze, [">= 0"])
-      s.add_dependency(%q<git>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<aws-sdk-v1-ruby24>.freeze, [">= 0"])
+      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
   else
     s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
-    s.add_dependency(%q<dynect_rest>.freeze, [">= 0"])
-    s.add_dependency(%q<aws-sdk-v1>.freeze, [">= 0"])
-    s.add_dependency(%q<dotenv>.freeze, [">= 0"])
-    s.add_dependency(%q<thor>.freeze, [">= 0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 0"])
-    s.add_dependency(%q<byebug>.freeze, [">= 0"])
-    s.add_dependency(%q<git>.freeze, [">= 0"])
-    s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<aws-sdk-v1-ruby24>.freeze, [">= 0"])
+    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

data/lib/hashicorptools.rb

@@ -4,7 +4,6 @@ require 'thor'
 require 'active_support/all'
 require 'aws-sdk-v1'
 require 'aws-sdk'
-require 'dynect_rest'
 
 module Hashicorptools
 end
@@ -13,7 +12,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/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
@@ -69,8 +69,10 @@ module Hashicorptools
         max_count: 1,
         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
@@ -127,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..."
@@ -167,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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,21 +25,7 @@ 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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk-v1-ruby24
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,114 +42,120 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        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
@@ -205,7 +197,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -219,7 +210,6 @@ 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
@@ -243,8 +233,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.0.8
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer

data/Gemfile.lock

@@ -1,139 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (5.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    aws-sdk (2.11.86)
-      aws-sdk-resources (= 2.11.86)
-    aws-sdk-core (2.11.86)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.11.86)
-      aws-sdk-core (= 2.11.86)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
-    aws-sigv4 (1.0.3)
-    builder (3.2.3)
-    byebug (10.0.2)
-    concurrent-ruby (1.0.5)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    domain_name (0.5.20170404)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
-    dynect_rest (0.4.6)
-      rest-client
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.3.0)
-    github_api (0.18.2)
-      addressable (~> 2.4)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
-      hashie (~> 3.5, >= 3.5.2)
-      oauth2 (~> 1.0)
-    hashie (3.5.6)
-    highline (1.7.10)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (0.9.1)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (1.8.6)
-    juwelier (2.4.7)
-      builder
-      bundler
-      git
-      github_api
-      highline
-      kamelcase (~> 0)
-      nokogiri
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (1.5.6)
-    kamelcase (0.0.1)
-      semver2 (~> 3)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    multi_json (1.12.2)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    netrc (0.11.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    psych (2.2.4)
-    public_suffix (3.0.1)
-    rack (2.0.3)
-    rake (12.3.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    semver2 (3.4.2)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.4)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  aws-sdk (~> 2)
-  aws-sdk-v1
-  bundler (~> 1.0)
-  byebug
-  dotenv
-  dynect_rest
-  git
-  juwelier
-  rdoc (~> 3.12)
-  rspec
-  simplecov
-  thor
-
-BUNDLED WITH
-   1.16.2

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