fhcap-cli 0.4.9 → 0.4.10

data/lib/fhcap/tasks/chef/cookbook/update_config.rb

@@ -13,7 +13,6 @@ module Fhcap
               "millicore" => "millicore/src/main/resources/config/cluster-config.properties",
               "fh-reaper" => "millicore/src/main/resources/config/reaper.properties",
               "fh-supercore" => "fh-supercore/config/dev.json",
-              "fh-doxy" => "fh-doxy/config/dev.json",
               "fh-messaging" => "fh-messaging/fh-messaging/config/dev.json",
               "fh-metrics" => "fh-messaging/fh-metrics/config/dev.json",
               "fh-ditch" => "fh-ditch/config/dev.json",

data/lib/fhcap/tasks/dns/aws/create_record.rb

@@ -0,0 +1,81 @@
+require 'fhcap/tasks/task_base'
+require 'fhcap/tasks/dns/aws/route53_helper'
+require 'aws-sdk'
+
+module Fhcap
+  module Tasks
+    module Dns
+      module Aws
+        class CreateRecord < TaskBase
+
+          include Fhcap::Route53Helper
+
+          attr_reader :domain, :ipaddress, :alias_target, :ttl
+
+          def initialize(options)
+            super
+            @domain = options[:domain]
+            @alias_target = options[:'alias-target']
+            @ipaddress = options[:ipaddress]
+            @ttl = options[:ttl] || 300
+          end
+
+          def run
+            thor.say "Dns::Aws::CreateRecord: name = #{domain}, ipaddress = #{ipaddress}, ttl = #{ttl}", :yellow
+
+            with_hosted_zone(domain) do |client, zone|
+              resp = client.list_resource_record_sets({
+                                                          hosted_zone_id: zone.id,
+                                                          start_record_name: domain,
+                                                          start_record_type: "A",
+                                                          max_items: 1
+                                                      })
+              record_set = resp.resource_record_sets.reject { |z| !(z.name =~ /^#{domain}/) }.first
+              action = 'created'
+              if record_set
+                value = record_set.resource_records.map(&:value).join(',')
+                alias_target = record_set.alias_target.dns_name rescue nil
+                thor.say "Found existing record set, id: name: #{record_set.name}, type: #{record_set.type}, value: #{alias_target || value}\n"
+                action = 'updated'
+                return unless thor.yes? 'Do you want to update this DNS record? (y/n)'
+              end
+              change_request = {
+                  :action => 'UPSERT',
+                  :resource_record_set => {
+                      :name => domain,
+                      :type => "A"
+                  }
+              }
+
+              if @alias_target
+                change_request[:resource_record_set].merge!(
+                    {
+                        alias_target: {
+                            evaluate_target_health: false
+                        }.merge!(@alias_target)
+                    }
+                )
+              else
+                change_request[:resource_record_set].merge!(
+                    {
+                        :ttl => ttl,
+                        :resource_records => [{:value => ipaddress}]
+                    }
+                )
+              end
+
+              client.change_resource_record_sets({
+                                                     :hosted_zone_id => zone.id,
+                                                     :change_batch => {
+                                                         :changes => [change_request]
+                                                     }
+                                                 })
+              thor.say "DNS record #{action} for #{domain}"
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/dns/aws/delete_record.rb

@@ -0,0 +1,57 @@
+require 'fhcap/tasks/task_base'
+require 'fhcap/tasks/dns/aws/route53_helper'
+require 'aws-sdk'
+
+module Fhcap
+  module Tasks
+    module Dns
+      module Aws
+        class DeleteRecord < TaskBase
+
+          include Fhcap::Route53Helper
+
+          attr_reader :domain
+
+          def initialize(options)
+            super
+            @domain = options[:domain]
+          end
+
+          def run
+            thor.say "Dns::Aws::DeleteRecord: name = #{domain}", :yellow
+
+            with_hosted_zone(domain) do |client, zone|
+              resp = client.list_resource_record_sets({
+                                                          hosted_zone_id: zone.id,
+                                                          start_record_name: domain,
+                                                          start_record_type: "A",
+                                                          max_items: 1
+                                                      })
+              record_set = resp.resource_record_sets.reject { |z| !(z.name =~ /^#{domain}/) }.first
+              if record_set
+                value = record_set.resource_records.map(&:value).join(',')
+                alias_target = record_set.alias_target.dns_name rescue nil
+                thor.say "Found existing record set, id: name: #{record_set.name}, type: #{record_set.type}, value: #{alias_target || value}\n"
+                change_request = {
+                    :action => 'DELETE',
+                    :resource_record_set => record_set
+                }
+
+                client.change_resource_record_sets({
+                                                       :hosted_zone_id => zone.id,
+                                                       :change_batch => {
+                                                           :changes => [change_request]
+                                                       }
+                                                   })
+                thor.say "DNS record deleted for #{domain}"
+              else
+                thor.say "No record set found for #{domain}"
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/dns/aws/list_records.rb

@@ -0,0 +1,34 @@
+require 'fhcap/tasks/task_base'
+require 'fhcap/tasks/dns/aws/route53_helper'
+require 'aws-sdk'
+
+module Fhcap
+  module Tasks
+    module Dns
+      module Aws
+        class ListRecords < TaskBase
+
+          include Fhcap::Route53Helper
+
+          def run
+            records_data = []
+            provider_names_for('dns').each do |provider|
+              with_provider_client(provider) do |client|
+                resp = client.list_hosted_zones
+                resp.hosted_zones.each do |zone|
+                  resp = client.list_resource_record_sets(hosted_zone_id: zone.id)
+                  resp.resource_record_sets.each do |record_set|
+                    value = record_set.resource_records.map(&:value).join(',')
+                    alias_target = record_set.alias_target.dns_name rescue nil
+                    records_data << table_row(record_set.name.gsub('\052', '*'), record_set.type, record_set.ttl, alias_target || value)
+                  end
+                end
+              end
+            end
+            records_data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fhcap/tasks/dns/{route53_helper.rb → aws/route53_helper.rb}

@@ -44,4 +44,4 @@ module Fhcap
     end
 
   end
-end
+end

data/lib/fhcap/tasks/dns/create_record.rb

@@ -1,79 +1,17 @@
 require 'fhcap/tasks/task_base'
-require 'fhcap/tasks/dns/route53_helper'
-require 'aws-sdk'
+require 'fhcap/providers_helper'
+require 'fhcap/tasks/dns/aws/create_record'
 
 module Fhcap
   module Tasks
     module Dns
       class CreateRecord < TaskBase
 
-        include Fhcap::Route53Helper
-
-        attr_reader :domain, :ipaddress, :alias_target, :ttl
-
-        def initialize(options)
-          super
-          @domain = options[:domain]
-          @alias_target = options[:'alias-target']
-          @ipaddress = options[:ipaddress]
-          @ttl = options[:ttl] || 300
-        end
-
-        def run
-          thor.say "Dns::CreateRecord: name = #{domain}, ipaddress = #{ipaddress}, ttl = #{ttl}", :yellow
-
-          with_hosted_zone(domain) do |client, zone|
-            resp = client.list_resource_record_sets({
-                                                        hosted_zone_id: zone.id,
-                                                        start_record_name: domain,
-                                                        start_record_type: "A",
-                                                        max_items: 1
-                                                    })
-            record_set = resp.resource_record_sets.reject { |z| !(z.name =~ /^#{domain}/) }.first
-            action = 'created'
-            if record_set
-              value = record_set.resource_records.map(&:value).join(',')
-              alias_target = record_set.alias_target.dns_name rescue nil
-              thor.say "Found existing record set, id: name: #{record_set.name}, type: #{record_set.type}, value: #{alias_target || value}\n"
-              action = 'updated'
-              return unless thor.yes? 'Do you want to update this DNS record? (y/n)'
-            end
-            change_request = {
-                :action => 'UPSERT',
-                :resource_record_set => {
-                    :name => domain,
-                    :type => "A"
-                }
-            }
-
-            if @alias_target
-              change_request[:resource_record_set].merge!(
-                  {
-                      alias_target: {
-                          evaluate_target_health: false
-                      }.merge!(@alias_target)
-                  }
-              )
-            else
-              change_request[:resource_record_set].merge!(
-                  {
-                      :ttl => ttl,
-                      :resource_records => [{:value => ipaddress}]
-                  }
-              )
-            end
-
-            client.change_resource_record_sets({
-                                                   :hosted_zone_id => zone.id,
-                                                   :change_batch => {
-                                                       :changes => [change_request]
-                                                   }
-                                               })
-            thor.say "DNS record #{action} for #{domain}"
-          end
+        def run()
+          Tasks::Dns::Aws::CreateRecord.new(options).run
         end
 
       end
     end
   end
-end
+end

data/lib/fhcap/tasks/dns/delete_record.rb

@@ -1,55 +1,17 @@
 require 'fhcap/tasks/task_base'
-require 'fhcap/tasks/dns/route53_helper'
-require 'aws-sdk'
+require 'fhcap/providers_helper'
+require 'fhcap/tasks/dns/aws/delete_record'
 
 module Fhcap
   module Tasks
     module Dns
       class DeleteRecord < TaskBase
 
-        include Fhcap::Route53Helper
-
-        attr_reader :domain
-
-        def initialize(options)
-          super
-          @domain = options[:domain]
-        end
-
-        def run
-          thor.say "Dns::DeleteRecord: name = #{domain}", :yellow
-
-          with_hosted_zone(domain) do |client, zone|
-            resp = client.list_resource_record_sets({
-                                                        hosted_zone_id: zone.id,
-                                                        start_record_name: domain,
-                                                        start_record_type: "A",
-                                                        max_items: 1
-                                                    })
-            record_set = resp.resource_record_sets.reject { |z| !(z.name =~ /^#{domain}/) }.first
-            if record_set
-              value = record_set.resource_records.map(&:value).join(',')
-              alias_target = record_set.alias_target.dns_name rescue nil
-              thor.say "Found existing record set, id: name: #{record_set.name}, type: #{record_set.type}, value: #{alias_target || value}\n"
-              change_request = {
-                  :action => 'DELETE',
-                  :resource_record_set => record_set
-              }
-
-              client.change_resource_record_sets({
-                                                     :hosted_zone_id => zone.id,
-                                                     :change_batch => {
-                                                         :changes => [change_request]
-                                                     }
-                                                 })
-              thor.say "DNS record deleted for #{domain}"
-            else
-              thor.say "No record set found for #{domain}"
-            end
-          end
+        def run()
+          Tasks::Dns::Aws::DeleteRecord.new(options).run
         end
 
       end
     end
   end
-end
+end

data/lib/fhcap/tasks/dns/list_records.rb

@@ -0,0 +1,25 @@
+require 'fhcap/tasks/task_base'
+require 'fhcap/providers_helper'
+require 'fhcap/tasks/dns/aws/list_records'
+
+module Fhcap
+  module Tasks
+    module Dns
+      class ListRecords < TaskBase
+
+        def run()
+          thor.say "Dns::List", :yellow
+          records_data = Tasks::Dns::Aws::ListRecords.new(options).run
+
+          table_contents = [table_header('Domain', 'Type', 'TTL', 'Value')]
+
+          for record in records_data
+            table_contents << record
+          end
+
+          thor.print_table table_contents
+        end
+      end
+    end
+  end
+end

data/lib/fhcap/thor_base.rb

@@ -3,6 +3,7 @@ require 'fhcap'
 require 'fhcap/config'
 require 'fhcap/providers_helper'
 require 'fhcap/repos_helper'
+require 'extensions/thor/actions'
 
 module Fhcap
 
@@ -16,6 +17,10 @@ module Fhcap
           :config_file => ENV['FHCAP_CFG_FILE']
       )
 
+      def exit_on_failure?
+        true
+      end
+
       def add_shared_option(name, options = {})
         @@shared_options[name] = options
       end

data/lib/fhcap/version.rb

@@ -1,3 +1,3 @@
 module Fhcap
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

data/spec/fhcap/tasks/dns/{create_record_spec.rb → aws/create_record_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require "fhcap/tasks/dns/create_record"
+require "fhcap/tasks/dns/aws/create_record"
 
-describe Fhcap::Tasks::Dns::CreateRecord do
+describe Fhcap::Tasks::Dns::Aws::CreateRecord do
 
   subject {
-    Fhcap::Tasks::Dns::CreateRecord.new(options)
+    Fhcap::Tasks::Dns::Aws::CreateRecord.new(options)
   }
 
   let(:thor) do
@@ -31,4 +31,4 @@ describe Fhcap::Tasks::Dns::CreateRecord do
     specify { expect(subject.ttl).to eq(300) }
   end
 
-end
+end

data/spec/fhcap/tasks/dns/{delete_record_spec.rb → aws/delete_record_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require "fhcap/tasks/dns/delete_record"
+require "fhcap/tasks/dns/aws/delete_record"
 
-describe Fhcap::Tasks::Dns::DeleteRecord do
+describe Fhcap::Tasks::Dns::Aws::DeleteRecord do
 
   subject {
-    Fhcap::Tasks::Dns::DeleteRecord.new(options)
+    Fhcap::Tasks::Dns::Aws::DeleteRecord.new(options)
   }
 
   let(:thor) do
@@ -27,4 +27,4 @@ describe Fhcap::Tasks::Dns::DeleteRecord do
     specify { expect(subject.domain).to eq(options[:domain]) }
   end
 
-end
+end

data/templates/chef/environment_mbaas.json.erb

@@ -84,15 +84,45 @@ end
       }
     },
     "fh-metrics": {
+      "mongo_server_role": "mongo_server",
       "conf":{
         "metrics": {
-          "metricsAPIKey": "<%=random_key('fh-metrics')%>"
+          "metricsAPIKey": "<%=random_key('fh-metrics')%>",
+          "database": {
+            "auth": {
+              "user": "u-messaging",
+              "pass": "<%=random_password('u-messaging')%>"
+            }
+          }
         }
       }
     },
     "fh-messaging": {
+      "mongo_server_role": "mongo_server",
       "conf":{
-        "msgAPIKey":  "<%=random_key('fh-messaging')%>"
+        "msgAPIKey":  "<%=random_key('fh-messaging')%>",
+        "database": {
+          "auth": {
+            "user": "u-messaging",
+            "pass": "<%=random_password('u-messaging')%>"
+          }
+        },
+        "agenda": {
+          "enabled": false,
+          "schedule": "15 00 * * *",
+          "jobs": {
+            "metrics_rollup_job": {
+              "options": {
+                "doImport": false
+              }
+            }
+          }
+        },
+        "realtime": true,
+        "files": {
+          "recovery_file": "",
+          "backup_file": ""
+        }
       }
     },
     "fh-proxy": {