opsicle 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4a6139a1f28b3ae6cf3991d656a7e31e464075
-  data.tar.gz: f7128a9f0fe5b0d145aa4b5db7bdb9e827c3d677
+  metadata.gz: 6c6b93ef64ca7f88eab52c8ee74dcaf62118e685
+  data.tar.gz: 9394c8f6bd05cf4488389d61c01009cdd21bd35e
 SHA512:
-  metadata.gz: 08e5c135a3f134369aff0784aa56e6e6b84184a3a63432ddee0af407183ed6f76f1a4dbd2a344efebedf8c98d91ac826567655479ce55c2ddbab719da08a98b0
-  data.tar.gz: 3c225eef9f149a80999a47e029ad71cd582efd595c5c08e13e77bcf04d4327d6a87c7f4116c89956bb2b994f6c67c4246da18454b7f174a40da10704585e3835
+  metadata.gz: 0de83bd629358a9ab0a6855f0232e5b6cd246f02084ec75606218e28cb1737f97fde7477c067931a3df9c1d290b98c7d3ec23348398a070798a4e9c521011ece
+  data.tar.gz: 1a3c871b0cb9564f62c000a474b16a5719d49b421510b3f69b884f22161700c8eb4e85894c4a06fdf54a97fd021e6ceb3acab0b6969c3e53c412ad65bea858cc

data/lib/opsicle/commands/add_tags.rb

@@ -1,6 +1,7 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/opsworks_adapter"
+require "opsicle/ec2_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -10,6 +11,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @ec2_adapter = Ec2Adapter.new(@client)
       @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
@@ -34,7 +36,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/clone_instance.rb

@@ -1,6 +1,7 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/opsworks_adapter"
+require "opsicle/ec2_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -10,6 +11,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @ec2_adapter = Ec2Adapter.new(@client)
       @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
@@ -40,7 +42,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/create_instance.rb

@@ -1,6 +1,7 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/opsworks_adapter"
+require "opsicle/ec2_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_stack"
 require "opsicle/creatable_instance"
@@ -10,6 +11,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @ec2_adapter = Ec2Adapter.new(@client)
       @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
@@ -26,7 +28,7 @@ module Opsicle
     end
 
     def create_instance(layer, options)
-      CreatableInstance.new(layer, @stack, @opsworks_adapter.client, @client.ec2, @cli).create(options)
+      CreatableInstance.new(layer, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli).create(options)
     end
 
     def select_layer
@@ -35,7 +37,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/delete_instance.rb

@@ -1,6 +1,7 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/opsworks_adapter"
+require "opsicle/ec2_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -10,6 +11,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @ec2_adapter = Ec2Adapter.new(@client)
       @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
@@ -40,7 +42,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/stop_instance.rb

@@ -1,6 +1,7 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/opsworks_adapter"
+require "opsicle/ec2_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -10,6 +11,7 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
+      @ec2_adapter = Ec2Adapter.new(@client)
       @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
@@ -40,7 +42,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @ec2_adapter.client, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/ec2_adapter.rb

@@ -0,0 +1,15 @@
+class Opsicle::Ec2Adapter
+  attr_reader :client
+
+  def initialize(client)
+    @client = client.ec2
+  end
+
+  def get_subnets
+    client.describe_subnets.subnets
+  end
+
+  def tag_instance(ec2_instance_id, tags)
+    client.create_tags(resources: [ ec2_instance_id ], tags: tags)
+  end
+end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.12.1"
+  VERSION = "2.12.2"
 end

data/spec/opsicle/ec2_adapter_spec.rb

@@ -0,0 +1,23 @@
+describe Opsicle::Ec2Adapter do
+  let(:aws_ec2_client) do
+    double(:aws_ec2_client,
+     describe_subnets: double(:subnets, subnets: []),
+     create_tags: :tags_created
+    )
+  end
+  let(:client) { double(:client, ec2: aws_ec2_client) }
+
+  subject { described_class.new(client) }
+
+  describe "#get_subnets" do
+    it "should gather an array of subnets for this ec2 client" do
+      expect(subject.get_subnets).to be_empty
+    end
+  end
+
+  describe "#tag_instance" do
+    it "should call to create a tag on an instance" do
+      expect(subject.tag_instance(:instance_id, [1, 2, 3])).to eq(:tags_created)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -216,6 +216,7 @@ files:
 - lib/opsicle/deploy_helper.rb
 - lib/opsicle/deployment.rb
 - lib/opsicle/deployments.rb
+- lib/opsicle/ec2_adapter.rb
 - lib/opsicle/errors.rb
 - lib/opsicle/instances.rb
 - lib/opsicle/layer.rb
@@ -255,6 +256,7 @@ files:
 - spec/opsicle/commands/update_spec.rb
 - spec/opsicle/commands/user_profile_info_spec.rb
 - spec/opsicle/config_spec.rb
+- spec/opsicle/ec2_adapter_spec.rb
 - spec/opsicle/errors_spec.rb
 - spec/opsicle/instances_spec.rb
 - spec/opsicle/layer_spec.rb
@@ -310,6 +312,7 @@ test_files:
 - spec/opsicle/s3_bucket_spec.rb
 - spec/opsicle/manageable_layer_spec.rb
 - spec/opsicle/opsworks_adapter_spec.rb
+- spec/opsicle/ec2_adapter_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
 - spec/opsicle/commands/clone_instance_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb