net-connector 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b108e7525f64a9df67db08537eafa2e3c2845797fccea6fe09fdb5701696fd
-  data.tar.gz: f6c6bea9be822222feb3056e2866b39d35209b4fe06b108613c059261b987467
+  metadata.gz: fe3f1f3bc71cf02e0007ec892699ea03fb13f30b697f5e318ca256159e77a466
+  data.tar.gz: 7f2ed60b91541c0eb362b1dc1c063661f5f22eac07719f1ed9d56f552a7d175b
 SHA512:
-  metadata.gz: de0022df96e76aeeec4bd916c7abd27f9fb4646269d552846d07d1c575a05593fbf3605a25f271574a48202e81100986fb5508e44c162c6b1668c158bcad9ae9
-  data.tar.gz: 749ba87f2702d94098e02b3cf7f9fae6e00557f219c796e453028b7d67db07f1c7469985ad8275818de71b50a1bfc7b2319936e502817f7057f5b3a59c670cd7
+  metadata.gz: 03ea333dc6fdc10956b58478de7b67d8e3061345b3d96af8601a847dd393b158cd0bdbd7e4ca3ebc69c7cdca03d58ced76e34964b0370d9b2b0dad27c4d1f9dc
+  data.tar.gz: 38784dee207a4b5161add61183ebb49cf7b4a7a843171a29da2effe393105cd9c4bd00f2a0d3780ab296c430149a43792c85b9054375cb1c97269e89b1ad7f96

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.19.0 - 2026-10-29
+
+- Extract `Netdisco::Catalog#devices(policy:)` for immutable inventory without credentials or operations; Fleet delegates inventory access. Add live, injected `Credentials#resolve(platform:)` with platform-specific username/password/enable-password precedence and independent secret snapshots.
+
 ## 0.18.1 - 2026-10-24
 
 - Stream SSH archive bodies through bounded binary frames and incremental hashes instead of whole-file base64 copies; preserve deadlines, verified server receipts and committed local paths.

data/README.md

@@ -66,3 +66,22 @@ Licensed under [MIT](LICENSE).
 ## ctx_cli 公共入口
 
 宿主配置文件读取、私有文件初始化、公共参数与终端交互由 ctx_cli 维护。原 `Net::Connector::Config`、配置路径、优先级和 backup/TFTP/topology 策略继续保留。源码联调使用 `CTX_CLI_PATH=../ctx_cli`；隔离安装可通过 `CTX_CLI_GEM=/absolute/path/ctx_cli-0.1.0.gem` 传入精确候选。
+
+
+## Inventory and credentials without device operations
+
+```ruby
+require "net/connector/netdisco/catalog"
+require "net/connector/credentials"
+
+settings = Net::Connector::Netdisco::Settings.new(env: ENV)
+policy = settings.snapshot(mode: :inventory)
+catalog = Net::Connector::Netdisco::Catalog.new(settings: settings)
+devices = catalog.devices(policy: policy)
+# Inspect device.issue before selecting targets; duplicate rows are retained.
+credentials = Net::Connector::Credentials.new(env: ENV).resolve(platform: :cisco_nxos)
+```
+
+Catalog owns inventory reading, normalization, duplicate marking and cache status (`#status`). It does not resolve device credentials, log into devices or create operation reports. Pass one policy snapshot throughout a run. Fleet delegates to Catalog and retains operation orchestration.
+
+Credentials reads the injected environment on every `resolve`; it returns an independent frozen hash, or nil when no username is available. Platform-specific `NC_<PLATFORM>_USERNAME`, `_PASSWORD`, and `_ENABLE_PASSWORD` override `NC_DEVICE_USERNAME`, `NC_DEVICE_PASSWORD`, and `NC_ENABLE_PASSWORD` respectively. Blank values fall back. Secrets are never cached or included in object inspection.

data/lib/net/connector/credentials.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Net
+  module Connector
+    # 设备凭据的字段优先级；借用来源，每次解析独立快照，不缓存秘密。
+    class Credentials
+      def initialize(env: ENV)
+        raise ArgumentError, "Credential source must support key lookup" unless env.respond_to?(:[])
+        @env = env
+      end
+
+      # 平台字段优先于通用字段；缺少用户名时由宿主决定跳过或拒绝。
+      def resolve(platform:)
+        unless (platform.is_a?(String) || platform.is_a?(Symbol)) && /\A[a-z][a-z0-9_]*\z/i.match?(platform.to_s)
+          raise ArgumentError, "Credential platform must be a name"
+        end
+        prefix = "NC_#{platform.to_s.upcase}_"
+        username = value(prefix + "USERNAME") || value("NC_DEVICE_USERNAME")
+        return nil unless username
+
+        { username: username, password: value(prefix + "PASSWORD") || value("NC_DEVICE_PASSWORD"),
+          enable_password: value(prefix + "ENABLE_PASSWORD") || value("NC_ENABLE_PASSWORD") }.freeze
+      end
+
+      def inspect = "#<#{self.class}>"
+      alias to_s inspect
+      def pretty_print(printer) = printer.text(inspect)
+
+      private
+
+      # 拒绝非法值而不回显内容，也不冻结调用方的字符串。
+      def value(key)
+        result = @env[key]
+        raise ArgumentError, "#{key} must be a String" unless result.nil? || result.is_a?(String)
+        result.dup.freeze unless result.nil? || result.strip.empty?
+      end
+    end
+  end
+end

data/lib/net/connector/netdisco/catalog.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative "settings"
+require_relative "device"
+
+module Net
+  module Connector
+    module Netdisco
+      # 只读取、归一化及标记清单；凭据、连接、操作和报告由宿主拥有。
+      class Catalog
+        attr_reader :status
+
+        def initialize(settings: Settings.new, inventory: nil, rules: nil)
+          @settings, @inventory, @rules = settings, inventory, rules
+        end
+
+        # 使用调用方固定的同批策略，保留被过滤、无效及重复的记录。
+        def devices(policy:, force_refresh: false)
+          @status = nil
+          raise ArgumentError, "force_refresh must be true or false" unless [true, false].include?(force_refresh)
+
+          inventory = @inventory || @settings.inventory(policy: policy)
+          cache_mode = policy.inventory_cache_mode
+          raise ArgumentError, "cache-only cannot force refresh" if cache_mode == :only && force_refresh
+          if cache_mode == :only && !inventory.is_a?(Inventory::Cache)
+            raise Inventory::Error.new("validated inventory cache is unavailable", code: :cache_unavailable), cause: nil
+          end
+          rows = if inventory.is_a?(Inventory::Cache)
+                   inventory.devices(force_refresh: force_refresh, cache_mode: cache_mode)
+                 else
+                   inventory.devices
+                 end
+          @status = if inventory.is_a?(Inventory::Cache)
+                                { source: inventory.status, fetched_at: inventory.fetched_at,
+                                  refresh_error_code: inventory.refresh_error_code, write_error_type: inventory.write_error_type }.freeze
+                              else
+                                { source: :uncached }.freeze
+                              end
+          raise Inventory::Error, "Netdisco returned an invalid device inventory" unless rows.is_a?(Array)
+
+          rules = @rules || policy.rules
+          devices = rows.map { |row| Device.from_row(row, rules: rules) }
+          host_counts = devices.each_with_object(Hash.new(0)) { |device, counts| counts[device.host] += 1 if device.host }
+          devices.map { |device| host_counts[device.host] > 1 ? device.with(issue: :duplicate_host) : device }.freeze
+        end
+
+        def inspect = "#<#{self.class}>"
+        alias to_s inspect
+        def pretty_print(printer) = printer.text(inspect)
+      end
+    end
+  end
+end

data/lib/net/connector/netdisco/fleet.rb

@@ -4,6 +4,7 @@ require "fileutils"
 require_relative "../storage"
 require_relative "../device/scope"
 require_relative "inventory"
+require_relative "catalog"
 require_relative "settings"
 require_relative "device"
 require_relative "device/access"
@@ -35,8 +36,7 @@ module Net
         def initialize(inventory: nil, settings: Settings.new, rules: nil, credentials: nil, connector_factory: nil,
                        report_store: Report::Store::Json.new)
           @settings = settings
-          @inventory = inventory
-          @rules = rules
+          @catalog = Catalog.new(settings: settings, inventory: inventory, rules: rules)
           @credentials = credentials
           @connector_factory = connector_factory || ->(device, access_options) { device.build_connector(**access_options) }
           @report_store = report_store
@@ -176,32 +176,9 @@ module Net
 
         # 策略在清单请求之前固定；注入的清单来源仍由调用方负责其自身生命周期。
         def inventory(settings_snapshot, force_refresh: false)
-          @inventory_status = nil
-          raise ArgumentError, "force_refresh must be true or false" unless [true, false].include?(force_refresh)
-
-          inventory = @inventory || @settings.inventory(policy: settings_snapshot)
-          cache_mode = settings_snapshot.inventory_cache_mode
-          raise ArgumentError, "cache-only cannot force refresh" if cache_mode == :only && force_refresh
-          if cache_mode == :only && !inventory.is_a?(Inventory::Cache)
-            raise Inventory::Error.new("validated inventory cache is unavailable", code: :cache_unavailable), cause: nil
-          end
-          rows = if inventory.is_a?(Inventory::Cache)
-                   inventory.devices(force_refresh: force_refresh, cache_mode: cache_mode)
-                 else
-                   inventory.devices
-                 end
-          @inventory_status = if inventory.is_a?(Inventory::Cache)
-                                { source: inventory.status, fetched_at: inventory.fetched_at,
-                                  refresh_error_code: inventory.refresh_error_code, write_error_type: inventory.write_error_type }.freeze
-                              else
-                                { source: :uncached }.freeze
-                              end
-          raise Inventory::Error, "Netdisco returned an invalid device inventory" unless rows.is_a?(Array)
-
-          rules = @rules || settings_snapshot.rules
-          devices = rows.map { |row| Device.from_row(row, rules: rules) }
-          host_counts = devices.each_with_object(Hash.new(0)) { |device, counts| counts[device.host] += 1 if device.host }
-          devices.map { |device| host_counts[device.host] > 1 ? device.with(issue: :duplicate_host) : device }.freeze
+          @catalog.devices(policy: settings_snapshot, force_refresh: force_refresh)
+        ensure
+          @inventory_status = @catalog.status
         end
 
         # 在固定清单快照上生成模式对应的计划，规划阶段不读取设备凭据。

data/lib/net/connector/netdisco/settings.rb

@@ -346,13 +346,7 @@ module Net
 
         # 每台任务读取最新厂商凭据，缺失字段回退到通用凭据；无用户名时跳过设备。
         def device_credentials_for(device)
-          prefix = "NC_#{device.vendor.to_s.upcase}_"
-          username = secret_value(prefix + "USERNAME") || secret_value("NC_DEVICE_USERNAME")
-          return nil unless username
-
-          { username: username,
-            password: secret_value(prefix + "PASSWORD") || secret_value("NC_DEVICE_PASSWORD"),
-            enable_password: secret_value(prefix + "ENABLE_PASSWORD") || secret_value("NC_ENABLE_PASSWORD") }
+          Net::Connector::Credentials.new(env: @env).resolve(platform: device.vendor)
         end
 
         # 会话日志目录属于公开策略；调用方和批次入口负责实际创建。

data/lib/net/connector/version.rb

@@ -3,6 +3,6 @@
 module Net
   module Connector
     # gemspec、CLI 与发布工具共用此版本，运行时读取不触发设备依赖加载。
-    VERSION = "0.18.1"
+    VERSION = "0.19.0"
   end
 end

data/lib/net/connector.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "connector/version"
+require_relative "connector/credentials"
 require_relative "connector/device/base"
 require_relative "connector/vendor"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - net-connector contributors
 bindir: bin
 cert_chain: []
-date: 2026-10-24 00:00:00.000000000 Z
+date: 2026-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ctx_cli
@@ -375,6 +375,7 @@ files:
 - lib/net/connector.rb
 - lib/net/connector/collect/progress.rb
 - lib/net/connector/config.rb
+- lib/net/connector/credentials.rb
 - lib/net/connector/device/base.rb
 - lib/net/connector/device/interfaces.rb
 - lib/net/connector/device/interfaces/audit.rb
@@ -436,6 +437,7 @@ files:
 - lib/net/connector/inventory/selection.rb
 - lib/net/connector/netdisco.rb
 - lib/net/connector/netdisco/batch.rb
+- lib/net/connector/netdisco/catalog.rb
 - lib/net/connector/netdisco/cli.rb
 - lib/net/connector/netdisco/cli/backup.rb
 - lib/net/connector/netdisco/cli/credentials.rb