qops 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae573e99371d225d3eca19d41a48f13a8a013819
-  data.tar.gz: 7feba6d8f128cf7e6a62bf80cf5306d4827db491
+SHA256:
+  metadata.gz: 56a8b43e8bf98e323bbda224d22ca5ad7fcbec726422924acfea24fe31125809
+  data.tar.gz: 5a2c7d2c3929dd29998cf5681decedf5cdec5435ce3b3961a8122cc07425619a
 SHA512:
-  metadata.gz: 102be14735cf3aaf894bcc5b502f4c9bf5d9652651a592428f19978f779f740612bb6b74224273f39618427028a80c6e0f13dd4fc2a5b929d1b0959eec993831
-  data.tar.gz: dfe5b532a6da97e65b66474267b843c50d4c1fb8d321ec4dc0ae2894b16a51eed086136b559f92958bd1eb1e59146a307022f5f9499a1689c4555d5b2d966dd9
+  metadata.gz: ed0c3e2e90a001a916f2e64e8395c35a51a3792dc55093033c494b067133205ad1f83a4d7418c92949539f5fe4ef221c54ad2a85758d9fe351cb538dfa22e256
+  data.tar.gz: 979bac6b722b0f07a45d6a995a00a15a6c17b3c905394f78f5a920bd1b38c2cab6fc531ad06aa3d4c4dc0290c08ec25284d2f980515fe9e7522e24bf2e091ffa

data/lib/qops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'thor/group'
 require 'aws-sdk'

data/lib/qops/cookbook/cookbook.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Qops::Cookbook < Thor
   include Qops::Helpers
 

data/lib/qops/deployment/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Qops::Deploy < Thor
   include Qops::DeployHelpers
 
@@ -8,9 +10,7 @@ class Qops::Deploy < Thor
     instances = config.deploy_type == 'staging' ? [retrieve_instance].compact : retrieve_instances
     online_instances = instances.select { |instance| instance.status == 'online' }
 
-    if online_instances.empty?
-      raise 'Could not find any running instance(s) to deploy to. Perhaps you need to run "qops:instance:up" first'
-    end
+    raise 'Could not find any running instance(s) to deploy to. Perhaps you need to run "qops:instance:up" first' if online_instances.empty?
 
     if config.deploy_type == 'staging'
       puts "Preparing to deploy branch #{revision_used} to instance #{online_instances.first.hostname}"
@@ -32,9 +32,7 @@ class Qops::Deploy < Thor
       base_deployment_params[:app_id] = config.application_id
     end
 
-    if config.deploy_type != 'production'
-      base_deployment_params[:custom_json] = custom_json.to_json
-    end
+    base_deployment_params[:custom_json] = custom_json.to_json if config.deploy_type != 'production'
 
     manifest = {
       environment: config.deploy_type

data/lib/qops/deployment/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Qops::DeployHelpers
   extend ActiveSupport::Concern
 
@@ -8,7 +10,8 @@ module Qops::DeployHelpers
     class_option :branch, type: :string, aliases: '-b', desc: 'The branch to use when deploying to staging type environments'
     class_option :hostname, type: :string, aliases: '-h', desc: 'Fully override the hostname that qops would normally give the instance'
     class_option :profile, type: :string, aliases: '-p', desc: 'An AWS profile to use'
-    class_option :force_config, type: :boolean, aliases: '-f', desc: 'force qops to read options from config. by default qops will search aws opsworks stack'
+    class_option :force_config, type: :boolean, aliases: '-f', desc: 'Force qops to read options from config. by default qops will search aws opsworks stack'
+    class_option :verbose, type: :boolean, aliases: '-v', desc: 'Provides additional information when running for debugging purposes.'
   end
 
   private
@@ -16,7 +19,7 @@ module Qops::DeployHelpers
   def config
     return @_config if @_config
     Qops::Environment.notifiers
-    @_config ||= Qops::Environment.new(profile: options[:profile], force_config: options[:force_config])
+    @_config ||= Qops::Environment.new(profile: options[:profile], force_config: options[:force_config], verbose: options[:verbose])
 
     fail "Invalid configure deploy_type detected: #{@_config.deploy_type}" unless %w[staging production].include?(@_config.deploy_type)
 
@@ -108,7 +111,7 @@ module Qops::DeployHelpers
     return 'master' unless config.deploy_type == 'staging'
     if options[:branch].present?
       options[:branch]
-    elsif `git --version` # rubocop:disable Lint/LiteralInCondition
+    elsif `git --version` # rubocop:disable Lint/LiteralAsCondition
       `git symbolic-ref --short HEAD`.strip
     else
       'master'

data/lib/qops/deployment/instances.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
   include Qops::DeployHelpers
 
@@ -55,9 +57,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     # Start the instance if necessary
     print 'Booting instance ...'
-    unless %w[online booting].include?(instance.status)
-      config.opsworks.start_instance(instance_id: instance_id)
-    end
+    config.opsworks.start_instance(instance_id: instance_id) unless %w[online booting].include?(instance.status)
 
     manifest = {
       environment: config.deploy_type,
@@ -144,9 +144,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
   def clean
     initialize_run
 
-    if config.deploy_type == 'production'
-      fail "Cannot clean instances in a #{config.deploy_type} environment"
-    end
+    fail "Cannot clean instances in a #{config.deploy_type} environment" if config.deploy_type == 'production'
 
     terminated_instances = []
 
@@ -297,9 +295,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
   def terminate_instance(instance_id)
     # Remove schedule if time based instance
-    if config.autoscale_type == 'timer'
-      config.opsworks.set_time_based_auto_scaling(instance_id: instance_id, auto_scaling_schedule: {})
-    end
+    config.opsworks.set_time_based_auto_scaling(instance_id: instance_id, auto_scaling_schedule: {}) if config.autoscale_type == 'timer'
 
     # Get the instance from the id
     instance = retrieve_instance(instance_id)
@@ -314,9 +310,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     # Attempt to shutdown the instance
     print "Attempting instance #{instance_id} - #{instance.hostname} shutdown ..."
-    unless instance.status == 'stopped'
-      config.opsworks.stop_instance(instance_id: instance_id)
-    end
+    config.opsworks.stop_instance(instance_id: instance_id) unless instance.status == 'stopped'
 
     manifest = {
       environment: config.deploy_type,

data/lib/qops/deployment/stacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Qops::Stack < Thor
   include Qops::DeployHelpers
 

data/lib/qops/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'quandl/config'
 
 module Qops
@@ -26,17 +28,36 @@ module Qops
         puts Rainbow(message).bg(:black).red
       when :warning
         puts Rainbow(message).bg(:black).yellow
+      when :good
+        puts Rainbow(message).bg(:black).green
       else
         puts message
       end
     end
 
-    def initialize(profile: nil, force_config: false)
+    def initialize(profile: nil, force_config: false, verbose: false)
       @_aws_config = { region: configuration.region }
       @_aws_config[:profile] = profile unless profile.nil?
+
       @_force_config = force_config
-      profile.nil? ? opsworks.config.credentials.credentials : @_aws_config[:profile] = profile
-      puts Rainbow("using aws profile #{profile}").bg(:black).green unless profile.nil?
+      @_verbose = verbose
+
+      if profile.nil?
+        opsworks.config.credentials.credentials
+      else
+        parsed_creds = Aws.shared_config.instance_variable_get('@parsed_credentials')[profile]
+        role_credentials = Aws::AssumeRoleCredentials.new(
+          role_arn: parsed_creds['role_arn'],
+          role_session_name: profile
+        )
+        # Aws::OpsWorks::Client.new(credentials: role_credentials).describe_stacks.stacks.each { |s| puts s }
+        @_aws_config[:credentials] = role_credentials
+
+        puts Rainbow("Using AWS profile #{profile}").bg(:black).green
+      end
+
+      Aws.config.update(@_aws_config)
+
       puts Rainbow('Forcing Qops to read the opsworks parameter strictly from yaml') if force_config
       %w[deploy_type region app_name].each do |v|
         fail "Please configure #{v} before continuing." unless option?(v)
@@ -55,12 +76,12 @@ module Qops
     end
 
     def stack_id(options = {})
-      return configuration.stack_id if @_force_config
+      return configuration.stack_id if force_config?
       stack(options).stack_id
     end
 
     def subnet(options = {})
-      return configuration.subnet if @_force_config
+      return configuration.subnet if force_config?
       stack(options).default_subnet_id
     end
 
@@ -69,9 +90,9 @@ module Qops
     end
 
     def layer_id(_options = {})
-      return configuration.layer_id if @_force_config
+      return configuration.layer_id if force_config?
       name = configuration.layer_name
-      puts "searching for #{name}"
+      verbose_output("Searching for layer : #{name}")
       layer = layers.find { |l| l.name.match(/#{name}/i) }
       layer.layer_id
     end
@@ -85,7 +106,7 @@ module Qops
     end
 
     def application_id(options = {})
-      return configuration.application_id if @_force_config
+      return configuration.application_id if force_config?
       apps(options).first.app_id
     end
 
@@ -136,13 +157,25 @@ module Qops
     end
 
     def elb
-      @_elb_client ||= Aws::ElasticLoadBalancing::Client.new(region: 'us-east-1', profile: @_aws_config[:profile])
+      @_elb_client ||= Aws::ElasticLoadBalancing::Client.new(**@_aws_config)
     end
 
     def cookbook_json
       configuration.cookbook_json || 'custom.json'
     end
 
+    def verbose?
+      @_verbose
+    end
+
+    def verbose_output(text)
+      self.class.print_with_colour(text, :warning) if verbose?
+    end
+
+    def force_config?
+      @_force_config
+    end
+
     def option?(key)
       respond_to?(key.to_sym) || configuration.instance_variable_get(:@table).keys.include?(key.to_sym)
     end
@@ -172,18 +205,24 @@ module Qops
         :stack_id
       else
         id = identity_from_config
-        msg = Rainbow("Using opsworks.yml config #{id}: #{configuration.send(id)}")
-        puts(msg.bg(:black).green)
+        self.class.print_with_colour("Using opsworks.yml config #{id}: #{configuration.send(id)}", :good)
         id
       end
     end
 
     def search_stack(key, value)
-      stack = opsworks.describe_stacks.stacks.find { |s| s.send(key) == value }
+      verbose_output("Searching for stack : #{value}")
+
+      stack = opsworks.describe_stacks.stacks.find do |s|
+        verbose_output("Found stack: #{s.send(key)}")
+        s.send(key) == value
+      end
+
       unless stack
-        puts Rainbow("Could not find stack with #{key} = #{value}").bg(:black).red
+        self.class.print_with_colour("Could not find stack with #{key} = #{value}", :error)
         exit(-1)
       end
+
       stack
     end
 

data/lib/qops/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Qops::Helpers
   extend ActiveSupport::Concern
 

data/lib/qops/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qops
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Matthew Basset
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: qthor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1.4
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1.4
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -71,33 +71,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.20.0
 description: Help to automate opsworks project deployments with single commands.
 email:
 - support@quandl.com
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Helper commands for deployment of opsworks projects.