Merge pull request #19 from vinted/feature/add_41c356e_release_support

Feature/add 41c356e release support
vinted · Jun 10, 2020 · 8c62dc1 · 8c62dc1
2 parents f61f24a + 9c65d50
commit 8c62dc1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,3 +39,7 @@ Initial release.
 
 # 4.3.1
 - [CHANGE] Added support for 25db221 (2020-05-14) release (minor patch)
+
+# 4.3.2
+- [CHANGE] Added support for 41c356e (2020-06-04) release (minor patch)
+- [FIX] my.cnf missing `[mysqld]`
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -8,16 +8,16 @@
 # the topology implementation to use
 default['vitess']['topo_implementation'] = 'etcd2'
 
-default['vitess']['version']['mysqlctld'] = 'v6.0-25db221'
-default['vitess']['version']['vtctlclient'] = 'v6.0-25db221'
-default['vitess']['version']['vtctld'] = 'v6.0-25db221'
-default['vitess']['version']['vtgate'] = 'v6.0-25db221'
-default['vitess']['version']['vttablet'] = 'v6.0-25db221'
-default['vitess']['version']['vtworker'] = 'v6.0-25db221'
-default['vitess']['version']['mysqlctl'] = 'v6.0-25db221'
-default['vitess']['version']['vtctl'] = 'v6.0-25db221'
-default['vitess']['version']['vtexplain'] = 'v6.0-25db221'
-default['vitess']['version']['vtbench'] = 'v6.0-25db221'
+default['vitess']['version']['mysqlctld'] = 'v6.0-41c356e'
+default['vitess']['version']['vtctlclient'] = 'v6.0-41c356e'
+default['vitess']['version']['vtctld'] = 'v6.0-41c356e'
+default['vitess']['version']['vtgate'] = 'v6.0-41c356e'
+default['vitess']['version']['vttablet'] = 'v6.0-41c356e'
+default['vitess']['version']['vtworker'] = 'v6.0-41c356e'
+default['vitess']['version']['mysqlctl'] = 'v6.0-41c356e'
+default['vitess']['version']['vtctl'] = 'v6.0-41c356e'
+default['vitess']['version']['vtexplain'] = 'v6.0-41c356e'
+default['vitess']['version']['vtbench'] = 'v6.0-41c356e'
 
 # host to send spans to. if empty, no tracing will be done
 default['vitess']['datadog-agent-host'] = nil

diff --git a/attributes/releases.rb b/attributes/releases.rb
@@ -9,3 +9,9 @@
   'https://github.com/planetscale/vitess-releases/releases/download/25db221/vitess-6.0-25db221.tar.gz'
 default['vitess']['releases']['25db221']['checksum'] =
   'b8c1ac3b7f9ed41d544a22cb63bfd213e1e5812f6d427fb16c8c485b6ad13953'
+
+# 2020-06-04 at 12:01:01 AM UTC
+default['vitess']['releases']['41c356e']['url'] =
+  'https://github.com/planetscale/vitess-releases/releases/download/41c356e/vitess-6.0-41c356e.tar.gz'
+default['vitess']['releases']['41c356e']['checksum'] =
+  '3bda4eeb3237b1f73b6c4e207372ec8aec9a855ec640f7300c172d20bca382b9'
diff --git a/libraries/base_service.rb b/libraries/base_service.rb
@@ -79,6 +79,7 @@ class VitessBaseService < Chef::Resource
       attribute(:service_restart, kind_of: String, default: 'on-failure')
 
       # MySQL
+      attribute(:mycnf_cookbook, kind_of: String, default: 'vitess')
       attribute(:mycnf, kind_of: Hash, default: lazy { node['vitess']['mycnf'] })
 
       # Cookbook
@@ -184,6 +185,7 @@ def create_directories(dirs)
 
       def generate_mycnf(path:, variables:)
         template path do
+          cookbook new_resource.mycnf_cookbook
           source 'mycnf/generic.cnf.erb'
           variables variables: variables
           owner new_resource.user

diff --git a/metadata.rb b/metadata.rb
@@ -7,7 +7,7 @@
 issues_url 'https://github.com/vinted/chef-vitess/issues'
 source_url 'https://github.com/vinted/chef-vitess'
 chef_version '>= 12.1' if respond_to?(:chef_version)
-version '4.3.1'
+version '4.3.2'
 
 supports 'redhat'
 supports 'centos'

diff --git a/templates/mycnf/generic.cnf.erb b/templates/mycnf/generic.cnf.erb
@@ -1,3 +1,4 @@
+[mysqld]
 <% @variables.each do |key, val| %>
 <% if val.nil? %>
 <%= key %>