From 5b8b84c917d4f9f656405d8d0556aa81a63e2373 Mon Sep 17 00:00:00 2001 From: John Bellone Date: Tue, 24 Feb 2015 05:34:10 -0500 Subject: [PATCH] Fix a few things after converging with kitchen. --- attributes/default.rb | 4 ++-- libraries/encrypt.rb | 6 +++--- libraries/helpers.rb | 4 ++-- libraries/provider_consul_client.rb | 3 +++ libraries/provider_consul_client_source.rb | 2 +- libraries/provider_consul_config.rb | 3 +++ libraries/provider_consul_service.rb | 3 +++ libraries/resource_consul_config.rb | 6 +++--- libraries/resource_consul_service.rb | 12 ++++++------ recipes/default.rb | 2 +- 10 files changed, 27 insertions(+), 18 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 82c7c1b7..9b55e34c 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -46,8 +46,8 @@ default['consul']['servers'] = [] default['consul']['init_style'] = 'init' # 'init', 'runit' -default['consul']['run_user'] = 'consul' -default['consul']['run_group'] = 'consul' +default['consul']['service_user'] = 'consul' +default['consul']['service_group'] = 'consul' default['consul']['ports'] = { 'dns' => 8600, diff --git a/libraries/encrypt.rb b/libraries/encrypt.rb index 93bbbda7..98155c16 100644 --- a/libraries/encrypt.rb +++ b/libraries/encrypt.rb @@ -4,7 +4,7 @@ # # Copyright 2014, 2015 Bloomberg Finance L.P. # -module Consul +module ConsulCookbook module Encrypt # TODO: (jbellone) Revisit implementation of these bits prior to # 1.0 release. Not sure exactly what this is used for. @@ -28,5 +28,5 @@ def consul_dbi_key_with_node_default(dbi, key) end end -class Chef::Recipe; include Consul::Encrypt; end -class Chef::Resource; include Consul::Encrypt; end +class Chef::Recipe; include ConsulCookbook::Encrypt; end +class Chef::Resource; include ConsulCookbook::Encrypt; end diff --git a/libraries/helpers.rb b/libraries/helpers.rb index 19a908c0..83e37890 100644 --- a/libraries/helpers.rb +++ b/libraries/helpers.rb @@ -10,12 +10,12 @@ def consul_name new_resource.instance end - def parsed_run_group + def self.parsed_run_group return new_resource.run_group if new_resource.run_group node['consul']['run_group'] end - def parsed_run_user + def self.parsed_run_user return new_resource.run_user if new_resource.run_user node['consul']['run_user'] end diff --git a/libraries/provider_consul_client.rb b/libraries/provider_consul_client.rb index ac59b2f9..c162ede5 100644 --- a/libraries/provider_consul_client.rb +++ b/libraries/provider_consul_client.rb @@ -4,8 +4,11 @@ # # Copyright 2014, 2015 Bloomberg Finance L.P. # +require_relative 'helpers' class Chef::Provider::ConsulClient < Chef::Provider::LWRPBase + include ConsulCookbook::Helpers + use_inline_resources if defined?(use_inline_resources) def whyrun_supported? diff --git a/libraries/provider_consul_client_source.rb b/libraries/provider_consul_client_source.rb index 9b1aedca..c55c3bd9 100644 --- a/libraries/provider_consul_client_source.rb +++ b/libraries/provider_consul_client_source.rb @@ -5,7 +5,7 @@ # Copyright 2014, 2015 Bloomberg Finance L.P. # -class Chef::Provider::ConsulServiceSource < Chef::Provider::ConsulService +class Chef::Provider::ConsulClientSource < Chef::Provider::ConsulClient action :create do include_recipe 'golang::default' diff --git a/libraries/provider_consul_config.rb b/libraries/provider_consul_config.rb index a5de5746..2b5f56a1 100644 --- a/libraries/provider_consul_config.rb +++ b/libraries/provider_consul_config.rb @@ -4,8 +4,11 @@ # # Copyright 2014, 2015 Bloomberg Finance L.P. # +require_relative 'helpers' class Chef::Provider::ConsulConfig < Chef::Provider::LWRPBase + include ConsulCookbook::Helpers + use_inline_resources if defined?(use_inline_resources) def whyrun_supported? diff --git a/libraries/provider_consul_service.rb b/libraries/provider_consul_service.rb index 853490b1..914d5a80 100644 --- a/libraries/provider_consul_service.rb +++ b/libraries/provider_consul_service.rb @@ -4,8 +4,11 @@ # # Copyright 2014, 2015 Bloomberg Finance L.P. # +require_relative 'helpers' class Chef::Provider::ConsulService < Chef::Provider::LWRPBase + include ConsulCookbook::Helpers + use_inline_resources if defined?(use_inline_resources) def whyrun_supported? diff --git a/libraries/resource_consul_config.rb b/libraries/resource_consul_config.rb index ff40c913..326a9b79 100644 --- a/libraries/resource_consul_config.rb +++ b/libraries/resource_consul_config.rb @@ -10,7 +10,7 @@ class Chef::Resource::ConsulConfig < Chef::Resource::LWRPBase actions :create, :delete default_action :create - attribute :config_name, kind_of: String, required: true, name_attribute: true + attribute :path, kind_of: String, name_attribute: true, required: true attribute :run_user, kind_of: String, required: true, default: nil attribute :run_group, kind_of: String, required: true, default: nil @@ -25,7 +25,7 @@ class Chef::Resource::ConsulConfig < Chef::Resource::LWRPBase attribute :advertise_addr, kind_of: String, default: nil attribute :bind_addr, kind_of: String, default: nil attribute :bootstrap, kind_of: [TrueClass, FalseClass], default: false - attribute :bootstrap_expect, kind_of: Number, default: 3 + attribute :bootstrap_expect, kind_of: Integer, default: 3 attribute :ca_file, kind_of: String, default: nil attribute :cert_file, kind_of: String, default: nil attribute :check_update_interval, kind_of: String, default: nil @@ -47,7 +47,7 @@ class Chef::Resource::ConsulConfig < Chef::Resource::LWRPBase attribute :ports, kind_of: Hash, default: nil attribute :protocol, kind_of: String, default: nil attribute :recursor, kind_of: String, default: nil - attribute :retry_interval, kind_of: Number, default: nil + attribute :retry_interval, kind_of: Integer, default: nil attribute :server, kind_of: [TrueClass, FalseClass], default: true attribute :server_name, kind_of: String, default: nil attribute :skip_leave_on_interrupt, kind_of: [TrueClass, FalseClass], default: false diff --git a/libraries/resource_consul_service.rb b/libraries/resource_consul_service.rb index 7f004fb3..bc689c67 100644 --- a/libraries/resource_consul_service.rb +++ b/libraries/resource_consul_service.rb @@ -12,11 +12,11 @@ class Chef::Resource::ConsulService < Chef::Resource::LWRPBase actions :create, :delete, :start, :stop, :restart, :reload default_action :start - attribute :instance, type: String, name_attribute: true, required: true - attribute :run_user, type: String, default: nil - attribute :run_group, type: String, default: nil + attribute :instance, kind_of: String, name_attribute: true, required: true + attribute :run_user, kind_of: String, default: nil + attribute :run_group, kind_of: String, default: nil - attribute :config_filename, type: String, required: true, default: nil - attribute :config_dir, type: String, required: true, default: nil - attribute :extra_options, type: Array, default: [] + attribute :config_filename, kind_of: String, required: true, default: nil + attribute :config_dir, kind_of: String, required: true, default: nil + attribute :extra_options, kind_of: Array, default: [] end diff --git a/recipes/default.rb b/recipes/default.rb index f6015f52..e9a57d09 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -7,7 +7,7 @@ # client = consul_client Chef::Consul.install_path(node) do - filename Chef::Consul.remote_filename(node) + path Chef::Consul.remote_filename(node) url Chef::Consul.remote_url(node) checksum Chef::Consul.remote_checksum(node) version node['consul']['version']