opsworks-cli 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7245edfcd7b7b42bb13b880e8e6e420eed060679712b2f1e6e4d54052387fa99
-  data.tar.gz: 3c8699d3f0b438b1f5a55779dd0f233cd596be5980a35cee36aeeba6ec708bd0
+  metadata.gz: 4559d0b2cb6a2d928f5ada92931a25d2dc6a1701549cace6f847989edd93e66c
+  data.tar.gz: b59bf1e379e042ebae144fef653da7e45678b5c9b47e4f9e1ae12c2903d435df
 SHA512:
-  metadata.gz: aa0ae55d4ea9198bd44e329e933de21b2a3bf62758537c7816b70730f66a14ac770bdf8f31206c010326599c1998268869328b9382273afa9b19d1ca078e9003
-  data.tar.gz: a5fa63b9259cb2c9aa8f91dd44d2c0a5379f42d4b1d7794f8f93244c48428715cd69e4f456783b3656011ee1599ddae6e82f857134c0c3e58767568547ad9902
+  metadata.gz: ad0296093d9d19cd0fb49fb83c5b6b3a0d1477024dafc3402af1ebb508b49c39fa78e0c4eab236a44b343f1065483c53ee18dfbd2e0eff0aa329a31ed0c3d36c
+  data.tar.gz: 5598f4b72427313587c8b6e53de8945776e969c46cb07cf0d8be03366ff28db7f27bb0532e3bc452580d499d700935e7dc33037611a5d2626a05d36c1dc2880a

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @almathew

data/README.md

@@ -56,6 +56,4 @@ Commands:
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2014 [Aptible](https://www.aptible.com) and contributors.
-
-[<img src="https://s.gravatar.com/avatar/f7790b867ae619ae0496460aa28c5861?s=60" style="border-radius: 50%;" alt="@fancyremarker" />](https://github.com/fancyremarker)
+Copyright (c) 2019 [Aptible](https://www.aptible.com) and contributors.

data/lib/opsworks/cli/subcommands/instances.rb

@@ -11,11 +11,16 @@ module OpsWorks
               stacks = parse_stacks(options)
               stacks.each do |stack|
                 stack.instances.each do |instance|
-                  say [
+                  arr = [
                     stack.name,
                     instance.hostname,
                     instance.status
-                  ].join("\t")
+                  ]
+                  # TODO: Why does a EOL tab break say?
+                  if (errors = instance.service_errors).any?
+                    arr << errors.join(', ')
+                  end
+                  say arr.join("\t")
                 end
               end
             end

data/lib/opsworks/cli/subcommands/recipes.rb

@@ -7,11 +7,12 @@ module OpsWorks
             desc 'recipes:run RECIPE [--stack STACK]', 'Execute a Chef recipe'
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
+            option :layer, type: :string
             define_method 'recipes:run' do |recipe|
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
                 say "Executing recipe on #{stack.name}..."
-                stack.execute_recipe(recipe)
+                stack.execute_recipe(recipe, layer: options[:layer])
               end
               OpsWorks::Deployment.wait(deployments, options[:timeout])
               unless deployments.all?(&:success?)

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

data/lib/opsworks/instance.rb

@@ -1,6 +1,7 @@
 module OpsWorks
   class Instance < Resource
-    attr_accessor :id, :hostname, :ec2_instance_id, :instance_type, :status
+    attr_accessor :id, :hostname, :ec2_instance_id, :instance_type, :status,
+                  :service_errors
 
     FATAL_STATUSES = %w(
       connection_lost setup_failed start_failed stop_failed
@@ -12,13 +13,24 @@ module OpsWorks
 
     def self.from_collection_response(client, response)
       response.data[:instances].map do |hash|
+        # If instance is in start_failed status, grab the service errors to
+        # help explain why
+        if hash[:status] == 'start_failed'
+          instance_id = hash[:instance_id]
+          raw = client.describe_service_errors(instance_id: instance_id)
+          service_errors = raw[:service_errors].map { |e| e[:message] }
+        else
+          service_errors = []
+        end
+
         new(
           client,
           id: hash[:instance_id],
           hostname: hash[:hostname],
           ec2_instance_id: hash[:ec2_instance_id],
           instance_type: hash[:instance_type],
-          status: hash[:status]
+          status: hash[:status],
+          service_errors: service_errors
         )
       end
     end

data/lib/opsworks/stack.rb

@@ -103,13 +103,17 @@ module OpsWorks
       create_deployment(command: { name: 'update_custom_cookbooks' })
     end
 
-    def execute_recipe(recipe)
-      create_deployment(
+    def execute_recipe(recipe, layer: nil)
+      deploy_args = {
         command: {
           name: 'execute_recipes',
           args: { 'recipes' => [recipe] }
         }
-      )
+      }
+
+      deploy_args[:layer_ids] = [layer_id_from_name(layer)] if layer
+
+      create_deployment(**deploy_args)
     end
 
     def deploy_app(app, layer: nil, args: {})
@@ -123,11 +127,7 @@ module OpsWorks
         }
       }
 
-      if layer
-        layer = layers.find { |l| l.shortname == layer }
-        raise "Layer #{layer} not found" unless layer
-        deploy_args[:layer_ids] = [layer.id]
-      end
+      deploy_args[:layer_ids] = [layer_id_from_name(layer)] if layer
 
       create_deployment(**deploy_args)
     end
@@ -193,6 +193,12 @@ module OpsWorks
     end
     # rubocop:enable Eval
 
+    def layer_id_from_name(shortname)
+      layer = layers.find { |l| l.shortname == shortname }
+      raise "Layer #{layer} not found" unless layer
+      layer.id
+    end
+
     def initialize_apps
       return [] unless id
       response = client.describe_apps(stack_id: id)

data/opsworks-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'aws-sdk', '~> 2.9.6'
+  spec.add_dependency 'aws-sdk', '~> 2.11.192'
   spec.add_dependency 'jsonpath'
   spec.add_dependency 'activesupport'
 

data/spec/fabricators/opsworks/instance_fabricator.rb

@@ -3,4 +3,5 @@ Fabricator(:instance, from: OpsWorks::Instance) do
   id { SecureRandom.uuid }
   hostname { Fabricate.sequence { |i| "test-instance#{i}" } }
   status { 'online' }
+  service_errors { [] }
 end

data/spec/opsworks/cli/subcommands/recipes_spec.rb

@@ -13,23 +13,33 @@ describe OpsWorks::CLI::Agent do
     describe 'recipes:run' do
       let(:success) { Fabricate(:deployment, status: 'successful') }
       let(:failure) { Fabricate(:deployment, status: 'failed') }
+      let(:args) { [recipe, { layer: nil }] }
 
       it 'should update custom cookbooks on all stacks' do
-        expect(stacks[0]).to receive(:execute_recipe).with(recipe) { success }
-        expect(stacks[1]).to receive(:execute_recipe).with(recipe) { success }
+        expect(stacks[0]).to receive(:execute_recipe).with(*args) { success }
+        expect(stacks[1]).to receive(:execute_recipe).with(*args) { success }
         subject.send('recipes:run', recipe)
       end
 
       it 'should optionally run on a subset of stacks' do
-        expect(stacks[0]).to receive(:execute_recipe).with(recipe) { success }
+        expect(stacks[0]).to receive(:execute_recipe).with(*args) { success }
         expect(stacks[1]).not_to receive(:execute_recipe)
 
         allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
         subject.send('recipes:run', recipe)
       end
 
+      it 'should optionally run on a single layer' do
+        args = [recipe, { layer: 'git' }]
+        expect(stacks[0]).to receive(:execute_recipe).with(*args) { success }
+        expect(stacks[1]).to receive(:execute_recipe).with(*args) { success }
+
+        allow(subject).to receive(:options) { { layer: 'git' } }
+        subject.send('recipes:run', recipe)
+      end
+
       it 'should fail if any update fails' do
-        expect(stacks[0]).to receive(:execute_recipe).with(recipe) { failure }
+        expect(stacks[0]).to receive(:execute_recipe).with(*args) { failure }
 
         allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
         expect { subject.send('recipes:run', recipe) }.to raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.11.192
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.11.192
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -236,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Alternative CLI for Amazon OpsWorks