elbas 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32639852b7a6af9bce74c3e376c271e4f7847bec72268de2d2f0d9533cea6138
-  data.tar.gz: 5ba3d1d1d1c599ad1c0a4bcc88643db6287e5cca6dad4deb49831a7ce7a36e8e
+  metadata.gz: 8a9767c651ec0c1760448416fd452ca1fffb11f8506d0dae40cd736484df7caa
+  data.tar.gz: 5b70894f9efe95dfe0bb4744551b4830573f0eb77a33e0fef8d859153d9495c8
 SHA512:
-  metadata.gz: f4b57b5fa841290a1356cd8faca19f9b1591aae7e91952661200605f75c323876308e42f7fa599f765dc8a2af34a6b08f7f6720e0a973de726ccbe615136bf70
-  data.tar.gz: b6ed8c0f548a61a18dc10b1c493b7e18fa97cfa3b98d94da4b8ebfa7f0c467a95d46db7f418032a1f424b52b3a191272c522e9ae234e053760ec51cb6ab95713
+  metadata.gz: a86b52dc84b95896c1f6d9bea51d6dffa7c77042314544ca340c8e96c636116fc5a5623d4d9e88fa1f759a0fe8b7a040ded8887015e8f140c4aab3ba0c19b441
+  data.tar.gz: 83f24b0f72ecabcea6ddfadd01a6be41d4d4cfbc02ac55349ddaa3e9f665b145df6fabc0a9be9c6c39fcad70b9ed9d302bbc57a49255d8e538ebb049acd586a9

data/lib/elbas.rb

@@ -1,6 +1,4 @@
 require 'capistrano/all'
-require 'active_support/concern'
-
 require 'aws-sdk-autoscaling'
 require 'aws-sdk-ec2'
 

data/lib/elbas/aws/autoscale_group.rb

@@ -17,12 +17,13 @@ module Elbas
       end
 
       def launch_template
-        raise Elbas::Errors::NoLaunchTemplate unless aws_counterpart.launch_template
+        lts = aws_launch_template || aws_launch_template_specification
+        raise Elbas::Errors::NoLaunchTemplate unless lts
 
         LaunchTemplate.new(
-          aws_counterpart.launch_template.launch_template_id,
-          aws_counterpart.launch_template.launch_template_name,
-          aws_counterpart.launch_template.version,
+          lts.launch_template_id,
+          lts.launch_template_name,
+          lts.version
         )
       end
 
@@ -38,6 +39,14 @@ module Elbas
             .first
         end
 
+        def aws_launch_template
+          aws_counterpart.launch_template
+        end
+
+        def aws_launch_template_specification
+          aws_counterpart.mixed_instances_policy&.launch_template
+            &.launch_template_specification
+        end
     end
   end
-end
+end

data/lib/elbas/logger.rb

@@ -4,17 +4,35 @@ module Elbas
   module Logger
     include Capistrano::Doctor::OutputHelpers
 
+    PREFIX_TEXT = '[ELBAS] '.freeze
+
     def info(message)
       $stdout.puts [prefix, message, "\n"].join
     end
 
-    def cyan(text)
-      color.colorize text, :cyan
+    def error(message)
+      $stderr.puts [error_prefix, message, "\n"].join
     end
 
     private
       def prefix
-        @prefix ||= cyan('[ELBAS] ')
+        @prefix ||= cyan(PREFIX_TEXT)
+      end
+
+      def error_prefix
+        @error_prefix ||= red(PREFIX_TEXT)
+      end
+
+      def cyan(text)
+        color_text text, :cyan
+      end
+
+      def red(text)
+        color_text text, :red
+      end
+
+      def color_text(text, coloring)
+        color.colorize text, coloring
       end
   end
 end

data/lib/elbas/version.rb

@@ -1,3 +1,3 @@
 module Elbas
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

data/spec/aws/autoscale_group_spec.rb

@@ -48,6 +48,20 @@ describe Elbas::AWS::AutoscaleGroup do
       expect(subject.launch_template.version).to eq '$Latest'
     end
 
+    it 'returns a LauchTemplate object for fleet composition' do
+      allow(subject.aws_counterpart).to receive(:launch_template) { nil }
+      allow(subject.aws_counterpart).to receive_message_chain(
+        :mixed_instances_policy, :launch_template,
+        :launch_template_specification) do
+        double(launch_template_id: 'test-2',
+               launch_template_name: 'mixed_instance',
+               version: '$Latest')
+      end
+
+      expect(subject.launch_template.id).to eq 'test-2'
+      expect(subject.launch_template.name).to eq 'mixed_instance'
+      expect(subject.launch_template.version).to eq '$Latest'
+    end
 
   end
-end
+end

data/spec/capistrano_spec.rb

@@ -63,4 +63,15 @@ describe '#autoscale' do
       expect(env.servers.to_a[1].properties.keys).to_not include :primary
     end
   end
-end
+
+  context 'no servers' do
+    before do
+      webmock :post, %r{ec2.(.*).amazonaws.com\/\z} => 'DescribeInstances_Empty.200.xml',
+        with: Hash[body: /Action=DescribeInstances/]
+    end
+
+    it 'logs as an error' do
+      expect { autoscale 'test-asg' }.to output.to_stderr
+    end
+  end
+end

data/spec/support/stubs/DescribeInstances_Empty.200.xml

@@ -0,0 +1,17 @@
+<DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2014-10-01/">
+  <requestId>fdcdcab1-ae5c-489e-9c33-4637c5dda355</requestId>
+    <reservationSet>
+      <item>
+        <reservationId>r-1a2b3c4d</reservationId>
+        <ownerId>123456789012</ownerId>
+        <groupSet>
+          <item>
+            <groupId>sg-1a2b3c4d</groupId>
+            <groupName>my-security-group</groupName>
+          </item>
+        </groupSet>
+        <instancesSet>
+        </instancesSet>
+      </item>
+    </reservationSet>
+    </DescribeInstancesResponse>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elbas
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,6 +184,7 @@ files:
 - spec/support/stubs/DescribeAutoScalingGroups.200.xml
 - spec/support/stubs/DescribeImages.200.xml
 - spec/support/stubs/DescribeInstances.200.xml
+- spec/support/stubs/DescribeInstances_Empty.200.xml
 - spec/support/stubs/DescribeInstances_MultipleReservations.200.xml
 - spec/support/stubs/DescribeInstances_MultipleRunning.200.xml
 - spec/support/stubs/DescribeLaunchConfigurations.200.xml
@@ -233,6 +234,7 @@ test_files:
 - spec/support/stubs/DescribeAutoScalingGroups.200.xml
 - spec/support/stubs/DescribeImages.200.xml
 - spec/support/stubs/DescribeInstances.200.xml
+- spec/support/stubs/DescribeInstances_Empty.200.xml
 - spec/support/stubs/DescribeInstances_MultipleReservations.200.xml
 - spec/support/stubs/DescribeInstances_MultipleRunning.200.xml
 - spec/support/stubs/DescribeLaunchConfigurations.200.xml