opsicle 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb0c5b2df559b5e304081b7873a6b2a1cb54056
-  data.tar.gz: 003e30c1669eaa33aca7fe4c98d9442099c30e4d
+  metadata.gz: 62234a4db3f58fa24aff77217786dd4be48d0763
+  data.tar.gz: ac69c2625a780fdd78ceaaf38e3299fe2c1807c0
 SHA512:
-  metadata.gz: d94244b39e85e12301faa568330dae5a22fb937397fd55acee3f57fa0843e220d3bad89c1b3f45e08805dda16e609efd9d38a7792078ef5b313189242ddbf14c
-  data.tar.gz: d46d043f5ef64d3f74580cb9645a6b733533dc49323922f16f51bdb8acd523e2711e63aef8ce4b47c71db5be0dd7edff72cccfd2d19e1573148b75791067746d
+  metadata.gz: c38462e8b4c1cc7205bc71a73936e6e9df19845cfed644ea18078339d872a7e132ee9be688e03ea587642b83ba0d2a4a8b23da5caa09a26a4dfa67752548fd26
+  data.tar.gz: 702c9a75c1e83385437d41a5603c62f7b0d57564228444f4e1a8e1e056793eb05bc4df66d10f10a4e8573c2f445526733484f777964717b80be567ef1ee25aba

data/lib/opsicle/cloneable_instance.rb

@@ -34,9 +34,10 @@ module Opsicle
       new_instance_hostname = make_new_hostname(self.hostname)
       ami_id = verify_ami_id
       agent_version = verify_agent_version
+      subnet_id = verify_subnet_id
       instance_type = verify_instance_type
 
-      create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version)
+      create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version, subnet_id)
     end
 
     def make_new_hostname(old_hostname)
@@ -49,8 +50,7 @@ module Opsicle
       end
         
       puts "\nAutomatically generated hostname: #{new_instance_hostname}\n"
-      rewriting = @cli.ask("Do you wish to rewrite this hostname?\n1) Yes\n2) No", Integer)
-      new_instance_hostname = @cli.ask("Please write in the new instance's hostname and press ENTER:") if rewriting == 1
+      new_instance_hostname = ask_for_new_option("instance's hostname") if ask_for_overriding_permission("hostname", false)
 
       new_instance_hostname
     end
@@ -71,8 +71,19 @@ module Opsicle
         ami_id = self.layer.ami_id
       else
         puts "\nCurrent AMI id is #{self.ami_id}"
-        rewriting = @cli.ask("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)
-        ami_id = rewriting == 1 ? @cli.ask("Please write in the new AMI id press ENTER:") : self.ami_id
+
+        if ask_for_overriding_permission("AMI ID", true)
+          instances = @opsworks.describe_instances(stack_id: self.stack_id).instances
+          ami_ids = instances.collect { |i| i.ami_id }.uniq
+          ami_ids << "Provide a different AMI ID."
+          ami_id = ask_for_possible_options(ami_ids, "AMI ID")
+
+          if ami_id == "Provide a different AMI ID."
+            ami_id = ask_for_new_option('AMI ID')
+          end
+        else
+          ami_id = self.ami_id
+        end
       end
 
       self.layer.ami_id = ami_id
@@ -84,35 +95,71 @@ module Opsicle
         agent_version = self.layer.agent_version
       else
         puts "\nCurrent agent version is #{self.agent_version}"
-        rewriting = @cli.ask("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)
-        agent_version = rewriting == 1 ? get_new_agent_version : self.agent_version
+
+        if ask_for_overriding_permission("agent version", true)
+          agents = @opsworks.describe_agent_versions(stack_id: self.stack_id).agent_versions
+          version_ids = agents.collect { |i| i.version }.uniq
+          agent_version = ask_for_possible_options(version_ids, "agent version")
+        else
+          agent_version = self.agent_version
+        end
       end
 
       self.layer.agent_version = agent_version
       agent_version
     end
 
-    def get_new_agent_version
-      agents = @opsworks.describe_agent_versions(stack_id: self.stack_id).agent_versions
-
-      version_ids = []
-      agents.each do |agent|
-        version_ids << agent.version
+    def verify_subnet_id
+      if self.layer.subnet_id
+        subnet_id = self.layer.subnet_id
+      else
+        puts "\nCurrent subnet id is #{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")
+
+          if subnet_id == "Provide a different subnet ID."
+            subnet_id = ask_for_new_option('subnet ID')
+          end
+        else
+          subnet_id = self.subnet_id
+        end
       end
 
-      version_ids.each_with_index { |id, index| puts "#{index.to_i + 1}) #{id}"}
-      id_index = @cli.ask("Which agent version ID?\n", Integer) { |q| q.in = 1..version_ids.length.to_i } - 1
-      version_ids[id_index]
+      self.layer.subnet_id = subnet_id
+      subnet_id
     end
 
     def verify_instance_type
       puts "\nCurrent instance type is #{self.instance_type}"
-      rewriting = @cli.ask("Do you wish to override this instance type?\n1) Yes\n2) No", Integer)
-      instance_type = rewriting == 1 ? @cli.ask("Please write in the new instance type press ENTER:") : self.instance_type
+      rewriting = ask_for_overriding_permission("instance type", false)
+      instance_type = rewriting ? ask_for_new_option('instance type') : self.instance_type
       instance_type
     end
 
-    def create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version)
+    def ask_for_possible_options(arr, description)
+      arr.each_with_index { |id, index| puts "#{index.to_i + 1}) #{id}"}
+      id_index = @cli.ask("Which #{description}?\n", Integer) { |q| q.in = 1..arr.length.to_i } - 1
+      arr[id_index]
+    end
+
+    def ask_for_new_option(description)
+      @cli.ask("Please write in the new #{description} and press ENTER:")
+    end
+
+    def ask_for_overriding_permission(description, overriding_all)
+      if overriding_all
+        ans = @cli.ask("Do you wish to override this #{description}? By overriding, you are choosing to override the current #{description} for all instances you are cloning.\n1) Yes\n2) No", Integer)
+      else
+        ans = @cli.ask("Do you wish to override this #{description}?\n1) Yes\n2) No", Integer)
+      end
+      ans == 1
+    end
+
+    def create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version, subnet_id)
       new_instance = @opsworks.create_instance({
         stack_id: self.stack_id, # required
         layer_ids: self.layer_ids, # required
@@ -124,7 +171,7 @@ module Opsicle
         ssh_key_name: self.ssh_key_name,
         availability_zone: self.availability_zone,
         virtualization_type: self.virtualization_type,
-        subnet_id: self.subnet_id,
+        subnet_id: subnet_id,
         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,6 +1,6 @@
 module Opsicle
   class CloneableLayer
-    attr_accessor :name, :layer_id, :instances, :opsworks, :cli, :agent_version, :ami_id
+    attr_accessor :name, :layer_id, :instances, :opsworks, :cli, :agent_version, :ami_id, :subnet_id
 
     def initialize(name, layer_id, opsworks, cli)
       self.name = name

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/spec/opsicle/cloneable_instance_spec.rb

@@ -21,8 +21,17 @@ module Opsicle
       allow(@layer).to receive(:agent_version=)
       allow(@layer).to receive(:agent_version)
       allow(@layer).to receive(:add_new_instance)
+      allow(@layer).to receive(:subnet_id=)
+      allow(@layer).to receive(:subnet_id)
       @new_instance = double('new_instance', :instance_id => 1029384756)
       @opsworks = double('opsworks', :create_instance => @new_instance)
+      @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)
+      @instances = double('instances', :instances => [@instance])
+      allow(@opsworks).to receive(:describe_instances).with({:stack_id=>1234567890}).and_return(@instances)
       @cli = double('cli', :ask => 2)
     end
 
@@ -51,6 +60,7 @@ module Opsicle
       it "should increment the hostname" do
         instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
         expect(instance).to receive(:hostname_unique?).and_return('example-hostname-03')
+        allow(@opsworks).to receive(:describe_agent_version).with({})
         instance.increment_hostname('example-hostname-01', ['example-hostname-01', 'example-hostname-02'])
       end
     end
@@ -67,6 +77,7 @@ module Opsicle
         expect(instance).to receive(:verify_ami_id)
         expect(instance).to receive(:verify_agent_version)
         expect(instance).to receive(:verify_instance_type)
+        expect(instance).to receive(:verify_subnet_id)
         instance.clone({})
       end
 
@@ -83,7 +94,7 @@ module Opsicle
         instance = CloneableInstance.new(@instance, @layer, @opsworks, @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(:get_new_agent_version)
+        expect(instance).to receive(:ask_for_possible_options)
         instance.verify_agent_version
       end
 
@@ -94,13 +105,31 @@ module Opsicle
       end
     end
 
+    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)
+        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)
+        instance.verify_subnet_id
+      end
+
+      it "should see if the layer already has overwritten the subnet id" do
+        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        expect(@layer).to receive(:subnet_id)
+        instance.verify_subnet_id
+      end
+    end
+
     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)
         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).twice
+        expect(@cli).to receive(:ask)
+        expect(instance).to receive(:ask_for_possible_options)
         instance.verify_ami_id
       end
 
@@ -126,7 +155,7 @@ module Opsicle
       it "should create an instance" do
         instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
         expect(@opsworks).to receive(:create_instance)
-        instance.create_new_instance('hostname', 'type', 'ami', 'agent_version')
+        instance.create_new_instance('hostname', 'type', 'ami', 'agent_version', 'subnet_id')
       end
 
       it "should take information from old instance" do
@@ -138,8 +167,7 @@ module Opsicle
         expect(instance).to receive(:ssh_key_name)
         expect(instance).to receive(:availability_zone)
         expect(instance).to receive(:virtualization_type)
-        expect(instance).to receive(:subnet_id)
-        instance.create_new_instance('hostname', 'type', 'ami', 'agent_version')
+        instance.create_new_instance('hostname', 'type', 'ami', 'agent_version', 'subnet_id')
       end
     end
   end

data/spec/opsicle/commands/clone_instance_spec.rb

@@ -37,16 +37,23 @@ module Opsicle
       @client = double('client', :config => @config, :opsworks => @opsworks)
       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')
+      @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).and_return(@agent_versions)
       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 rewrite this hostname?\n1) Yes\n2) No", Integer).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)
       allow_any_instance_of(HighLine).to receive(:ask).with("Please write in the new instance's hostname and press ENTER:").and_return('example-hostname')
-      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(2)
-      allow_any_instance_of(HighLine).to receive(:ask).with("Please write in the new AMI id press ENTER:").and_return('example-ami')
-      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(2)
-      allow_any_instance_of(HighLine).to receive(:ask).with("Which agent version ID?\n", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this AMI ID? By overriding, you are choosing to override the current AMI ID for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which AMI ID?\n", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this agent 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(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which agent version?\n", Integer).and_return(1)
       allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this instance type?\n1) Yes\n2) No", Integer).and_return(2)
       allow_any_instance_of(HighLine).to receive(:ask).with("Please write in the new instance type press ENTER:").and_return('t2.micro')
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this subnet ID? By overriding, you are choosing to override the current subnet ID for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which subnet ID?\n", Integer).and_return(1)
     end
     
     context "#execute" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk