lib/opsicle/commands/delete_instance.rb in opsicle-2.10.0 vs lib/opsicle/commands/delete_instance.rb in opsicle-2.10.1

@@ -16,30 +16,44 @@
       @cli = HighLine.new
     end
 
     def execute(options={})
       puts "Stack ID = #{@stack.id}"
-      instances_to_delete = select_instances
+      layer = select_layer
+      instances_to_delete = select_instances(layer)
       instances_to_delete.each do |instance|
         begin
           @opsworks.delete_instance(instance_id: instance.instance_id)
           puts "Successfully deleted #{instance.hostname}"
         rescue
           puts "Failed to delete #{instance.hostname}"
         end
       end
     end
 
-    def deleteable_instances
-      @stack.deleteable_instances
+    def deleteable_instances(layer)
+      @stack.deleteable_instances(layer)
+    end
 
+    def select_layer
+      puts "\nLayers:\n"
+      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+
+      layers = []
+      ops_layers.each do |layer|
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+      end
+
+      layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }
+      layer_index = @cli.ask("Layer?\n", Integer) { |q| q.in = 1..layers.length.to_i } - 1
+      layers[layer_index]
     end
 
-    def select_instances
-      instances = deleteable_instances
+    def select_instances(layer)
+      instances = deleteable_instances(layer)
       return_array = []
       if instances.empty?
-        puts "There are no deletable instances"
+        puts "There are no deletable instances."
       else
         puts "\nDeleteable Instances:\n"
         instances.each_with_index { |instance, index| puts "#{index.to_i + 1}) #{instance.status} - #{instance.hostname}" }
         instance_indices_string = @cli.ask("Which instances would you like to delete? (enter as a comma separated list)\n", String)
         instance_indices_list = instance_indices_string.split(/,\s*/)