hashicorptools 0.1.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4692b4e530bde9683f94ab831155926ce8b479aa
-  data.tar.gz: c90b5a4d1d0fd216aec3a53e83ce57b4d81184f6
+SHA256:
+  metadata.gz: 254a2ff3deed5490e6c62c5b07dcddd20f60488e4f9dca3821ee931363ce37cc
+  data.tar.gz: 1e8f691dfb3e803620e949651c8a2a68c871f783182c7bf48c07a247d404e99c
 SHA512:
-  metadata.gz: 05d7b64814446f085f7f03883de44eb47b975a202d07e9154af125439e506e7783645d4aa55514210a2c0100f9bdc57a2174030888014bb9fb9743b52a5d05ea
-  data.tar.gz: bbe1ed16b551f5123503afeb086acc5cca65499e1eb0b6a4939c0c4c1c5830ac2bedf4aa09dea714c3e311c811981c602c946c5208096400254deda9687829ef
+  metadata.gz: c48cdfba1b075d54763e14930b200cc89c7926e7d4ec6fabaf8cc3b64f7e4b87076944910ca21c07960522d126134a5c5a94db83d2c4988a6f19907b195f71ab
+  data.tar.gz: 2155084c9795853030119225cd7534e710870c9f3bba04ee97d44852e2583d9d3009e0298c27eef8d953dc42d67f8b087deb5b41d1177a02ecfd8877f655624c

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.4
+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,19 @@ source "http://rubygems.org"
 # try to slowly migrate to v2 of the aws api
 gem 'aws-sdk', '~> 2'
 
-gem 'dynect_rest'
+gem 'dynect_rest', '= 0.4.6'
 
-gem 'aws-sdk-v1'
-gem 'dotenv'
-gem 'thor'
-gem 'activesupport'
-gem 'byebug'
-gem 'git'
+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'
 
-# 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', '~> 2.4', '>= 2.4.7'
+  gem 'simplecov', '>= 0'
 end

data/VERSION

@@ -1 +1 @@
-0.1.2
+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.1.2 ruby lib
+# stub: hashicorptools 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.1.2"
+  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 = "2017-08-21"
+  s.date = "2020-07-17"
   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,54 +44,40 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/hashicorptools".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2".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"])
-      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_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<juwelier>.freeze, [">= 0"])
-      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"])
-    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<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, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
+    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
 end

data/lib/hashicorptools.rb

@@ -13,7 +13,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

@@ -1,47 +1,60 @@
 {
-  "variables": {
-    "aws_access_key": "",
-    "aws_secret_key": "",
-    "source_ami": "",
-    "ami_tag": "",
-    "cookbook_name": ""
-  },
-
   "builders": [
     {
-      "type": "amazon-ebs",
       "access_key": "{{user `aws_access_key`}}",
-      "secret_key": "{{user `aws_secret_key`}}",
+      "ami_name": "{{user `ami_tag`}} {{timestamp}}",
+      "associate_public_ip_address": true,
+      "ena_support": true,
+      "instance_type": "c5.large",
+      "launch_block_device_mappings": [
+        {
+          "delete_on_termination": true,
+          "device_name": "/dev/sda1",
+          "volume_size": 8,
+          "volume_type": "gp2"
+        }
+      ],
       "region": "us-east-1",
+      "ami_regions": ["us-east-1", "eu-central-1"],
+      "run_tags": {
+        "kind": "packer",
+        "role": "AMI builder"
+      },
+      "secret_key": "{{user `aws_secret_key`}}",
       "source_ami": "{{user `source_ami`}}",
-      "instance_type": "c4.large",
+      "ssh_interface": "public_ip",
       "ssh_username": "ubuntu",
-      "ami_name": "{{user `ami_tag`}} {{timestamp}}",
+      "subnet_id": "{{user `subnet_id`}}",
       "tags": {
         "Name": "{{user `ami_tag`}}",
         "created_at": "{{isotime}}",
         "parent_ami": "{{user `source_ami`}}"
       },
-      "run_tags": {
-        "kind": "packer",
-        "role": "AMI builder"
-      },
-      "launch_block_device_mappings": [{
-        "device_name": "/dev/sda1",
-        "volume_size": 8,
-        "volume_type": "gp2",
-        "delete_on_termination": true
-      }]
+      "type": "amazon-ebs",
+      "vpc_id": "{{user `vpc_id`}}"
     }
   ],
+  "post-processors": [],
   "provisioners": [
     {
-      "type": "chef-solo",
-      "cookbook_paths": ["cookbooks", "site-cookbooks"],
-      "run_list": ["{{user `cookbook_name`}}"],
+      "cookbook_paths": [
+        "cookbooks",
+        "site-cookbooks"
+      ],
+      "run_list": [
+        "{{user `cookbook_name`}}"
+      ],
       "skip_install": true,
-      "data_bags_path": "data_bags",
-      "encrypted_data_bag_secret_path": "/etc/chef/encrypted_data_bag_secret"
+      "type": "chef-solo"
     }
-  ]
+  ],
+  "variables": {
+    "ami_tag": "",
+    "aws_access_key": "",
+    "aws_secret_key": "",
+    "cookbook_name": "",
+    "source_ami": "",
+    "subnet_id": "",
+    "vpc_id": ""
+  }
 }

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|
@@ -24,12 +24,13 @@ module Hashicorptools
       end
 
       puts "waiting for scaling events to finish"
-      groups.each do |group|
-        wait_for_activities_to_complete(group)
+      wait_for_activities_to_complete(group)
+      puts "all scaling activities finished."
+
+      if desired_instances > 0
+        wait_until_instances_ready
+        puts "all #{desired_instances} instances ready."
       end
-      puts "all #{desired_instances} scaling activities successful."
-      wait_until_instances_ready
-      puts "all #{desired_instances} instances ready."
     end
 
     def wait_until_instances_ready
@@ -89,6 +90,15 @@ module Hashicorptools
       end
     end
 
+    def verify_all_instances_using_correct_ami
+      launch_configuration = Aws::AutoScaling::LaunchConfiguration.new(name: group.launch_configuration_name, client: autoscaling)
+      image_id = launch_configuration.image_id
+      group.instances.each do |i|
+        instance = Aws::EC2::Instance.new(i.instance_id, client: ec2)
+        raise "#{i.instance_id} has the incorrect AMI, not #{image_id} from current LaunchConfig" if instance.image_id != image_id
+      end
+    end
+
     private
 
     def wait_for_activities_to_complete(group)
@@ -105,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 2 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