hashicorptools 0.0.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d826c8e7a72e6a5229d4b7650689ea65b751319a
-  data.tar.gz: b28dba48ac700d728f46dda423e4342707564cc6
+SHA256:
+  metadata.gz: 75178f2878dffffbcca566e4ed6fa81c9cc612f55b601adf82a5a31da8492e74
+  data.tar.gz: 47fef27c27f49f242188b474872ef4b57128e8998e9a277de2c19f6752a74759
 SHA512:
-  metadata.gz: de41ed4cbae046e4a308553be81156a095a70c39a243b0f5c6c554180e3922917740b4b62b0fec5adbf9207348fb727d31ccd78fcf46a052eb1eb7a4b153b35d
-  data.tar.gz: 937d599532610b2870238e9529fc213690ffd76497def92dcbd1da25e8b0557828cca3a6ca927723c0614cb891bb99d2222302e16e8ab170d4cd4df91ef2cd41
+  metadata.gz: 75d5ca009f079b41864ec1e5d66b1d6a2e88dcbab943ee2aff7f7cb869a41e667ef32483c0de2c865fe885f5c9d726c6c32122d79a3f7077fa7eec418de111de
+  data.tar.gz: d346e24bc5ae25eb45e9406894701d96095d75eec0b40838cd85e647943b6c21a019913a21bb4ba51f9426d9bfa56fbee0cd0b80e90bf0b2bf73b75d62f24996

data/.ruby-gemset

@@ -0,0 +1 @@
+hashicorptools

data/.ruby-version

@@ -0,0 +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,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", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
-  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/README.md

@@ -11,8 +11,7 @@ Wraps the packer product from hashicorp with standard configuration.
 
 ## terraform wrapper
 
-Wraps the terraform product from hashicorp with standard conventions for encrypting tfstate and segmenting production
-and staging environments.
+Wraps the terraform product from hashicorp with segmented production and staging environments.
 
 
 Copyright (c) 2015 ChangeSprout Inc. See LICENSE for

data/Rakefile

@@ -11,8 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "hashicorptools"
   gem.homepage = "http://github.com/woodhull/hashicorptools"
@@ -21,10 +21,10 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Wrappers for terraform and packer}
   gem.email = "systems@controlshiftlabs.com"
   gem.authors = ["Nathan Woodhull"]
-  gem.executables = ['ec2_host'] 
+  gem.executables = ['ec2_host']
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.3.0

data/hashicorptools.gemspec

@@ -1,98 +1,98 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hashicorptools 0.0.7 ruby lib
+# stub: hashicorptools 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "hashicorptools"
-  s.version = "0.0.7"
+  s.name = "hashicorptools".freeze
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Woodhull"]
-  s.date = "2016-08-22"
-  s.description = "Wrappers for terraform and packer"
-  s.email = "systems@controlshiftlabs.com"
-  s.executables = ["ec2_host"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Woodhull".freeze]
+  s.date = "2020-06-18"
+  s.description = "Wrappers for terraform and packer".freeze
+  s.email = "systems@controlshiftlabs.com".freeze
+  s.executables = ["ec2_host".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
+    ".ruby-gemset",
+    ".ruby-version",
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
     "bin/ec2_host",
-    "data/standard-ami.json",
     "hashicorptools.gemspec",
     "lib/hashicorptools.rb",
+    "lib/hashicorptools/ami_configs/standard-ami.json",
     "lib/hashicorptools/auto_scaling_group.rb",
     "lib/hashicorptools/code_deploy.rb",
     "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/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/woodhull/hashicorptools"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "Wrappers for terraform and packer"
+  s.homepage = "http://github.com/woodhull/hashicorptools".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.3".freeze
+  s.summary = "Wrappers for terraform and packer".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws-sdk>, ["~> 2"])
-      s.add_runtime_dependency(%q<dynect_rest>, [">= 0"])
-      s.add_runtime_dependency(%q<aws-sdk-v1>, [">= 0"])
-      s.add_runtime_dependency(%q<dotenv>, [">= 0"])
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<byebug>, [">= 0"])
-      s.add_runtime_dependency(%q<git>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      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>, ["~> 2"])
-      s.add_dependency(%q<dynect_rest>, [">= 0"])
-      s.add_dependency(%q<aws-sdk-v1>, [">= 0"])
-      s.add_dependency(%q<dotenv>, [">= 0"])
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<byebug>, [">= 0"])
-      s.add_dependency(%q<git>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+      s.add_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])
+      s.add_dependency(%q<aws-sdk-v1>.freeze, ["~> 1.67"])
+      s.add_dependency(%q<dotenv>.freeze, ["~> 2.2", ">= 2.2.1"])
+      s.add_dependency(%q<thor>.freeze, ["= 0.20.0"])
+      s.add_dependency(%q<activesupport>.freeze, ["~> 5.1", ">= 5.1.4"])
+      s.add_dependency(%q<byebug>.freeze, ["~> 10.0", ">= 10.0.2"])
+      s.add_dependency(%q<git>.freeze, ["~> 1.3"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.7"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.7"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<aws-sdk>, ["~> 2"])
-    s.add_dependency(%q<dynect_rest>, [">= 0"])
-    s.add_dependency(%q<aws-sdk-v1>, [">= 0"])
-    s.add_dependency(%q<dotenv>, [">= 0"])
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<byebug>, [">= 0"])
-    s.add_dependency(%q<git>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<aws-sdk>.freeze, ["~> 2"])
+    s.add_dependency(%q<dynect_rest>.freeze, ["= 0.4.6"])
+    s.add_dependency(%q<aws-sdk-v1>.freeze, ["~> 1.67"])
+    s.add_dependency(%q<dotenv>.freeze, ["~> 2.2", ">= 2.2.1"])
+    s.add_dependency(%q<thor>.freeze, ["= 0.20.0"])
+    s.add_dependency(%q<activesupport>.freeze, ["~> 5.1", ">= 5.1.4"])
+    s.add_dependency(%q<byebug>.freeze, ["~> 10.0", ">= 10.0.2"])
+    s.add_dependency(%q<git>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.7"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<juwelier>.freeze, ["~> 2.4", ">= 2.4.7"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 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

@@ -0,0 +1,60 @@
+{
+  "builders": [
+    {
+      "access_key": "{{user `aws_access_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`}}",
+      "ssh_interface": "public_ip",
+      "ssh_username": "ubuntu",
+      "subnet_id": "{{user `subnet_id`}}",
+      "tags": {
+        "Name": "{{user `ami_tag`}}",
+        "created_at": "{{isotime}}",
+        "parent_ami": "{{user `source_ami`}}"
+      },
+      "type": "amazon-ebs",
+      "vpc_id": "{{user `vpc_id`}}"
+    }
+  ],
+  "post-processors": [],
+  "provisioners": [
+    {
+      "cookbook_paths": [
+        "cookbooks",
+        "site-cookbooks"
+      ],
+      "run_list": [
+        "{{user `cookbook_name`}}"
+      ],
+      "skip_install": true,
+      "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

@@ -11,11 +11,21 @@ module Hashicorptools
 
     desc 'deploy', 'deploy latest code to environment'
     option :environment, :required => true
-    option :branch, default: 'master'
+    option :branch
+    option :aws_region, default: 'us-east-1'
     option :commit
     def deploy
       g = Git.open('..')
 
+      # TODO restore defaulting branch to the default branch (and remove below check)
+      # once all the repos have the same default branch name of `main`
+      # Currently, `agra` is using `master` while other apps are using `main`.
+      # and we are unable to detect what the default branch is
+      # via the git client here.
+      if options[:commit].nil? && options[:branch].nil?
+        raise 'You must supply either commit or branch to deploy'
+      end
+
       commit = if options[:commit].present?
                  g.gcommit(options[:commit])
                else
@@ -34,7 +44,7 @@ module Hashicorptools
     def create_deployment(commit_id, commit_message = nil)
       Dotenv.load
 
-      client = Aws::CodeDeploy::Client.new
+      client = Aws::CodeDeploy::Client.new(region: options[:aws_region])
       response = client.create_deployment({
                                             application_name: application_name,
                                             deployment_group_name: "#{application_name}-#{options[:environment]}",
@@ -48,7 +58,7 @@ module Hashicorptools
                                             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}"
+      puts "https://console.aws.amazon.com/codedeploy/home?region=#{options[:aws_region]}#/deployments/#{response.deployment_id}"
     end
 
     def application_name

data/lib/hashicorptools/ec2_utilities.rb

@@ -5,17 +5,19 @@ module Hashicorptools
     end
 
     def amis(tag = tag_name)
-      sort_by_created_at(  ec2.images.with_owner('self').tagged(tag).to_a, tag )
+      sort_by_created_at(  ec2.images.with_owner('self').with_tag('Name', tag).to_a )
     end
 
     def ec2
+      return @_ec2 unless @_ec2.nil?
+
       reg = if self.methods.include?(:region)
               self.region
             else
               'us-east-1'
             end
 
-      AWS::EC2.new(region: reg)
+      @_ec2 = AWS::EC2.new(region: reg)
     end
 
     def vpc_with_name(name)
@@ -28,16 +30,8 @@ module Hashicorptools
       igs.first
     end
 
-    def image_created_at(image, tag= tag_name)
-      if image
-        image.tags.to_h[tag].to_i
-      else
-        0
-      end
-    end
-
-    def sort_by_created_at(collection, tag = tag_name)
-      collection.sort{|a, b| self.image_created_at(b, tag) <=> self.image_created_at(a, tag) }
+    def sort_by_created_at(collection)
+      collection.sort{|a, b| b.creation_date <=> a.creation_date }
     end
   end
 end