opsicle 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e61d35388f34cdb0123201879ba2a6e0b8737d6
-  data.tar.gz: ba08ee8d2d71fdf3dcefd6e5ba89dfd098f196c6
+  metadata.gz: ca50977663e63f6963d4db7590ae6fe5997fc903
+  data.tar.gz: 1515347a9f489aa3c092312c61431cc13cbce576
 SHA512:
-  metadata.gz: e1ec727a15e561239139e17f484a67c4708d8c42102187f47d2df59fd3722e5b547c50e7837c8cae10281d48ad3d94ff7976b797f9a1a6f6995b7ffa9e92a9ed
-  data.tar.gz: f450d31f77ef707f45bc55c921a895a12769374de33d9ec1789d40c10d6b45ae63edcb7596596ef4ea251a1a8a85fd286ce37cd2dadf2bb79c18a5d376c93068
+  metadata.gz: 70d15051bfd1c61ee6188f617c373a5589f1787f5c2f28e0dd062298535c1e8bf92e3bb4124cd4435538b467001821d64edb8f9ef64350510dd13ca26efcce61
+  data.tar.gz: f018f227c6cd17fbf0453aed9d88f98ab6014d116d4e3370e469524faf3be54b413b8b05142426de093a863a31de89418c0826efda198ca29d0b56e1aa6dad7b

data/lib/opsicle/client.rb

@@ -3,6 +3,7 @@ require 'opsicle/config'
 module Opsicle
   class Client
     attr_reader :opsworks
+    attr_reader :ec2
     attr_reader :s3
     attr_reader :config
 
@@ -14,6 +15,7 @@ module Opsicle
       aws_opts = {region: region}
       aws_opts[:credentials] = credentials unless credentials.nil?
       @opsworks = Aws::OpsWorks::Client.new aws_opts
+      @ec2 = Aws::EC2::Client.new aws_opts
       @s3 = Aws::S3::Client.new aws_opts
     end
 

data/lib/opsicle/cloneable_instance.rb

@@ -4,6 +4,7 @@ module Opsicle
       :hostname,
       :status,
       :layer,
+      :stack,
       :ami_id,
       :instance_type,
       :instance_id,
@@ -23,13 +24,15 @@ module Opsicle
       :ebs_optimized,
       :tenancy,
       :opsworks,
+      :ec2,
       :cli
     )
 
-    def initialize(instance, layer, opsworks, cli)
+    def initialize(instance, layer, stack, opsworks, ec2, cli)
       self.hostname = instance.hostname
       self.status = instance.status
       self.layer = layer
+      self.stack = stack
       self.ami_id = instance.ami_id
       self.instance_type = instance.instance_type
       self.agent_version = instance.agent_version
@@ -47,6 +50,7 @@ module Opsicle
       self.ebs_optimized = instance.ebs_optimized
       self.tenancy = instance.tenancy
       self.opsworks = opsworks
+      self.ec2 = ec2
       self.cli = cli
       self.instance_id = instance.instance_id
       self.new_instance_id = nil
@@ -109,6 +113,13 @@ module Opsicle
       !sibling_hostnames.include?(name)
     end
 
+    def find_subnet_name(subnet)
+      tags = subnet.tags
+      tag = nil
+      tags.each { |t| tag = t if t.key == 'Name' }
+      tag.value if tag
+    end
+
     def verify_ami_id
       if self.layer.ami_id
         ami_id = self.layer.ami_id
@@ -156,17 +167,26 @@ module Opsicle
       if self.layer.subnet_id
         subnet_id = self.layer.subnet_id
       else
-        puts "\nCurrent subnet id is #{self.subnet_id}"
+        current_subnet = Aws::EC2::Subnet.new(id: self.subnet_id)
+        subnet_name = find_subnet_name(current_subnet)
+        puts "\nCurrent subnet ID is \"#{subnet_name}\" #{current_subnet.availability_zone} (#{self.subnet_id})"
 
         if ask_for_overriding_permission("subnet ID", true)
-          instances = @opsworks.describe_instances(stack_id: self.stack_id).instances
-          subnet_ids = instances.collect { |i| i.subnet_id }.uniq
-          subnet_ids << "Provide a different subnet ID."
-          subnet_id = ask_for_possible_options(subnet_ids, "subnet ID")
+          ec2_subnets = ec2.describe_subnets.subnets
+          subnets = []
 
-          if subnet_id == "Provide a different subnet ID."
-            subnet_id = ask_for_new_option('subnet ID')
+          ec2_subnets.each do |subnet|
+            if subnet.vpc_id == stack.vpc_id
+              subnet_name = find_subnet_name(subnet)
+              zone_name = subnet.availability_zone
+              subnet_id = subnet.subnet_id
+              subnets << "\"#{subnet_name}\" #{zone_name} (#{subnet_id})"
+            end
           end
+
+          subnets = subnets.sort
+          subnet_id = ask_for_possible_options(subnets, "subnet ID")
+          subnet_id = subnet_id.scan(/(subnet-[a-z0-9]*)/).first.first if subnet_id
         else
           subnet_id = self.subnet_id
         end
@@ -212,9 +232,9 @@ module Opsicle
         os: self.os,
         ami_id: ami_id,
         ssh_key_name: self.ssh_key_name,
-        availability_zone: self.availability_zone,
-        virtualization_type: self.virtualization_type,
+        # availability_zone: self.availability_zone,
         subnet_id: subnet_id,
+        virtualization_type: self.virtualization_type,
         architecture: self.architecture, # accepts x86_64, i386
         root_device_type: self.root_device_type, # accepts ebs, instance-store
         install_updates_on_boot: self.install_updates_on_boot,

data/lib/opsicle/cloneable_layer.rb

@@ -1,11 +1,13 @@
 module Opsicle
   class CloneableLayer
-    attr_accessor :name, :layer_id, :instances, :opsworks, :cli, :agent_version, :ami_id, :subnet_id
+    attr_accessor :name, :layer_id, :stack, :instances, :opsworks, :ec2, :cli, :agent_version, :ami_id, :subnet_id
 
-    def initialize(name, layer_id, opsworks, cli)
+    def initialize(name, layer_id, stack, opsworks, ec2, cli)
       self.name = name
       self.layer_id = layer_id
+      self.stack = stack
       self.opsworks = opsworks
+      self.ec2 = ec2
       self.cli = cli
       self.instances = []
     end
@@ -13,14 +15,14 @@ module Opsicle
     def get_cloneable_instances
       ops_instances = @opsworks.describe_instances({ :layer_id => layer_id }).instances
       ops_instances.each do |instance|
-        self.instances << CloneableInstance.new(instance, self, @opsworks, @cli)
+        self.instances << CloneableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
       end
       self.instances
     end
 
     def add_new_instance(instance_id)
       instance = @opsworks.describe_instances({ :instance_ids => [instance_id] }).instances.first
-      self.instances << CloneableInstance.new(instance, self, @opsworks, @cli)
+      self.instances << CloneableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
     end
   end
 end

data/lib/opsicle/cloneable_stack.rb

@@ -1,11 +1,12 @@
 module Opsicle
   class CloneableStack
-    attr_accessor :id, :opsworks, :stack
+    attr_accessor :id, :opsworks, :stack, :vpc_id
 
     def initialize(stack_id, opsworks)
       self.id = stack_id
       self.opsworks = opsworks
       self.stack = get_stack
+      self.vpc_id = self.stack.vpc_id
     end
 
     def get_stack

data/lib/opsicle/commands/clone_instance.rb

@@ -10,6 +10,7 @@ module Opsicle
     def initialize(environment)
       @client = Client.new(environment)
       @opsworks = @client.opsworks
+      @ec2 = @client.ec2
       stack_id = @client.config.opsworks_config[:stack_id]
       @stack = CloneableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
       @cli = HighLine.new
@@ -39,7 +40,7 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << CloneableLayer.new(layer.name, layer.layer_id, @opsworks, @cli)
+        layers << CloneableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}"}

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.8.0"
+  VERSION = "2.9.0"
 end

data/spec/opsicle/cloneable_instance_spec.rb

@@ -25,19 +25,31 @@ module Opsicle
       allow(@layer).to receive(:subnet_id)
       @new_instance = double('new_instance', :instance_id => 1029384756)
       @opsworks = double('opsworks', :create_instance => @new_instance)
+      @ec2 = double('ec2')
+      @stack = double('stack')
       @agent_version_1 = double('agent_version', :version => '3434-20160316181345')
       @agent_version_2 = double('agent_version', :version => '3435-20160406115841')
       @agent_version_3 = double('agent_version', :version => '3436-20160418214624')
       @agent_versions = double('agent_versions', :agent_versions => [@agent_version_1, @agent_version_2, @agent_version_3])
       allow(@opsworks).to receive(:describe_agent_versions).with({:stack_id=>1234567890}).and_return(@agent_versions)
+      tag1 = double('tag', :value => 'Subnet', :key => 'Name')
+      @tags = [tag1]
+      @subnet1 = double('subnet', :vpc_id => 'vpc-123456', :subnet_id => 'subnet-123456', :tags => @tags, :availability_zone => 'us-east-1b')
+      @subnet2 = double('subnet', :vpc_id => 'vpc-123456', :subnet_id => 'subnet-789123', :tags => @tags, :availability_zone => 'us-east-1b')
+      @subnet3 = double('subnet', :vpc_id => 'vpc-123456', :subnet_id => 'subnet-456789', :tags => @tags, :availability_zone => 'us-east-1b')
+      @subnets = double('subnets', :subnets => [@subnet1, @subnet2, @subnet3])
+      allow(@stack).to receive(:vpc_id).and_return('vpc-123456')
       @instances = double('instances', :instances => [@instance])
+      allow(@ec2).to receive(:describe_subnets).and_return(@subnets)
       allow(@opsworks).to receive(:describe_instances).with({:stack_id=>1234567890}).and_return(@instances)
+      @current_subnet = double('subnet', :tags => @tags, :availability_zone => 'us-east-1b')
+      allow(Aws::EC2::Subnet).to receive(:new).and_return(@current_subnet)
       @cli = double('cli', :ask => 2)
     end
 
     context "#make_new_hostname" do
       it "should make a unique incremented hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         instance1 = double('instance', :hostname => 'example-hostname-01')
         instance2 = double('instance', :hostname => 'example-hostname-02')
         allow(@layer).to receive(:instances).and_return([instance1, instance2])
@@ -45,7 +57,7 @@ module Opsicle
       end
 
       it "should make a unique incremented hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         instance1 = double('instance', :hostname => 'example-hostname-01')
         instance2 = double('instance', :hostname => 'example-hostname-02')
         instance3 = double('instance', :hostname => 'example-hostname-03')
@@ -57,7 +69,7 @@ module Opsicle
 
     context "#increment_hostname" do
       it "should increment the hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:hostname_unique?).and_return('example-hostname-03')
         allow(@opsworks).to receive(:describe_agent_version).with({})
         expect(instance.increment_hostname).to eq('example-hostname-01')
@@ -66,13 +78,13 @@ module Opsicle
 
     context "#clone" do
       it "should grab instances and make new hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:make_new_hostname).and_return('example-hostname-03')
         instance.clone({})
       end
 
       it "should get information from old instance" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:verify_ami_id)
         expect(instance).to receive(:verify_agent_version)
         expect(instance).to receive(:verify_instance_type)
@@ -81,13 +93,13 @@ module Opsicle
       end
 
       it "should create new instance" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:create_new_instance)
         instance.clone({})
       end
 
       it "should start new instance" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(instance).to receive(:ask_to_start_instance).and_return(true)
         expect(instance).to receive(:start_new_instance)
         instance.clone({})
@@ -97,7 +109,7 @@ module Opsicle
     context '#verify_agent_version' do
       it "should check the agent version and ask if the user wants a new agent version" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:agent_version).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this version? By overriding, you are choosing to override the current agent version for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(instance).to receive(:ask_for_possible_options)
@@ -105,7 +117,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the agent version" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:agent_version)
         instance.verify_agent_version
       end
@@ -114,7 +126,7 @@ module Opsicle
     context '#verify_subnet_id' do
       it "should check the subnet id and ask if the user wants a new subnet id" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:subnet_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this id? By overriding, you are choosing to override the current agent version for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(instance).to receive(:ask_for_possible_options)
@@ -122,7 +134,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the subnet id" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:subnet_id)
         instance.verify_subnet_id
       end
@@ -131,7 +143,7 @@ module Opsicle
     context '#verify_ami_id' do
       it "should check the ami id and ask if the user wants a new ami" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:ami_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this AMI? By overriding, you are choosing to override the current AMI for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(@cli).to receive(:ask)
@@ -140,7 +152,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the ami id" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:ami_id)
         instance.verify_ami_id
       end
@@ -149,7 +161,7 @@ module Opsicle
     context '#verify_instance_type' do
       it "should check the agent version and ask if the user wants a new agent version" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:ami_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this instance type?\n1) Yes\n2) No", Integer).and_return(1)
         expect(@cli).to receive(:ask).twice
@@ -159,19 +171,18 @@ module Opsicle
 
     context "#create_new_instance" do
       it "should create an instance" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:create_instance)
         instance.create_new_instance('hostname', 'type', 'ami', 'agent_version', 'subnet_id')
       end
 
       it "should take information from old instance" do
-        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:stack_id)
         expect(instance).to receive(:layer_ids)
         expect(instance).to receive(:auto_scaling_type)
         expect(instance).to receive(:os)
         expect(instance).to receive(:ssh_key_name)
-        expect(instance).to receive(:availability_zone)
         expect(instance).to receive(:virtualization_type)
         instance.create_new_instance('hostname', 'type', 'ami', 'agent_version', 'subnet_id')
       end

data/spec/opsicle/cloneable_layer_spec.rb

@@ -36,18 +36,20 @@ module Opsicle
       @instances = double('instances', :instances => [@instance1, @instance2])
       @new_instance = double('new_instance', :instances => [@instance3])
       @opsworks = double('opsworks', :describe_instances => @instances)
+      @ec2 = double('ec2')
+      @stack = double('stack')
     end
 
     context "#get_cloneable_instances" do
       it "should gather opsworks instances for that layer" do
-        layer = CloneableLayer.new('layer-name', 12345, @opsworks, @cli)
+        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@instances)
         expect(@instances).to receive(:instances)
         layer.get_cloneable_instances
       end
 
       it "should make a new CloneableInstance for each instance" do
-        layer = CloneableLayer.new('layer-name', 12345, @opsworks, @cli)
+        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(CloneableInstance).to receive(:new).twice
         layer.get_cloneable_instances
       end
@@ -55,14 +57,14 @@ module Opsicle
 
     context "#add_new_instance" do
       it "should accurately find a new instance via instance_id" do
-        layer = CloneableLayer.new('layer-name', 12345, @opsworks, @cli)
+        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@new_instance)
         expect(@new_instance).to receive(:instances)
         layer.add_new_instance('456-789')
       end
 
       it "should add the new instance to the instances array" do
-        layer = CloneableLayer.new('layer-name', 12345, @opsworks, @cli)
+        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@new_instance)
         expect(CloneableInstance).to receive(:new).once
         layer.add_new_instance('456-789')

data/spec/opsicle/cloneable_stack_spec.rb

@@ -6,7 +6,7 @@ require "opsicle/user_profile"
 module Opsicle
   describe CloneableStack do
     before do
-      @stack = double('stack')
+    @stack = double('stack', :vpc_id => 'vpc-123456')
       @stacks = double('stacks', :stacks => [@stack])
       @opsworks = double('opsworks', :describe_stacks => @stacks)
     end

data/spec/opsicle/commands/clone_instance_spec.rb

@@ -29,13 +29,14 @@ module Opsicle
       @layer2 = double('layer2', :name => 'layer-2', :layer_id => 67890, :instances => [@instance1, @instance2])
       @layers = double('layers', :layers => [@layer1, @layer2])
       @new_instance = double('new_instance', :instance_id => 1029384756)
-      @stack = double('stack')
+      @stack = double('stack', :vpc_id => "vpc-123456")
       @stacks = double('stacks', :stacks => [@stack])
       @opsworks = double('opsworks', :describe_instances => @instances, :describe_layers => @layers,
                                      :create_instance => @new_instance, :describe_stacks => @stacks,
                                      :start_instance => @new_instance)
+      @ec2 = double('ec2')
       @config = double('config', :opsworks_config => {:stack_id => 1234567890})
-      @client = double('client', :config => @config, :opsworks => @opsworks)
+      @client = double('client', :config => @config, :opsworks => @opsworks, :ec2 => @ec2)
       allow(Client).to receive(:new).with(:environment).and_return(@client)
       allow(@instances).to receive(:each_with_index)
       @agent_version_1 = double('agent_version', :version => '3434-20160316181345')
@@ -43,6 +44,10 @@ module Opsicle
       @agent_version_3 = double('agent_version', :version => '3436-20160418214624')
       @agent_versions = double('agent_versions', :agent_versions => [@agent_version_1, @agent_version_2, @agent_version_3])
       allow(@opsworks).to receive(:describe_agent_versions).and_return(@agent_versions)
+      tag1 = double('tag', :value => 'Subnet', :key => 'Name')
+      @tags = [tag1]
+      @current_subnet = double('subnet', :tags => @tags, :availability_zone => 'us-east-1b')
+      allow(Aws::EC2::Subnet).to receive(:new).and_return(@current_subnet)
       allow_any_instance_of(HighLine).to receive(:ask).with("Layer?\n", Integer).and_return(2)
       allow_any_instance_of(HighLine).to receive(:ask).with("Instances? (enter as a comma separated list)\n", String).and_return('2')
       allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this hostname?\n1) Yes\n2) No", Integer).and_return(2)
@@ -93,7 +98,8 @@ module Opsicle
       it "generates a new AWS client from the given configs" do
         @config = double('config', :opsworks_config => {:stack_id => 1234567890})
         @client = double('client', :config => @config,
-                                   :opsworks => @opsworks)
+                                   :opsworks => @opsworks,
+                                   :ec2 => @ec2)
         expect(Client).to receive(:new).with(:environment).and_return(@client)
         CloneInstance.new(:environment)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk