hashicorptools 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4692b4e530bde9683f94ab831155926ce8b479aa
-  data.tar.gz: c90b5a4d1d0fd216aec3a53e83ce57b4d81184f6
+SHA256:
+  metadata.gz: 3480aac6dcba04268d682dbd19fddb5d3fa43220e5e9b3cc0c679391749d217e
+  data.tar.gz: fe0b0c9a625b495dc830913a3a4b957ec7a1c68dc3aa98b41ac48888abea33e4
 SHA512:
-  metadata.gz: 05d7b64814446f085f7f03883de44eb47b975a202d07e9154af125439e506e7783645d4aa55514210a2c0100f9bdc57a2174030888014bb9fb9743b52a5d05ea
-  data.tar.gz: bbe1ed16b551f5123503afeb086acc5cca65499e1eb0b6a4939c0c4c1c5830ac2bedf4aa09dea714c3e311c811981c602c946c5208096400254deda9687829ef
+  metadata.gz: 16bdfd1e3ecf8152f230e5f145b70d8e0356cef6af22651294567a8b1eb33c66edc1e4582816610a8180ce53067873d4894203dd03a2b1699183b04007d9d5c2
+  data.tar.gz: e61e5e7c5418954fedf936e187d778c8f413236020cc193bd80934b95efa72135a74f4f13cef32b21553c8198978a5400501cee9de98723f5eb1c55ee4d3c9c6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.4
+ruby-2.5.1

data/Gemfile.lock

@@ -1,47 +1,52 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.4.0)
-    aws-sdk (2.6.30)
-      aws-sdk-resources (= 2.6.30)
-    aws-sdk-core (2.6.30)
+    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.6.30)
-      aws-sdk-core (= 2.6.30)
-    aws-sdk-v1 (1.66.0)
+    aws-sdk-resources (2.11.86)
+      aws-sdk-core (= 2.11.86)
+    aws-sdk-v1 (1.67.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4)
-    aws-sigv4 (1.0.0)
+      nokogiri (~> 1)
+    aws-sigv4 (1.0.3)
     builder (3.2.3)
-    byebug (9.0.6)
+    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.20161129)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.1.1)
+    dotenv (2.2.1)
     dynect_rest (0.4.6)
       rest-client
-    faraday (0.9.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.14.5)
-      addressable (~> 2.4.0)
+    github_api (0.18.2)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     hashie (3.5.6)
-    highline (1.7.8)
+    highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.8.1)
-    jmespath (1.3.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
     json (1.8.6)
     juwelier (2.4.7)
       builder
@@ -61,13 +66,14 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    multi_json (1.12.1)
+    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.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
@@ -75,38 +81,41 @@ GEM
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     psych (2.2.4)
+    public_suffix (3.0.1)
     rack (2.0.3)
-    rake (12.0.0)
+    rake (12.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (2.0.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    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.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     semver2 (3.4.2)
-    simplecov (0.14.1)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thor (0.19.4)
+    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.2)
+    unf_ext (0.0.7.4)
 
 PLATFORMS
   ruby
@@ -127,4 +136,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.14.6
+   1.16.2

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.2

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.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.1.2"
+  s.version = "0.2.2"
 
   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 = "2018-07-20"
   s.description = "Wrappers for terraform and packer".freeze
   s.email = "systems@controlshiftlabs.com".freeze
   s.executables = ["ec2_host".freeze]
@@ -46,7 +46,7 @@ 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 = "2.7.6".freeze
   s.summary = "Wrappers for terraform and packer".freeze
 
   if s.respond_to? :specification_version then

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

@@ -1,47 +1,59 @@
 {
-  "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",
+      "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

@@ -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)

data/lib/hashicorptools/packer.rb

@@ -5,6 +5,10 @@ module Hashicorptools
     include Ec2Utilities
     include Variables
 
+    def self.exit_on_failure?
+      true
+    end
+
     desc "build", "creates an AMI from the current config"
     option :debug, :required => false
     def build
@@ -16,6 +20,11 @@ module Hashicorptools
       system "packer validate #{ami_config_path}"
     end
 
+    desc "fix", "runs the packer fix cmd"
+    def fix
+      system "packer fix #{ami_config_path}"
+    end
+
     desc "console", "interactive session"
     def console
       require 'byebug'
@@ -70,17 +79,17 @@ module Hashicorptools
     protected
 
     def _build(settings_overrides={})
-      settings_overrides.merge!({source_ami: source_ami_id, ami_tag: tag_name, cookbook_name: cookbook_name})
+      settings_overrides.merge!({source_ami: source_ami_id, vpc_id: ami_building_vpc_id, subnet_id: ami_building_subnet_id, ami_tag: tag_name, cookbook_name: cookbook_name})
 
       if options[:debug]
         puts "[DEBUG] Executing 'packer build -debug #{variables(settings_overrides)} #{ami_config_path}'"
         system "packer build -debug \
           #{variables(settings_overrides)} \
-          #{ami_config_path}"
+          #{ami_config_path}" or exit(1)
       else
         system "packer build \
           #{variables(settings_overrides)} \
-          #{ami_config_path}"
+          #{ami_config_path}" or exit(1)
       end
 
       clean_amis
@@ -90,6 +99,14 @@ module Hashicorptools
       current_ami('base-image').image_id
     end
 
+    def ami_building_vpc_id
+      vpc_with_name('ami-building').vpc_id
+    end
+
+    def ami_building_subnet_id
+      ec2.client.describe_subnets({filters: [{name: "vpc-id", values: [ami_building_vpc_id]}]}).subnet_set.first.subnet_id
+    end
+
     def format_variable(key, value)
       "-var '#{key}=#{value}'"
     end

data/lib/hashicorptools/terraform.rb

@@ -1,6 +1,6 @@
 module Hashicorptools
   class Terraform < Thor
-    TERRAFORM_VERSION = '0.9.1'
+    TERRAFORM_VERSION = '0.11.0'
 
     include Ec2Utilities
     include Variables
@@ -11,6 +11,12 @@ module Hashicorptools
       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

data/lib/hashicorptools/update_launch_configuration.rb

@@ -16,6 +16,8 @@ module Hashicorptools
 
         # then bring the instance count back down again.
         asg.set_desired_instances(current_count)
+
+        asg.verify_all_instances_using_correct_ami
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashicorptools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.2
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer