cheftacular 2.1.2 → 2.2.0

data/lib/cheftacular/stateless_actions/update_cloudflare.rb

@@ -1,67 +1,32 @@
 class Cheftacular
   class StatelessActionDocumentation
-    def update_cloudflare
+    def update_cloudflare_dns_from_cloud
       @config['documentation']['stateless_action'] <<  [
-        "`cft update_cloudflare` command will force a full dns update for clouflare. " +
-        "It will ensure all the subdomain entries are correct (based on the contents of the addresses data bag) " +
-        "and update them if they are not. It will also create the local subdomain for the entry as well if it " +
-        "does exist and point it to the correct private address for an environment."
+        "`cft update_cloudflare_dns_from_cloud` command will force a full dns update for cloudflare. ",
+
+        [
+          "    1. It will ensure all the subdomain entries are correct (based on the contents of the addresses data bag) " +
+          "and update them if they are not. It will also create the local subdomain for the entry as well if it " +
+          "does exist and point it to the correct private address for an environment.",
+
+          "    2. This command will also ensure any dns records on your cloud are also migrated over to cloudflare as well. " +
+          "This also includes the reverse in the event you would like to turn off cloudflare."
+        ]
       ]
     end
   end
 
   class StatelessAction
-    def update_cloudflare
+    def update_cloudflare_dns_from_cloud
       raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
 
-      nodes = @config['getter'].get_true_node_objects(true)
-
-      nodes = @config['parser'].exclude_nodes( nodes, [{ unless: { env: @options['env'] }}] )
-
-      addr_data = @config['getter'].get_addresses_hash @options['env']
-
-      unless @config['helper'].does_cheftacular_config_have?(['cloudflare_api_key', 'cloudflare_user_email'])
-        puts "Critical! You tried to run #{ __method__ } but have not set a cloudflare_api_key or cloudflare_user_email! Please set these keys and run this method again!"
-
-        exit
-      end
-
-      exit
-
-      cloudflare = CloudFlare::connection(@config['cheftacular']['cloudflare_api_key'], @config['cheftacular']['cloudflare_user_email'])
-
-      nodes.each do |n|
-
-        @options['node_name'] = n.name
-
-        domain_obj = PublicSuffix.parse addr_data[n.public_ipaddress]['dn']
-
-        next unless domain_obj.domain == @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] #we can't create records for domains we dont manage in rax
-
-        @config['stateless_action'].cloud "domain", "create:#{ tld }:#{ domain_obj.trd }:#{ n.public_ipaddress }"
-
-        sleep 5 #don't want to to push updates to rax too fast
-
-        @config['stateless_action'].cloud "domain", "create:#{ tld }:local.#{ domain_obj.trd }:#{ addr_data[n.public_ipaddress]['priv'] }"
-
-        full_domain = "#{ domain_obj.trd }.#{ tld }"
-
-        target_serv_index = @config[@options['env']]['addresses_bag_hash']['addresses'].count
-
-        @config[@options['env']]['addresses_bag_hash']['addresses'].each do |serv_hash|
-          target_serv_index = @config[@options['env']]['addresses_bag_hash']['addresses'].index(serv_hash) if serv_hash['name'] == n.name
-        end
-
-        @config[@options['env']]['addresses_bag_hash']['addresses'][target_serv_hash] ||= {}
-        @config[@options['env']]['addresses_bag_hash']['addresses'][target_serv_hash]['dn'] = full_domain
+      target_domain = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld']
 
-        sleep 5 #prepare for next domain
-      end
+      @config['stateless_action'].update_tld 'self'
 
-      @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] = tld
+      target_domain_records = @config['stateless_action'].cloud('domain', "read:#{ target_domain }")["records_for_#{ target_domain }"]
 
-      @config['ChefDataBag'].save_config_bag
-      @config['ChefDataBag'].save_addresses_bag
+      @config['DNS'].update_cloudflare_from_array_of_domain_hashes target_domain, target_domain_records
     end
   end
 end

data/lib/cheftacular/stateless_actions/update_tld.rb

@@ -11,49 +11,52 @@ class Cheftacular
   end
 
   class StatelessAction
-    def update_tld
+    def update_tld target_tld=""
       raise "This action can only be performed if the mode is set to devops" unless @config['helper'].running_in_mode?('devops')
       
-      raise "Undefined new tld to migrate to" if ARGV.length <= 1
+      raise "Undefined new tld to migrate to" if ARGV.length <= 1 && target_tld.blank? 
 
       nodes = @config['getter'].get_true_node_objects(true)
 
       #We need to manually update beta nodes as they share the same env space as their non-beta counterparts TODO Refactor?
       nodes = @config['parser'].exclude_nodes( nodes, [{ unless: { env: @options['env'] }}] )
 
-      addr_data = @config['getter'].get_addresses_hash @options['env']
+      address_hash = @config['getter'].get_addresses_hash @options['env']
 
-      tld = ARGV[1]
+      target_tld = ARGV[1] if target_tld.blank?
 
-      nodes.each do |n|
+      old_tld = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld']
 
-        @options['node_name'] = n.name
-
-        domain_obj = PublicSuffix.parse addr_data[n.public_ipaddress]['dn']
+      if target_tld == 'self'
+        target_tld = old_tld
+      end
 
-        next unless domain_obj.domain == @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] #we can't create records for domains we dont manage in rax
+      nodes.each do |n|
 
-        @config['stateless_action'].cloud "domain", "create:#{ tld }:#{ domain_obj.trd }:#{ n.public_ipaddress }"
+        @options['node_name'] = n.name
 
-        sleep 5 #don't want to to push updates to rax too fast
+        domain_obj = PublicSuffix.parse address_hash[n.public_ipaddress]['dn']
 
-        @config['stateless_action'].cloud "domain", "create:#{ tld }:local.#{ domain_obj.trd }:#{ addr_data[n.public_ipaddress]['priv'] }"
+        next unless domain_obj.domain == old_tld #we can't create records for domains not managed under the environment's tld
 
-        full_domain = "#{ domain_obj.trd }.#{ tld }"
+        #TODO CHECK CLOUD IF TLD EXISTS
 
-        target_serv_index = @config[@options['env']]['addresses_bag_hash']['addresses'].count
+        specific_domain = "#{ domain_obj.trd }.#{ target_tld }"
 
-        @config[@options['env']]['addresses_bag_hash']['addresses'].each do |serv_hash|
-          target_serv_index = @config[@options['env']]['addresses_bag_hash']['addresses'].index(serv_hash) if serv_hash['name'] == n.name
+        if specific_domain != "#{ @options['node_name'] }.#{ target_tld }"
+          @config['DNS'].create_dns_record_for_domain_from_address_hash(specific_domain, address_hash[n.public_ipaddress], "specific_domain_mode")
         end
 
-        @config[@options['env']]['addresses_bag_hash']['addresses'][target_serv_hash] ||= {}
-        @config[@options['env']]['addresses_bag_hash']['addresses'][target_serv_hash]['dn'] = full_domain
+        @config['DNS'].create_dns_record_for_domain_from_address_hash(target_tld, address_hash[n.public_ipaddress])
+
+        @config['DNS'].compile_address_hash_for_server_from_options("set_specific_domain_name:#{ specific_domain }")
 
         sleep 5 #prepare for next domain
       end
 
-      @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] = tld
+      @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] = target_tld
+
+      puts "BAG TLD::#{ @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] }"
 
       @config['ChefDataBag'].save_config_bag
       @config['ChefDataBag'].save_addresses_bag

data/lib/cheftacular/stateless_actions/upload_nodes.rb

@@ -57,7 +57,7 @@ class Cheftacular
         node_roles_hash.each_pair do |role_name, role_hash|
           overwrite = false
           if bag_hash[role_name] != role_hash
-            puts "Detected difference between saved roles hash and updated node_roles json hash."
+            puts "Detected difference between saved roles hash and updated node_roles json hash for #{ role_name }."
 
             puts "Saved roles hash:"
             ap(bag_hash[role_name])
@@ -90,6 +90,7 @@ class Cheftacular
           allowed_changes_hash[node.name].each_pair do |node_key, node_val|
             if (node_key =~ /name/) != 0 && node.send(node_key) != node_val
               puts("Updating #{ node.name } with attribute #{ node_key } = #{ node_val } from #{ node.name }.json") unless @options['quiet']
+
               node.send("#{ node_key }=", node_val)
 
               changes_for_current_node, invalidate_file_node_cache = true, true
@@ -100,6 +101,7 @@ class Cheftacular
           allowed_changes_hash[node.name.gsub(/\d/,'')].each_pair do |node_key, node_val|
             if (node_key =~ /name/) != 0 && node.send(node_key) != node_val
               puts("Updating #{ node.name } with attribute #{ node_key } = #{ node_val } from template json file") unless @options['quiet']
+              
               node.send("#{ node_key }=", node_val)
 
               changes_for_current_node, invalidate_file_node_cache = true, true

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.1.2"
+  VERSION      = "2.2.0"
   RUBY_VERSION = "2.2.2"
 end

data/lib/cloud_interactor/domain/create_record.rb

@@ -1,13 +1,15 @@
 class CloudInteractor
   class Domain
     def create_record args, already_created=false
-      args['type'] ||= 'A'
-      args['ttl']  ||= 300
+      args['type']          ||= 'A'
+      args['ttl']           ||= 300
+      args['target_domain'] ||= "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+      args['target_domain']   = args[IDENTITY.singularize] if args['subdomain'].blank?
 
       read args, false
 
       @main_obj['specific_records'][args[IDENTITY.singularize]].each do |record_hash|
-        already_created = true if record_hash['name'] == "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+        already_created = true if record_hash['name'] == args['target_domain'] && record_hash['type'] == args['type']
 
         break if already_created
       end
@@ -18,9 +20,9 @@ class CloudInteractor
       else
         specific_fog_object = @classes['auth'].auth_service(RESOURCE).instance_eval('zones').get @main_obj["specific_#{ IDENTITY }"].last['id']
 
-        specific_fog_object.records.create(name: "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }", value: args['target_ip'], type: args['type'], ttl: args['ttl'])
+        specific_fog_object.records.create(name: args['target_domain'], value: args['target_ip'], type: args['type'], ttl: args['ttl'])
 
-        puts "Attached #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] }..."
+        puts "Attached #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
       end
     end
   end

data/lib/cloud_interactor/domain/list_records.rb

@@ -13,9 +13,11 @@ class CloudInteractor
         record_obj = JSON.parse(record.to_json)
 
         @main_obj["specific_#{ IDENTITY }"].last['records'] << record_obj
-        @main_obj['specific_records'][args[IDENTITY.singularize]]  << record_obj
+        @main_obj['specific_records'][args[IDENTITY.singularize]] << record_obj
       end
 
+      @main_obj['output']["records_for_#{ @main_obj["specific_#{ IDENTITY }"].last['domain'] }"] = @main_obj["specific_#{ IDENTITY }"].last['records']
+
       ap(@main_obj["specific_#{ IDENTITY }"].last['records']) if output
     end
   end

data/lib/cloud_interactor/domain/update_record.rb

@@ -3,13 +3,15 @@ class CloudInteractor
     def update_record args, already_created=false
       args['type'] ||= 'A'
       args['ttl']  ||= 300
+      args['target_domain'] ||= "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+      args['target_domain']   = args[IDENTITY.singularize] if args['subdomain'].blank?
 
       read args, false
 
       puts "Updating #{ args['subdomain'] } for #{ args[IDENTITY.singularize] }..."
 
       @main_obj['specific_records'][args[IDENTITY.singularize]].each do |record_hash|
-        already_created = true if record_hash['name'] == "#{ args['subdomain'] }.#{ args[IDENTITY.singularize] }"
+        already_created = true if record_hash['name'] == args['target_domain'] && record_hash['type'] == args['type']
 
         args['id'] = record_hash['id']
 
@@ -33,7 +35,7 @@ class CloudInteractor
           raise "Unsupported action #{ __method__ } for #{ @options['preferred_cloud'] }. Please create an issue on github or submit a PR to fix this issue."
         end
 
-        puts "Updated #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] }..."
+        puts "Updated #{ args['subdomain'] } (#{ args['target_ip'] }) to #{ args[IDENTITY.singularize] } (#{ args['target_domain'] })..."
       else
         create_record [ args ]
       end

data/lib/cloudflare/monkeypatches.rb

@@ -0,0 +1,24 @@
+#https://github.com/b4k3r/cloudflare/blob/master/lib/cloudflare/connection.rb
+#TODO this is fixed on master but not in the latest version of the gem, allowing service_mode to be set on creates
+module CloudFlare
+  class Connection
+    def rec_new(zone, type, name, content, ttl, prio = nil, service = nil, srvname = nil, protocol = nil, weight = nil, port = nil, target = nil, service_mode = '1')
+      send_req({
+        a: :rec_new,
+        z: zone,
+        type: type,
+        name: name,
+        content: content,
+        ttl: ttl,
+        prio: prio,
+        service: service,
+        srvname: srvname,
+        protocol: protocol,
+        weight: weight,
+        port: port,
+        target: target,
+        service_mode: service_mode
+      })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -239,7 +239,7 @@ files:
 - bin/client-list
 - lib/cheftacular.rb
 - lib/cheftacular/README.md
-- lib/cheftacular/actions.rb
+- lib/cheftacular/action.rb
 - lib/cheftacular/actions/check.rb
 - lib/cheftacular/actions/console.rb
 - lib/cheftacular/actions/database.rb
@@ -253,13 +253,13 @@ files:
 - lib/cheftacular/auditor.rb
 - lib/cheftacular/chef/data_bag.rb
 - lib/cheftacular/cheftacular.rb
-- lib/cheftacular/decryptors.rb
-- lib/cheftacular/encryptors.rb
-- lib/cheftacular/getters.rb
-- lib/cheftacular/helpers.rb
-- lib/cheftacular/initializers.rb
-- lib/cheftacular/parsers.rb
-- lib/cheftacular/remote_helpers.rb
+- lib/cheftacular/decryptor.rb
+- lib/cheftacular/dns.rb
+- lib/cheftacular/encryptor.rb
+- lib/cheftacular/getter.rb
+- lib/cheftacular/helper.rb
+- lib/cheftacular/initializer.rb
+- lib/cheftacular/parser.rb
 - lib/cheftacular/stateless_action.rb
 - lib/cheftacular/stateless_actions/add_ssh_key_to_bag.rb
 - lib/cheftacular/stateless_actions/arguments.rb
@@ -292,6 +292,7 @@ files:
 - lib/cheftacular/stateless_actions/get_haproxy_log.rb
 - lib/cheftacular/stateless_actions/get_log_from_bag.rb
 - lib/cheftacular/stateless_actions/get_pg_pass.rb
+- lib/cheftacular/stateless_actions/get_shorewall_allowed_connections.rb
 - lib/cheftacular/stateless_actions/help.rb
 - lib/cheftacular/stateless_actions/initialize_data_bag_contents.rb
 - lib/cheftacular/stateless_actions/knife_upload.rb
@@ -344,6 +345,7 @@ files:
 - lib/cloud_interactor/volume/destroy.rb
 - lib/cloud_interactor/volume/list.rb
 - lib/cloud_interactor/volume/read.rb
+- lib/cloudflare/monkeypatches.rb
 - lib/ridley/monkeypatches.rb
 - lib/sshkit/actions/start_task.rb
 - lib/sshkit/getters.rb

data/lib/cheftacular/remote_helpers.rb

@@ -1,30 +0,0 @@
-
-class Cheftacular
-  module RemoteHelpers
-    def set_log_loc_and_timestamp
-      @dummy_sshkit.set_log_loc_and_timestamp( @locs )
-    end
-
-    def start_tail_log ip_address, run_list
-      true_env = @config['dummy_sshkit'].get_true_environment run_list, @config['cheftacular']['run_list_environments'], @options['env']
-
-      #special servers should be listed first as most of them will have web role
-      log_loc = case
-                when run_list.include?('role[sensu_server]')
-                  "/var/log/sensu/sensu-server.log"
-                when run_list.include?('role[graphite_server]')
-                  "/var/log/carbon-cache/current"
-                when run_list.include?('role[web]') && !run_list.include?('nodejs')
-                  "/var/www/vhosts/#{ get_codebase_from_role_name( @options['role']) }/current/log/#{ true_env }.log"
-                when run_list.include?('role[worker]') || run_list.include?('nodejs')
-                  "/var/log/syslog"
-                else
-                  puts "This gem is not currently configured to handle tailing this case"
-                  return 0
-                end
-
-      
-      `ssh -oStrictHostKeyChecking=no -tt deploy@#{ ip_address } "#{ sudo(ip_address) } tail -f #{ log_loc }" > /dev/tty`
-    end
-  end
-end