qops 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a359bd27c24df1c4c124864fdc9d409bf43e453
-  data.tar.gz: 3d42a3143c38fde591eae2969d8abe4d0be36b20
+  metadata.gz: becc39290c6daab078f8e2ff60f35580868719e0
+  data.tar.gz: 95af5da002ad688a41bd099c9004e5e6b4db3a9a
 SHA512:
-  metadata.gz: 4ca05c0d395bbcadfc399ad7a52649f19ebf68520c09acd37bb56c0d86bb9c77cfe0c65dd7639a3c1e6b43c2f9b6f460158a9d94374129806f6832b03b1df78d
-  data.tar.gz: cfb7726f54f320898ba5c955babb1d1a17bdbcc5695612a740dbb347f743bd49a82fe51264b59184bd638d89484b73423ea7e101372752a821b3deed301eb93c
+  metadata.gz: 808fa94972bf2f7f43bbf9d29763230467a93643461d7340e0b131a998f375103256249c7628cad5ecd99296f2bbbe11f49278ee5eacafcf6f6cce7e97d189f4
+  data.tar.gz: 76e5233bae516c5e49ce39fcb10db5228004b3fd62cb652a3873ba6c8676ca80ae1f6b97dd0caab6f5af19071998a6ae7ef820d35a39b00aacefa2246b10f89c

data/lib/qops/deployment/app.rb

@@ -63,12 +63,19 @@ class Qops::Deploy < Thor
       )
     )
 
+    tag_instance(first_instance)
+
     # Deploy any remaining instances with migration off for production
     return unless config.deploy_type == 'production' && online_instances.count > 1
 
     print 'Deploying remaining instances ...'
     deployment_params = base_deployment_params.deep_dup
     run_opsworks_command(deployment_params)
+
+    online_instances.each do |instance|
+      tag_instance(instance)
+    end
+
     ping_slack(
       'Quandl::Slack::Release',
       'Deployed All Instances',

data/lib/qops/deployment/helpers.rb

@@ -5,6 +5,7 @@ module Qops::DeployHelpers
 
   included do
     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'
   end
 
   private
@@ -46,19 +47,41 @@ module Qops::DeployHelpers
     instances.find { |k| k.hostname == requested_hostname }
   end
 
+  def tag_instance(instance)
+    print "Tagging instance #{instance.hostname}\n"
+    config.ec2.create_tags(
+      resources: [instance.ec2_instance_id],
+      tags: [
+        {
+          key: 'environment',
+          value: config.deploy_type
+        }
+      ]
+    )
+  end
+
   def requested_hostname
     return @requested_hostname if @requested_hostname
-    if config.deploy_type == 'staging'
-      @requested_hostname = default_revision.parameterize
-    elsif config.deploy_type == 'production'
-      @requested_hostname = config.app_name
-      existing_hostnames = retrieve_instances.map(&:hostname)
-      @requested_hostname += "-#{existing_hostnames.sort.last.to_s.split('-').last.to_i + 1}"
+    if options[:hostname]
+      @requested_hostname = options[:hostname]
+      puts "NOTE: You have specified a custom hostname of #{@requested_hostname}. Be sure to continue to use this hostname for future commands to avoid problems."
+
+    # Alternative flow if user has not overridden the hostname
+    else
+      if config.deploy_type == 'staging'
+        @requested_hostname = default_revision.parameterize
+      elsif config.deploy_type == 'production'
+        @requested_hostname = config.app_name
+        existing_hostnames = retrieve_instances.map(&:hostname)
+        @requested_hostname += "-#{existing_hostnames.sort.last.to_s.split('-').last.to_i + 1}"
+      end
+      @requested_hostname = config.hostname_prefix + @requested_hostname
     end
 
     @requested_hostname = @requested_hostname.gsub(/[^A-Za-z0-9\-]+/, '-').gsub(/-+/, '-')
     @requested_hostname = @requested_hostname[0..62]
     @requested_hostname = @requested_hostname.match(/^([A-Za-z0-9\-]+).*$/)[1]
+    @requested_hostname
   end
 
   def default_revision

data/lib/qops/deployment/instances.rb

@@ -82,6 +82,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
     puts "Public IP: #{instance.public_ip}"
     puts "Private IP: #{instance.private_ip}"
 
+    tag_instance(instance)
     setup_instance(instance, initial_instance_state, manifest)
 
     if creating_instance

data/lib/qops/environment.rb

@@ -82,7 +82,11 @@ module Qops
     end
 
     def opsworks
-      @_opsworks ||= Aws::OpsWorks::Client.new(region: configuration.region)
+      @_opsworks_client ||= Aws::OpsWorks::Client.new(region: configuration.region)
+    end
+
+    def ec2
+      @_ec2_client ||= Aws::EC2::Client.new(region: configuration.region)
     end
 
     def cookbook_json
@@ -97,6 +101,10 @@ module Qops
       configuration.root_volume_size || 30
     end
 
+    def hostname_prefix
+      configuration.hostname_prefix || ''
+    end
+
     private
 
     def method_missing(method_sym, *arguments, &block)

data/lib/qops/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Qops
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthew Basset
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor