knife-ec-backup 2.0.5 → 2.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/chef/knife/ec_key_base.rb +1 -1
- data/lib/knife_ec_backup/version.rb +1 -1
- data/spec/chef/knife/ec_key_base_spec.rb +35 -0
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8a281b55227d745f186c3c9a9a471d274e078585
|
4
|
+
data.tar.gz: cc3f0d8ed0a83f0e4b00eab7713c51f670fec1a7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0b58a4651be0b287f89ac2e2ec362db20f0193f17ce15dd6749591e26e71683b311933cf2a8ece1c1ba65be30398db844094dc6659344a570b0c60437b888133
|
7
|
+
data.tar.gz: 046df1b5018e9ff98cd44b47d7768df28de07562f166ab0d7c2962a6847f21b579c35189b1de777b9bb2277aa696673d1918cb466e59c26e201132f1d860e42f
|
@@ -77,7 +77,7 @@ class Chef
|
|
77
77
|
else
|
78
78
|
running_config ||= JSON.parse(File.read("/etc/opscode/chef-server-running.json"))
|
79
79
|
# Latest versions of chef server put the database info under opscode-erchef.sql_user
|
80
|
-
hash_key = if running_config['private_chef']['opscode-erchef'].has_key? sql_user
|
80
|
+
hash_key = if running_config['private_chef']['opscode-erchef'].has_key? 'sql_user'
|
81
81
|
'opscode-erchef'
|
82
82
|
else
|
83
83
|
'postgresql'
|
@@ -1,2 +1,37 @@
|
|
1
1
|
require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
|
2
2
|
require 'chef/knife/ec_key_base'
|
3
|
+
|
4
|
+
class KeyBaseTester < Chef::Knife
|
5
|
+
include Chef::Knife::EcKeyBase
|
6
|
+
end
|
7
|
+
|
8
|
+
describe Chef::Knife::EcKeyBase do
|
9
|
+
let (:knife) { Chef::Knife::KeyBaseTester.new }
|
10
|
+
|
11
|
+
let(:running_server_postgresql_sql_config_json) {
|
12
|
+
'{"private_chef": { "opscode-erchef":{}, "postgresql": { "sql_user": "jiminy", "sql_password": "secret"} }}'
|
13
|
+
}
|
14
|
+
|
15
|
+
|
16
|
+
let(:running_server_erchef_config_json) {
|
17
|
+
'{"private_chef": { "opscode-erchef": { "sql_user": "cricket", "sql_password": "secrete"}, "postgresql" : {} }}'
|
18
|
+
}
|
19
|
+
describe "#load_config_from_file!" do
|
20
|
+
before(:each) do
|
21
|
+
allow(File).to receive(:exists?).and_return(true)
|
22
|
+
end
|
23
|
+
it "correctly sets sql options when they live under postgresql settings" do
|
24
|
+
allow(File).to receive(:read).and_return(running_server_postgresql_sql_config_json)
|
25
|
+
knife.load_config_from_file!
|
26
|
+
expect(knife.config[:sql_user]).to eq("jiminy")
|
27
|
+
expect(knife.config[:sql_password]).to eq("secret")
|
28
|
+
end
|
29
|
+
it "correctly sets sql options when they live under opscode-erchef settings" do
|
30
|
+
allow(File).to receive(:read).and_return(running_server_erchef_config_json)
|
31
|
+
knife.load_config_from_file!
|
32
|
+
expect(knife.config[:sql_user]).to eq("cricket")
|
33
|
+
expect(knife.config[:sql_password]).to eq("secrete")
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-ec-backup
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- John Keiser
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-07-
|
11
|
+
date: 2015-07-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sequel
|
@@ -102,9 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
102
102
|
version: '0'
|
103
103
|
requirements: []
|
104
104
|
rubyforge_project:
|
105
|
-
rubygems_version: 2.4.
|
105
|
+
rubygems_version: 2.4.5
|
106
106
|
signing_key:
|
107
107
|
specification_version: 4
|
108
108
|
summary: Backup and Restore of Enterprise Chef
|
109
109
|
test_files: []
|
110
|
-
has_rdoc:
|