qops 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd70c30cc7c37b5ecd6518aed0f7a7acbb2f7674
-  data.tar.gz: a565c04736b4e3e6248a08093a4f72c29825a64a
+  metadata.gz: 162f89d3372a53371e18045f54ef22d6b1be4d4e
+  data.tar.gz: a2532b2299fcdb585506a0d7717cf079a1fa307b
 SHA512:
-  metadata.gz: 3a665a0f24d8bd0870ea908baa0019f1edd3fd143d684c73282a6bc244c4fe421efc8c834746e151844860d7448dfffb4749dde4bb4ae4684ad6537caa536d72
-  data.tar.gz: 522219fb5a32b183826ab4655a13b13390e22e993d6bcaa5e654615a7f53236b27df410e72b4ad6b22d0a48413b08e4c4d6da12b15c3fe466d11bb2341e57262
+  metadata.gz: 5360220d992d093303b5a2423ebc41d44de8447e4a7bd03384f4094b6d2f6f48b66dbb051f47bb6da8e86d2ff434d480944af75848aa1d2f7b0bc52bb2784015
+  data.tar.gz: d66505a29b10ef61410553ccb214ae83957e55801aa06244cc798c93ba31a3406225fc829d3553a36b24736e6601d5ba84ef0b9423da56351cafda903c3155eb

data/lib/qops.rb

@@ -16,6 +16,7 @@ require_relative 'qops/helpers'
 require_relative 'qops/deployment/helpers'
 require_relative 'qops/deployment/app'
 require_relative 'qops/deployment/instances'
+require_relative 'qops/deployment/stacks'
 require_relative 'qops/cookbook/cookbook'
 
 # Migrate this into quandl config project

data/lib/qops/cookbook/cookbook.rb

@@ -130,10 +130,14 @@ class Qops::Cookbook < Thor
   end
 
   def s3
-    @s3 ||= Aws::S3::Client.new(
-      region: 'us-east-1',
-      credentials: config.opsworks.config.credentials.credentials
-    )
+    @s3 ||= Aws::S3::Client.new(**aws_configs)
+  end
+
+  def aws_configs
+    aws_config = { region: 'us-east-1' }
+    # use the profile if found
+    options[:profile] ? aws_config[:profile] = options[:profile] : aws_config[:credentials] = config.opsworks.config.credentials.credentials
+    aws_config
   end
 
   def local_artifact_file

data/lib/qops/deployment/app.rb

@@ -103,15 +103,17 @@ class Qops::Deploy < Thor
     if config.application_id
       application_name = config.opsworks.describe_apps(app_ids: [config.application_id]).apps.first.name
 
-      @_custom_json[:deploy] = {
-        revision: revision_used,
-        # the following is to be deprecated in favor of the former...
-        application_name => {
-          scm: {
-            revision: revision_used
-          }
-        }
-      }
+      @_custom_json[:deploy] = if config.chef_version >= 12
+                                 { revision: revision_used }
+                               else
+                                 {
+                                   application_name => {
+                                     scm: {
+                                       revision: revision_used
+                                     }
+                                   }
+                                 }
+                               end
     end
 
     if options[:custom_json].present?

data/lib/qops/deployment/helpers.rb

@@ -7,15 +7,16 @@ module Qops::DeployHelpers
     class_option :custom_json, type: :string, aliases: '-j', desc: 'A custom json that will be used during a deployment of the app. ex: \'{ "custom_attrs": "are awesome!"}\''
     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'
   end
 
   private
 
   def config
     return @_config if @_config
-
     Qops::Environment.notifiers
-    @_config ||= Qops::Environment.new
+    @_config ||= Qops::Environment.new(profile: options[:profile], force_config: options[:force_config])
 
     fail "Invalid configure deploy_type detected: #{@_config.deploy_type}" unless %w[staging production].include?(@_config.deploy_type)
 
@@ -113,4 +114,17 @@ module Qops::DeployHelpers
       'master'
     end
   end
+
+  def show_stack(options = {})
+    stack = config.stack(options)
+    {
+      name: stack.name,
+      stack_id: stack.stack_id,
+      subnet: stack.default_subnet_id,
+      layers: config.layers(options).map { |layer| layer.to_h.slice(:name, :layer_id, :shortname) },
+      apps: config.apps(options).map { |app| app.to_h.slice(:name, :app_id) },
+      config_manager: stack.configuration_manager.to_h,
+      default_os: stack.default_os
+    }
+  end
 end

data/lib/qops/deployment/instances.rb

@@ -103,8 +103,8 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
     # For Elasticsearch cluster, register with public elb
     if config.option?(:public_search_elb)
       print "Register instance #{instance.ec2_instance_id} to elb #{config.public_search_elb}"
-      elb.register_instances_with_load_balancer(load_balancer_name: config.public_search_elb.to_s,
-                                                instances: [{ instance_id: instance.ec2_instance_id.to_s }])
+      config.elb.register_instances_with_load_balancer(load_balancer_name: config.public_search_elb.to_s,
+                                                       instances: [{ instance_id: instance.ec2_instance_id.to_s }])
     end
 
     # Deploy the latest code to instance
@@ -250,13 +250,6 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
   private
 
-  def elb
-    @elb ||= Aws::ElasticLoadBalancing::Client.new(
-      region: 'us-east-1',
-      credentials: config.opsworks.config.credentials.credentials
-    )
-  end
-
   def setup_instance(instance, initial_instance_state, manifest)
     print 'Setup instance ...'
 
@@ -313,7 +306,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     # For Elasticsearch cluster, remove from from public elb
     if config.option?(:public_search_elb)
-      elb.deregister_instances_from_load_balancer(
+      config.elb.deregister_instances_from_load_balancer(
         load_balancer_name: config.public_search_elb.to_s,
         instances: [{ instance_id: instance.ec2_instance_id.to_s }]
       )

data/lib/qops/deployment/stacks.rb

@@ -0,0 +1,10 @@
+class Qops::Stack < Thor
+  include Qops::DeployHelpers
+
+  desc 'describe', 'show basic stack info'
+  method_option :name, type: :string, aliases: '-n', desc: 'describe the stack with matching name'
+  def describe
+    initialize_run
+    puts JSON.pretty_generate(show_stack(name: options[:name]))
+  end
+end

data/lib/qops/environment.rb

@@ -31,20 +31,69 @@ module Qops
       end
     end
 
-    def initialize
-      %w[deploy_type region stack_id app_name].each do |v|
+    def initialize(profile: nil, force_config: false)
+      @_aws_config = { region: configuration.region }
+      @_aws_config[:profile] = profile unless profile.nil?
+      @_force_config = force_config
+      puts Rainbow("using aws profile #{profile}").bg(:black).green unless profile.nil?
+
+      %w[deploy_type region app_name].each do |v|
         fail "Please configure #{v} before continuing." unless option?(v)
       end
 
+      fail 'Please configure the layer_name if you are allowing qops to search aws stacks' unless option?('layer_name')
+
+      # if being forced to use config , then stack_id is a requirement
+      fail 'Please configure stack_id or stack_name before continuing' unless option?('stack_id') || option?('stack_name')
+
       begin
-        opsworks.config.credentials.credentials
+        opsworks.config.credentials.credentials unless profile
       rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
         raise "There may be a problem with your aws credentials. Please correct with `aws configure`. Error: #{e}"
       end
     end
 
-    def application_id
-      configuration.application_id unless configuration.application_id.blank?
+    def stack(options = {})
+      return @_stack if @_stack
+      # find out if the config is using stack id or name
+      key = search_key(options)
+      value = options[key] || configuration.send(key)
+      # aws uses the term 'name' to reference a stack name
+      key = :name if key == :stack_name
+      @_stack = search_stack(key, value)
+    end
+
+    def stack_id(options = {})
+      return configuration.stack_id if @_force_config
+      stack(options).stack_id
+    end
+
+    def subnet(options = {})
+      return configuration.subnet if @_force_config
+      stack(options).default_subnet_id
+    end
+
+    def layers(_options = {})
+      opsworks.describe_layers(stack_id: stack_id).layers
+    end
+
+    def layer_id(options = {})
+      return configuration.layer_id if @_force_config
+      name = options[:layer_name] || configuration.layer_name
+      layers.find { |layer| layer.name.casecmp(name) }.layer_id
+    end
+
+    def chef_version(options = {})
+      stack(options).configuration_manager.version.to_f
+    end
+
+    def apps(_options = {})
+      opsworks.describe_apps(stack_id: stack_id).apps
+    end
+
+    def application_id(options = {})
+      return configuration.application_id if @_force_config
+      apps(options).first.app_id
     end
 
     def deploy_type
@@ -67,8 +116,9 @@ module Qops
       configuration.autoscale_type || nil
     end
 
-    def opsworks_os
-      configuration.os || 'Ubuntu 14.04 LTS'
+    def opsworks_os(options = {})
+      return configuration.os if @_force_config
+      find_stack(options).default_os
     end
 
     # Default 1 days
@@ -85,11 +135,15 @@ module Qops
     end
 
     def opsworks
-      @_opsworks_client ||= Aws::OpsWorks::Client.new(region: configuration.region)
+      @_opsworks_client ||= Aws::OpsWorks::Client.new(**@_aws_config)
     end
 
     def ec2
-      @_ec2_client ||= Aws::EC2::Client.new(region: configuration.region)
+      @_ec2_client ||= Aws::EC2::Client.new(**@_aws_config)
+    end
+
+    def elb
+      @_elb_client ||= Aws::ElasticLoadBalancing::Client.new(region: 'us-east-1', profile: @_aws_config[:profile])
     end
 
     def cookbook_json
@@ -114,6 +168,32 @@ module Qops
 
     private
 
+    def identity_from_config
+      configuration.stack_id ? :stack_id : :stack_name
+    end
+
+    def search_key(options = {})
+      if !options[:name].nil?
+        :name
+      elsif !options[:stack_id].nil?
+        :stack_id
+      else
+        id = identity_from_config
+        msg = Rainbow("Using opsworks.yml config #{id}: #{configuration.send(id)}")
+        puts(msg.bg(:black).green)
+        id
+      end
+    end
+
+    def search_stack(key, value)
+      stack = opsworks.describe_stacks.stacks.find { |s| s.send(key) == value }
+      unless stack
+        puts Rainbow("Could not find stack with #{key} = #{value}").bg(:black).red
+        exit(-1)
+      end
+      stack
+    end
+
     def method_missing(method_sym, *arguments, &block) # rubocop:disable Style/MethodMissing
       if configuration.respond_to?(method_sym)
         configuration.send(method_sym, *arguments, &block)

data/lib/qops/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Matthew Basset
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qthor
@@ -32,16 +32,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.41
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.41
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: quandl-config
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - lib/qops/deployment/app.rb
 - lib/qops/deployment/helpers.rb
 - lib/qops/deployment/instances.rb
+- lib/qops/deployment/stacks.rb
 - lib/qops/environment.rb
 - lib/qops/helpers.rb
 - lib/qops/version.rb
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Helper commands for deployment of opsworks projects.