knife-ec-backup 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4846181eee9032e990d6cf91f487f330c14008839a356ecaac094d1aba7d51
-  data.tar.gz: 92561a6aa7f68c1c05fc05ce9125031ce2baf8f6793bc37507de9fa07ce30026
+  metadata.gz: 5f2a9570f14dc2fb44eb99732fd69f1f9da32c48ceab68bd6e94511f1e2c464d
+  data.tar.gz: de9b0f5cd3bc62c6402bd364151c1237d6e1107b89ce9b80753240091e0b3303
 SHA512:
-  metadata.gz: d9c42d8b652b129d1fe87ae7f73346837847f92c9c2c89f8e7e12f3fb6bc0bc5c4ebab5691f799484ae5c0588c5e1da4b426228b495cb8566c59cbcb96cb81a8
-  data.tar.gz: fa6b5c5710fda71c349c844caec6bdb0b52bc9a564f5295accf4b85b86128e01d74cb9116b9e318b1ece8addc63cb5f2eb24e2473d142ee923862337f74588ef
+  metadata.gz: 5c68fe7a9f2af77f36bff226a63d131cd7dc1a9bb0dd0086b0d65125913310080b4b2acc52f1284438116aae4d14baa248624078d08b3abf37484cebacda3c5f
+  data.tar.gz: d2d04dfab678b7d4629e88369208807be1af0f92a930dc6c2bf4d6ead3ba813836f4542ba93322c390f8e120a59c7ab9a9d07d142cb5aa3137af2578864d6e0a

data/lib/chef/knife/ec_base.rb

@@ -67,13 +67,11 @@ class Chef
 
           option :sql_host,
             :long => '--sql-host HOSTNAME',
-            :description => 'PostgreSQL database hostname (default: localhost)',
-            :default => "localhost"
+            :description => 'PostgreSQL database hostname (default: value from chef-server-running.json, or localhost)'
 
           option :sql_port,
             :long => '--sql-port PORT',
-            :description => 'PostgreSQL database port (default: 5432)',
-            :default => 5432
+            :description => 'PostgreSQL database port (default: value from chef-server-running.json, or 5432)'
 
           option :sql_db,
             :long => '--sql-db DBNAME',

data/lib/chef/knife/ec_key_base.rb

@@ -34,13 +34,11 @@ class Chef
 
           option :sql_host,
           :long => '--sql-host HOSTNAME',
-          :description => 'PostgreSQL database hostname (default: localhost)',
-          :default => "localhost"
+          :description => 'PostgreSQL database hostname (default: value from chef-server-running.json, or localhost)'
 
           option :sql_port,
           :long => '--sql-port PORT',
-          :description => 'PostgreSQL database port (default: 5432)',
-          :default => 5432
+          :description => 'PostgreSQL database port (default: value from chef-server-running.json, or 5432)'
 
           option :sql_db,
           :long => '--sql-db DBNAME',
@@ -88,8 +86,9 @@ class Chef
                   require 'sequel'
                   require 'uri'
                   server_uri = URI('postgres://')
-                  server_uri.host = config[:sql_host]
-                  server_uri.port = config[:sql_port]
+                  server_uri.host = config[:sql_host] || 'localhost'
+                  server_uri.port = config[:sql_port] || 5432
+                  server_uri.path = "/#{config[:sql_db]}" if config[:sql_db]
                   server_uri.user = URI.encode_www_form_component(config[:sql_user]) if config[:sql_user]
                   server_uri.password = URI.encode_www_form_component(config[:sql_password]) if config[:sql_password]
                   query_params = []
@@ -123,6 +122,14 @@ class Chef
             config[:sql_user] ||= running_config['private_chef'][hash_key]['sql_user']
             config[:sql_password] ||= (running_config['private_chef'][hash_key]['sql_password'] || sql_password)
             config[:sql_db] ||= 'opscode_chef'
+            # Source the PostgreSQL host/port from the running config so external
+            # PostgreSQL deployments are picked up automatically, the same way the
+            # sql_user/sql_password/sql_db are. ||= ensures an explicit --sql-host /
+            # --sql-port still wins. Embedded installs report a loopback vip, and the
+            # db method falls back to localhost:5432 when these are absent.
+            pg_config = running_config['private_chef']['postgresql'] || {}
+            config[:sql_host] ||= pg_config['vip']
+            config[:sql_port] ||= pg_config['port']
           end
         end
       end

data/lib/knife_ec_backup/version.rb

@@ -1,4 +1,4 @@
 # when you change this to double quotes, also update .expeditor/update_version.sh
 module KnifeECBackup
-  VERSION = '3.0.8'
+  VERSION = '3.0.9'
 end

data/spec/chef/knife/ec_key_base_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 require 'chef/knife/ec_key_base'
 require 'chef/automate'
+require 'sequel'
 
 class KeyBaseTester < Chef::Knife
   include Chef::Knife::EcKeyBase
@@ -38,4 +39,54 @@ describe Chef::Knife::EcKeyBase do
       expect(knife.config[:sql_password]).to eq("secrete")
     end
   end
+
+  # Regression coverage for the external-PostgreSQL bug: the SQL host/port must
+  # be sourced from chef-server-running.json (like sql_user/sql_password/sql_db),
+  # while an explicit --sql-host / --sql-port supplied on the CLI must still win.
+  describe "#load_config_from_file! PostgreSQL host/port autoconfiguration" do
+    let(:external_pg_running_config) {
+      '{"private_chef": { "opscode-erchef": {}, "postgresql": { "vip": "db.external.example.com", "port": 6432, "sql_user": "jiminy", "sql_password": "secret" } } }'
+    }
+
+    before(:each) do
+      allow(Chef::Automate).to receive(:is_installed?).and_return(false)
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with("/etc/opscode/chef-server-running.json").and_return(true)
+      allow(File).to receive(:read).and_call_original
+      allow(File).to receive(:read).with("/etc/opscode/chef-server-running.json").and_return(external_pg_running_config)
+    end
+
+    it "adopts the PostgreSQL host and port from chef-server-running.json when no CLI flag is given" do
+      knife.load_config_from_file!
+      expect(knife.config[:sql_host]).to eq("db.external.example.com")
+      expect(knife.config[:sql_port]).to eq(6432)
+    end
+
+    it "lets an explicit --sql-host / --sql-port win over the autoconfigured value" do
+      knife.config[:sql_host] = "cli-host.example.com"
+      knife.config[:sql_port] = 2345
+      knife.load_config_from_file!
+      expect(knife.config[:sql_host]).to eq("cli-host.example.com")
+      expect(knife.config[:sql_port]).to eq(2345)
+    end
+  end
+
+  # Regression coverage for #181: the configured database name must be written
+  # into the PostgreSQL connection URI. It was previously resolved but never
+  # applied, so PostgreSQL silently fell back to a database named after the user.
+  describe "#db connection URI" do
+    before(:each) do
+      # Capture the connection string instead of opening a real connection.
+      allow(Sequel).to receive(:connect) { |uri, *| uri }
+    end
+
+    it "includes the configured database name in the connection URI" do
+      knife.config[:sql_db] = "custom_db"
+      expect(knife.db).to include("/custom_db")
+    end
+
+    it "falls back to localhost:5432 when host and port are unset" do
+      expect(knife.db).to start_with("postgres://localhost:5432")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-02-26 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel