Add needed recipe reload_from_s3 and fix derived attribute pitfalls

@@ -17,7 +17,7 @@ provisioner:
 platforms:
   - name: ubuntu-14.04
     driver:
-      image_id: ami-3d2cce5d
+      image_id: ami-50946030
     transport:
       username: ubuntu
       ssh_key: ~/.ssh/cfe_stg_20160222.pem

+# 0.1.1
+
+Add the needed recipe reload_from_s3
+
 # 0.1.0
 
 Initial release of cfe-mariadb

@@ -72,6 +72,18 @@ Ubuntu 14.04
     <td>The backup cronjob 'day of week' value</td>
     <td><tt>'*'</tt></td>
   </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['reload']['aws_access_key_id']</tt></td>
+    <td>String</td>
+    <td>If not using EC2 roles, enter AWS creds here</td>
+    <td><tt>nil</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['reload']['aws_secret_access_key']</tt></td>
+    <td>String</td>
+    <td>If not using EC2 roles, enter AWS creds here</td>
+    <td><tt>nil</tt></td>
+  </tr>
 </table>
 
 ## Usage
@@ -100,6 +112,12 @@ This will install the backup script and also enable a cronjob to regularly run t
   ]
 }
 ```
+
+### cfe-mariadb::reload_from_s3
+
+Kind of the reverse of `backup2s3`. Download a tarball of a MySQL dump file from an S3 bucket, then load it up into a database. Do this for every database given in `node['cfe-mariadb']['db_map']`.
+
+This recipe assumes the node is using an EC2 role that can access the given S3 bucket. Otherwise, enter the AWS credentials in `node.default['cfe-mariadb']['reload']['aws_access_key_id']` and `node.default['cfe-mariadb']['reload']['aws_secret_access_key']`.
 ## License and Authors
 
 Author:: Earth U. (<sysadmin@chromedia.com>)

@@ -30,20 +30,13 @@
 #     :collate  => 'latin1_swedish_ci'
 #   }
 # }
-default['cfe-mariadb']['db_map'] = {
-  'example_db' => {
-    :db_user       => 'example_user',
-    :db_pass       => 'secret',
-    :bak_filename  => 'example_db.sql',
-    :bak_maxcopies => 30
-  }
-}
+default['cfe-mariadb']['db_map'] = {}
 
 # Make sure to set replication on only when necessary
 default['cfe-mariadb']['replication'] = false
 
-default['cfe-mariadb']['backup']['s3_region'] = 'us-east-1'
-default['cfe-mariadb']['backup']['s3_bucket'] = 'example-bucket'
+default['cfe-mariadb']['s3_region'] = 'us-east-1'
+default['cfe-mariadb']['s3_bucket'] = 'example-bucket'
 
 if node['platform'] == 'ubuntu' and node['platform_version'].to_f == 14.04
   default['cfe-mariadb']['backup']['aws_bin']       = '/usr/local/bin/aws'
@@ -53,10 +46,11 @@ else
   default['cfe-mariadb']['backup']['aws_bin']       = '/usr/local/bin/aws'
   default['cfe-mariadb']['backup']['mysqldump_bin'] = '/usr/bin/mysqldump'
 end
-# Path to directory where the backup script should be placed
-default['cfe-mariadb']['backup']['script_dir'] = ::File.join(
-  node['mariadb']['configuration']['path'], 'scripts'
-)
+# Path to directory where the backup script should be placed.
+# Uncomment to set custom locations.
+#default['cfe-mariadb']['backup']['script_dir'] = ::File.join(
+#  node['mariadb']['configuration']['path'], 'scripts'
+#)
 
 default['cfe-mariadb']['backup']['cron']['min']    = '0'
 default['cfe-mariadb']['backup']['cron']['hour']   = '0'
@@ -67,9 +61,19 @@ default['cfe-mariadb']['backup']['cron']['mailto'] = "''" # Empty single quotes
 
 # Basic options for logrotate
 default['cfe-mariadb']['backup']['logrotate']['conf_dir'] = '/etc/logrotate.d'
-default['cfe-mariadb']['backup']['logrotate']['options']  = [
-  'weekly', 'rotate 12', 'missingok', 'compress', 'notifempty'
-]
+default['cfe-mariadb']['backup']['logrotate']['options']  = %w{
+  weekly
+  rotate\ 12
+  missingok
+  compress
+  notifempty
+}
+
+# Optional attributes for recipe 'reload_from_s3'
+# Recommend: use EC2 instances with proper S3 access roles and 
+# leave these attributes unset:
+#default['cfe-mariadb']['reload']['aws_access_key_id'] = 'MYKEYID'
+#default['cfe-mariadb']['reload']['aws_secret_access_key'] = 'MYSECRETKEY'
 
 default['mariadb']['server_root_password']   = 'secretpassword'
 default['mariadb']['mysqld']['bind_address'] = '127.0.0.1'

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 description      'Simplifies setup of MariaDB in Chromedia.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+version          '0.1.1'
 
 {
   'mariadb'         => '0.2.12',

@@ -22,6 +22,11 @@
 # and uploads them to a S3 bucket.
 # Also sets up the cron job to regularly run this script.
 
+# Set derived attributes inside recipe
+node.default['cfe-mariadb']['backup']['script_dir'] =
+  ::File.join(node['mariadb']['configuration']['path'], 'scripts') unless
+  node['cfe-mariadb']['backup']['script_dir']
+
 include_recipe 'awscli'
 
 md   = node['cfe-mariadb']
@@ -35,8 +40,8 @@ template "#{mdb['script_dir']}/backup_db_to_s3" do
     :db_map        => md['db_map'],
     :db_ip         => node['mariadb']['mysqld']['bind_address'],
     :db_port       => node['mariadb']['mysqld']['port'],
-    :s3_region     => mdb['s3_region'],
-    :s3_bucket     => mdb['s3_bucket'],
+    :s3_region     => md['s3_region'],
+    :s3_bucket     => md['s3_bucket'],
     :aws_bin       => mdb['aws_bin'],
     :mysqldump_bin => mdb['mysqldump_bin']
   )

+#
+# Author:: Earth U (<sysadmin@chromedia.com>)
+# Cookbook Name:: cfe-mariadb
+# Recipe:: reload_from_s3
+#
+# Copyright 2016, Chromedia Far East, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Download a tarball of a MySQL dump from an S3 bucket, 
+# then load it up into a (preferably empty) database.
+
+include_recipe 'awscli'
+
+tmp_dir = ::File.join(Chef::Config[:file_cache_path], 'db_dumps')
+manual_creds = node['cfe-mariadb'].has_key?('reload') &&
+               node['cfe-mariadb']['reload'].has_key?('aws_access_key_id')
+
+node['cfe-mariadb']['db_map'].each do |dbx|
+
+  if dbx.is_a?(Array)
+    dbx_name = dbx[0]
+    dbx = dbx[1]
+  else
+    dbx_name = dbx[:db_name]
+  end
+
+  filesql = "#{tmp_dir}/#{dbx[:bak_filename]}"
+  filetgz = "#{filesql}.tar.gz"
+
+  awscli_s3_file filetgz do
+    region   node['cfe-mariadb']['s3_region']
+    bucket   node['cfe-mariadb']['s3_bucket']
+    key      "#{dbx[:bak_filename]}.tar.gz"
+    if manual_creds
+      aws_access_key_id     node['cfe-mariadb']['reload']['aws_access_key_id']
+      aws_secret_access_key node['cfe-mariadb']['reload']['aws_secret_access_key']
+    end
+    only_if  "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
+    notifies :run, "execute[untar_#{filetgz}]", :immediately
+  end
+
+  execute "untar_#{filetgz}" do
+    command "tar -xzf #{filetgz} -C #{tmp_dir}/"
+    notifies :delete, "file[#{filetgz}]"
+    notifies :run, "execute[reload_#{filesql}]", :immediately
+    action  :nothing
+  end
+
+  execute "reload_#{filesql}" do
+    command   "mysql -h #{node['mariadb']['mysqld']['bind_address']} "\
+              "-P #{node['mariadb']['mysqld']['port']} -u #{dbx[:db_user]} "\
+              "-p'#{dbx[:db_pass]}' -D #{dbx_name} < #{filesql}"
+    notifies  :delete, "file[#{filesql}]"
+    sensitive true
+    action    :nothing
+  end
+
+  file filetgz do
+    action :nothing
+  end
+
+  file filesql do
+    action :nothing
+  end
+end