hashicorptools 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8678bee5e4e1f1c2a2efa53625d495e3c91eb1b1170ca29831f9f21c0b92d6a1
-  data.tar.gz: e233456a2da0aca57736ddcbe400ea97bc0366a8d5e3b11cfb9f2b77b08dee22
+  metadata.gz: 1dfcc2c084abef69cad0b5b5860982b1389e399e23e539a979eb7fd32dd245e9
+  data.tar.gz: b5d51aa37497b9d61f6d7c0b7e1bcfc0e76fb6bee9857eb51e02ba2ddf8df350
 SHA512:
-  metadata.gz: c5c10e25f54a76390e3b39434e166f4bbd754a19096063ef760feaafd01a4cfccaa971674ecf7d61f9f0165a0d71651400d62615248da3fe7940e7b21bb6d326
-  data.tar.gz: 8a09c1eaac106fbc2716a43f26384fbaab1cc2d6a0386167e187e363ed043e88efe693a0cebabb1e9d050bb3bc8bb1ed0d769ae53b40002725627f0475b6cca6
+  metadata.gz: bad4f2253923af3acadf6c59846834a07bf8905dddbd8ccf1ca41920c98544dde39592c936b22f07d77763c86382e82a3983502a15c515a4b29b4b76bc90b4b6
+  data.tar.gz: 467388e24b4ea0f583dd1536834f21ed5e9c820feaf19f3347d0002b3106f91481886d6bd44549978c5bf652ceebf1bf116f5193304b4881a5c95abb6fb39252

data/Gemfile

@@ -1,10 +1,6 @@
 source "http://rubygems.org"
 
-# try to slowly migrate to v2 of the aws api
 gem 'aws-sdk', '~> 2'
-
-# 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'

data/VERSION

@@ -1 +1 @@
-0.5.1
+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.5.1 ruby lib
+# stub: hashicorptools 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hashicorptools".freeze
-  s.version = "0.5.1"
+  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 = "2020-07-29"
+  s.date = "2020-07-30"
   s.description = "Wrappers for terraform and packer".freeze
   s.email = "systems@controlshiftlabs.com".freeze
   s.executables = ["ec2_host".freeze]
@@ -39,47 +39,32 @@ Gem::Specification.new do |s|
     "lib/hashicorptools/packer.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 = "3.0.8".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<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<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
+  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<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"])

data/lib/hashicorptools.rb

@@ -2,7 +2,6 @@ require 'bundler/setup'
 require 'dotenv'
 require 'thor'
 require 'active_support/all'
-require 'aws-sdk-v1'
 require 'aws-sdk'
 
 module Hashicorptools

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

@@ -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,25 +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(&: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
@@ -106,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)
@@ -133,15 +136,16 @@ module Hashicorptools
       @auto_scaling ||= Aws::AutoScaling::Client.new(region: client_region)
     end
 
-    def ec2_v2(client_region=region)
-      @ec2 ||= Aws::EC2::Client.new(region: client_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(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(client_region).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
@@ -170,7 +174,9 @@ module Hashicorptools
         amis_to_remove.each do |ami|
           ebs_mappings = ami.block_device_mappings
           puts "Deregistering #{ami.image_id}"
-          ami.deregister
+          regional_ec2_client(region_to_clean).deregister_image({
+            image_id: ami.image_id
+          })
           delete_ami_snapshots(ebs_mappings, snapshot_region: region_to_clean)
         end
 
@@ -184,16 +190,21 @@ module Hashicorptools
     end
 
     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 )
+      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:)
-      regional_ec2_client = AWS::EC2::Client.new(region: snapshot_region)
-      ebs_mappings.each do |volume, attributes|
-        puts "Deleting snapshot #{attributes[:snapshot_id]}"
-        regional_ec2_client.delete_snapshot(snapshot_id: attributes[:snapshot_id])
+      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/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.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-v1-ruby24
-  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: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +198,7 @@ files:
 - lib/hashicorptools/packer.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:
@@ -233,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Wrappers for terraform and packer

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