knife-proxmox-ve 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44a5c4bf238510fc6036949da54fbc039f51c0ff7d3d9afd851be8b4f6e2681e
-  data.tar.gz: e3de5df406aa26142068a1f087f485604e7f0f0237fc20da7473ff7ec6caf187
+  metadata.gz: bff2fdcc58a1aeadf186e297e838ddb91510536f7cf0169ccb25a3091c590931
+  data.tar.gz: 9cdc6b30bfe1a9d8da2feb3f8cf622973dbb0ab553c13c10a3a9729ea444a46a
 SHA512:
-  metadata.gz: 3d4500fc914372ba78bec85f72786a58bae1177fa3d900f8faa75896f664bda4f6805da6ea2f2aad35f81abbc995981f7de52b85b464b7f4b8142d28a9ab5580
-  data.tar.gz: 63006a55bc3d193884fbca1344d99f88719e7bfe475b9d67a48ddadde9ccff2d723f06c757e26263964206c2631511f2b3dc48aba1ea556883ded843925803a5
+  metadata.gz: 118d4dd196b869f226c11801b728b4d71661c9aa9756210b3857bf6f629c45515199a9b2e0b9b0f27b07bbf1cee995de81eaa1e1e8102a228d415eae7a94a460
+  data.tar.gz: b2b0d7b679086f772f7d844c22635c9a749110405362788ece0e7de99a23eec68a97c1e7e18ddfdad30500a5bfb606e8f8ed4b396a61faa9a32a0a1a4f2226ae

data/CHANGELOG.md

@@ -1,24 +0,0 @@
-# Changelog
-
-All notable changes to this project are documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [0.1.0] - 2026-06-04
-
-### Added
-
-- `knife proxmox vm create` — create a VM on Proxmox VE by cloning a prepared
-  template and configuring CPU/RAM/network/cloud-init.
-- `knife proxmox vm bootstrap` — create a VM and automatically bootstrap it with
-  Chef/CINC in a single command, waiting for the VM to boot first.
-- Read-only helpers: `knife proxmox cluster list`, `knife proxmox template list`
-  and `knife proxmox vm list`.
-- Support for multiple Proxmox clusters defined in `~/.cinc/config.rb`.
-- Authentication via Proxmox VE API tokens.
-
-[Unreleased]: https://github.com/pwojcieszonek/knife-proxmox-ve/compare/v0.1.0...HEAD
-[0.1.0]: https://github.com/pwojcieszonek/knife-proxmox-ve/releases/tag/v0.1.0

data/README.md

@@ -202,7 +202,9 @@ Lists the qemu templates on the selected cluster (name, VMID, node, disk, memory
 Lists the cluster's qemu VMs (name, VMID, node, status, memory, uptime). `--node` filters
 client-side.
 
-All read commands honour `--format json|yaml` for scripting.
+Disk, memory and uptime are rendered human-readable (e.g. `10 GiB`, `1h`) in the default
+table output. All read commands honour `--format json|yaml` for scripting, where these fields
+stay raw (bytes / seconds).
 
 ## Development
 

data/lib/chef/knife/helpers/proxmox_base.rb

@@ -53,6 +53,42 @@ class Chef
         ui.info("#{ui.color(label, color)}: #{value}") if value && !value.to_s.empty?
       end
 
+      # Binary byte units, lowest first. Proxmox reports sizes in bytes against a 1024 base,
+      # so render in IEC units (KiB, MiB, ...) to match the values shown in the Proxmox UI.
+      BYTE_UNITS = %w{B KiB MiB GiB TiB PiB}.freeze
+
+      # Render a byte count as a human-readable IEC size (e.g. 10_737_418_240 -> "10 GiB").
+      # Passes nil through untouched so absent fields (a template has no live size) stay nil
+      # rather than becoming a misleading "0 B".
+      def human_bytes(value)
+        return value if value.nil?
+
+        size = value.to_f
+        unit = 0
+        while size >= 1024 && unit < BYTE_UNITS.length - 1
+          size /= 1024
+          unit += 1
+        end
+        format("%g %s", size.round(2), BYTE_UNITS[unit])
+      end
+
+      # Render a second count as a compact duration (e.g. 3600 -> "1h", 90_061 -> "1d 1h 1m 1s").
+      # nil passes through (a stopped/template VM reports no uptime); 0 renders as "0s".
+      def human_duration(seconds)
+        return seconds if seconds.nil?
+
+        days, rest = seconds.to_i.divmod(86_400)
+        hours, rest = rest.divmod(3_600)
+        minutes, secs = rest.divmod(60)
+
+        parts = []
+        parts << "#{days}d" if days > 0
+        parts << "#{hours}h" if hours > 0
+        parts << "#{minutes}m" if minutes > 0
+        parts << "#{secs}s" if secs > 0 || parts.empty?
+        parts.join(" ")
+      end
+
       # Whether a token secret resolves for the given cluster (symbol-keyed hash), using the
       # same precedence as #resolve_token_secret but without fatal-ing. Lets `cluster list`
       # report secret presence from a single source of truth.

data/lib/chef/knife/helpers/proxmox_vm_provision.rb

@@ -13,9 +13,11 @@ class Chef
     # cloud-init auth and plants it on the guest, but never touches the bootstrap connection.
     # The bootstrap command layers that on by overriding #apply_provision_auth!.
     module ProxmoxVmProvision
-      # Proxmox bridge interface names: "vmbr" followed by digits (vmbr0, vmbr1, ...).
-      # IP/gateway validation is handled separately by IPAddr in #validate_ip!/#validate_gateway!.
-      VMBR_PATTERN = /\Avmbr\d+\z/
+      # A bridge is any Linux network interface: a classic bridge (vmbr0), an SDN VNet
+      # (arbitrary name, e.g. "mail"), an OVS bridge, a bond, etc. We only enforce what the
+      # kernel itself does on an interface name — 1..15 chars, no whitespace, no "/", and not
+      # "." or "..". IP/gateway validation is handled separately by IPAddr below.
+      BRIDGE_PATTERN = %r{\A(?!\.{1,2}\z)[^\s/]{1,15}\z}
 
       # A pasted PRIVATE key must never travel as an authorized public key.
       PRIVATE_KEY_MARKER = /-----BEGIN [A-Z ]*PRIVATE KEY-----/
@@ -73,8 +75,8 @@ class Chef
           # --- Networking -------------------------------------------------------
 
           option :bridge,
-            long:        "--bridge vmbrN",
-            description: "Network bridge for net0 (e.g. vmbr0)."
+            long:        "--bridge NAME",
+            description: "Network bridge for net0 (e.g. vmbr0 or an SDN VNet name)."
 
           option :vlan,
             long:        "--vlan TAG",
@@ -193,9 +195,10 @@ class Chef
       def validate_bridge!
         bridge = config[:bridge]
         return if bridge.nil?
-        return if VMBR_PATTERN.match?(bridge)
+        return if BRIDGE_PATTERN.match?(bridge)
 
-        ui.fatal!("--bridge #{bridge.inspect} is not a valid bridge name (expected vmbrN, e.g. vmbr0)")
+        ui.fatal!("--bridge #{bridge.inspect} is not a valid interface name " \
+                  "(1-15 chars, no whitespace or '/'; e.g. vmbr0 or an SDN VNet name)")
       end
 
       def validate_ip!

data/lib/chef/knife/proxmox_template_list.rb

@@ -37,8 +37,19 @@ class Chef
           }
         end
 
+        # Keep raw numbers for json/yaml (scripting); humanize only the rendered table.
+        rows = rows.map { |row| humanize(row) } unless ui.interchange?
         ui.output(format_for_display(rows))
       end
+
+      private
+
+      def humanize(row)
+        row.merge(
+          maxdisk: human_bytes(row[:maxdisk]),
+          maxmem:  human_bytes(row[:maxmem])
+        )
+      end
     end
   end
 end

data/lib/chef/knife/proxmox_vm_list.rb

@@ -33,6 +33,8 @@ class Chef
 
         rows = proxmox_api.list_resources(template: false)
         rows = filter_by_node(rows)
+        # Keep raw numbers for json/yaml (scripting); humanize only the rendered table.
+        rows = rows.map { |row| humanize(row) } unless ui.interchange?
         ui.output(format_for_display(rows))
       end
 
@@ -44,6 +46,14 @@ class Chef
 
         rows.select { |row| row[:node] == node }
       end
+
+      def humanize(row)
+        row.merge(
+          maxmem:  human_bytes(row[:maxmem]),
+          maxdisk: human_bytes(row[:maxdisk]),
+          uptime:  human_duration(row[:uptime])
+        )
+      end
     end
   end
 end

data/lib/knife-proxmox-ve/version.rb

@@ -2,6 +2,6 @@
 
 module Knife
   module Proxmox
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-proxmox-ve
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Wojcieszonek
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Knife plugin to create and automatically bootstrap Proxmox VE VMs with Chef/CINC.
 test_files: []