Merge branch 'bpg:main' into Update_Disk_Via_Import

Author: Vaneixus

.all-contributorsrc

@@ -1519,6 +1519,24 @@
         "test",
         "code"
       ]
+    },
+    {
+      "login": "JustasUmbrasas",
+      "name": "Justas Umbrasas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70886320?v=4",
+      "profile": "https://github.com/JustasUmbrasas",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "alexhaydock",
+      "name": "Alex Haydock",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13152214?v=4",
+      "profile": "https://github.com/alexhaydock",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CONTRIBUTORS.md

@@ -214,6 +214,8 @@
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://mlit.pro"><img src="https://avatars.githubusercontent.com/u/693906?v=4?s=100" width="100px;" alt="Maciej Lech"/><br /><sub><b>Maciej Lech</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=maciej-lech" title="Tests">⚠️</a> <a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=maciej-lech" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JustasUmbrasas"><img src="https://avatars.githubusercontent.com/u/70886320?v=4?s=100" width="100px;" alt="Justas Umbrasas"/><br /><sub><b>Justas Umbrasas</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=JustasUmbrasas" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/alexhaydock"><img src="https://avatars.githubusercontent.com/u/13152214?v=4?s=100" width="100px;" alt="Alex Haydock"/><br /><sub><b>Alex Haydock</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=alexhaydock" title="Documentation">📖</a></td>
     </tr>
   </tbody>
   <tfoot>

docs/data-sources/virtual_environment_sdn_vnet.md

@@ -11,7 +11,24 @@ description: |-
 
 Retrieves information about an existing SDN VNet.
 
-
+## Example Usage
+
+```terraform
+data "proxmox_virtual_environment_sdn_vnet" "example" {
+  id = "vnet1"
+}
+
+output "data_proxmox_virtual_environment_sdn_vnet" {
+  value = {
+    id            = data.proxmox_virtual_environment_sdn_vnet.example.id
+    zone          = data.proxmox_virtual_environment_sdn_vnet.example.zone
+    alias         = data.proxmox_virtual_environment_sdn_vnet.example.alias
+    isolate_ports = data.proxmox_virtual_environment_sdn_vnet.example.isolate_ports
+    tag           = data.proxmox_virtual_environment_sdn_vnet.example.tag
+    vlan_aware    = data.proxmox_virtual_environment_sdn_vnet.example.vlan_aware
+  }
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema

docs/data-sources/virtual_environment_sdn_vnets.md

@@ -0,0 +1,44 @@
+---
+layout: page
+title: proxmox_virtual_environment_sdn_vnets
+parent: Data Sources
+subcategory: Virtual Environment
+description: |-
+  Retrieves information about all SDN VNets in Proxmox. This data source lists all virtual networks configured in the Software-Defined Networking setup.
+---
+
+# Data Source: proxmox_virtual_environment_sdn_vnets
+
+Retrieves information about all SDN VNets in Proxmox. This data source lists all virtual networks configured in the Software-Defined Networking setup.
+
+## Example Usage
+
+```terraform
+# List all SDN VNets
+data "proxmox_virtual_environment_sdn_vnets" "all" {}
+
+output "data_proxmox_virtual_environment_sdn_vnets_all" {
+  value = {
+    vnets = data.proxmox_virtual_environment_sdn_vnets.all.vnets
+  }
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Read-Only
+
+- `vnets` (List of Object) List of SDN VNets. (see [below for nested schema](#nestedatt--vnets))
+
+<a id="nestedatt--vnets"></a>
+### Nested Schema for `vnets`
+
+Read-Only:
+
+- `alias` (String)
+- `id` (String)
+- `isolate_ports` (Boolean)
+- `tag` (Number)
+- `vlan_aware` (Boolean)
+- `zone` (String)

docs/index.md

@@ -45,6 +45,14 @@ Use the navigation to the left to read about the available resources.
 | `PROXMOX_VE_SSH_USERNAME` | SSH username | No |
 | `PROXMOX_VE_SSH_PASSWORD` | SSH password | No |
 | `PROXMOX_VE_SSH_PRIVATE_KEY` | SSH private key | No |
+| `PROXMOX_VE_SSH_AGENT` | Use SSH agent for authentication | No |
+| `PROXMOX_VE_SSH_AUTH_SOCK` | SSH agent socket path | No |
+| `PROXMOX_VE_SSH_AGENT_FORWARDING` | Enable SSH agent forwarding | No |
+| `PROXMOX_VE_SSH_SOCKS5_SERVER` | SOCKS5 proxy server address | No |
+| `PROXMOX_VE_SSH_SOCKS5_USERNAME` | SOCKS5 proxy username | No |
+| `PROXMOX_VE_SSH_SOCKS5_PASSWORD` | SOCKS5 proxy password | No |
+| `PROXMOX_VE_MIN_TLS` | Minimum TLS version | No |
+| `PROXMOX_VE_OTP` | One-time password (deprecated) | No |
 | `PROXMOX_VE_TMPDIR` | Custom temporary directory | No |
 
 *One of these authentication methods is required
@@ -76,7 +84,7 @@ provider "proxmox" {
 ## Authentication
 
 The Proxmox provider offers a flexible means of providing credentials for authentication.
-Static credentials and pre-authenticated session-ticket can be provided to the `proxmox` block through one of the choices of arguments below, ordered by precedence:
+Static credentials and pre-authenticated session ticket can be provided to the `proxmox` block through one of the choices of arguments below, ordered by precedence:
 
 - `api_token`
 - `auth_ticket` and `csrf_prevention_token`
@@ -192,20 +200,20 @@ See the [Argument Reference](#argument-reference) section for the supported vari
 ### API Token Authentication
 
 API Token authentication can be used to authenticate with the Proxmox API without the need to provide a password.
-In combination with the `ssh` block and `ssh-agent` support, this allows for a fully password-less authentication.
+In combination with the `ssh` block and SSH agent support, this allows for a fully password-less authentication.
 
 You can create an API Token for a user via the Proxmox UI, or via the command line on the Proxmox host or cluster:
 
 - Create a user:
 
     ```sh
-    sudo pveum user add terraform@pve
+    pveum user add terraform@pve
     ```
 
 - Create a role for the user (you can skip this step if you want to use any of the existing roles):
 
     ```sh
-    sudo pveum role add Terraform -privs "Realm.AllocateUser, VM.PowerMgmt, VM.GuestAgent.Unrestricted, Sys.Console, Sys.Audit, Sys.AccessNetwork, VM.Config.Cloudinit, VM.Replicate, Pool.Allocate, SDN.Audit, Realm.Allocate, SDN.Use, Mapping.Modify, VM.Config.Memory, VM.GuestAgent.FileSystemMgmt, VM.Allocate, SDN.Allocate, VM.Console, VM.Clone, VM.Backup, Datastore.AllocateTemplate, VM.Snapshot, VM.Config.Network, Sys.Incoming, Sys.Modify, VM.Snapshot.Rollback, VM.Config.Disk, Datastore.Allocate, VM.Config.CPU, VM.Config.CDROM, Group.Allocate, Datastore.Audit, VM.Migrate, VM.GuestAgent.FileWrite, Mapping.Use, Datastore.AllocateSpace, Sys.Syslog, VM.Config.Options, Pool.Audit, User.Modify, VM.Config.HWType, VM.Audit, Sys.PowerMgmt, VM.GuestAgent.Audit, Mapping.Audit, VM.GuestAgent.FileRead, Permissions.Modify"
+    pveum role add Terraform -privs "Realm.AllocateUser, VM.PowerMgmt, VM.GuestAgent.Unrestricted, Sys.Console, Sys.Audit, Sys.AccessNetwork, VM.Config.Cloudinit, VM.Replicate, Pool.Allocate, SDN.Audit, Realm.Allocate, SDN.Use, Mapping.Modify, VM.Config.Memory, VM.GuestAgent.FileSystemMgmt, VM.Allocate, SDN.Allocate, VM.Console, VM.Clone, VM.Backup, Datastore.AllocateTemplate, VM.Snapshot, VM.Config.Network, Sys.Incoming, Sys.Modify, VM.Snapshot.Rollback, VM.Config.Disk, Datastore.Allocate, VM.Config.CPU, VM.Config.CDROM, Group.Allocate, Datastore.Audit, VM.Migrate, VM.GuestAgent.FileWrite, Mapping.Use, Datastore.AllocateSpace, Sys.Syslog, VM.Config.Options, Pool.Audit, User.Modify, VM.Config.HWType, VM.Audit, Sys.PowerMgmt, VM.GuestAgent.Audit, Mapping.Audit, VM.GuestAgent.FileRead, Permissions.Modify"
     ```
 
   ~> The list of available privileges has been changed in PVE 9.0, and the above list is only an example (and most likely too excessive for most use cases), please review it and adjust to your needs.
@@ -214,15 +222,17 @@ You can create an API Token for a user via the Proxmox UI, or via the command li
 - Assign the role to the previously created user:
 
     ```sh
-    sudo pveum aclmod / -user terraform@pve -role Terraform
+    pveum aclmod / -user terraform@pve -role Terraform
     ```
 
 - Create an API token for the user:
 
     ```sh
-    sudo pveum user token add terraform@pve provider --privsep=0
+    pveum user token add terraform@pve provider --privsep=0
     ```
 
+    -> Make sure you copy the token value, as it will not be displayed again.
+
 Refer to the upstream docs as needed for additional details concerning [PVE User Management](https://pve.proxmox.com/wiki/User_Management).
 
 Generating the token will output a table containing the token's ID and secret which are meant to be concatenated into a single string for use with either the `api_token` field of the `provider` block (fine for testing but should be avoided) or sourced from the `PROXMOX_VE_API_TOKEN` environment variable.
@@ -322,7 +332,7 @@ Please refer to the [Argument Reference](#argument-reference) section to view th
 ### SSH Agent
 
 The provider does not use OS-specific SSH configuration files, such as `~/.ssh/config`.
-Instead, it uses the SSH protocol directly, and supports the `SSH_AUTH_SOCK` environment variable (or `agent_socket` argument) to connect to the `ssh-agent`.
+Instead, it uses the SSH protocol directly, and supports the `SSH_AUTH_SOCK` environment variable (or `agent_socket` argument) to connect to the SSH agent.
 This allows the provider to use the SSH agent configured by the user, and to support multiple SSH agents running on the same machine.
 You can find more details on the SSH Agent [here](https://www.digitalocean.com/community/tutorials/ssh-essentials-working-with-ssh-servers-clients-and-keys#adding-your-ssh-keys-to-an-ssh-agent-to-avoid-typing-the-passphrase).
 The SSH agent authentication takes precedence over the `private_key` and `password` authentication.
@@ -436,7 +446,7 @@ In the example below, we create a user `terraform` and assign the `sudo` privile
 
   You should be able to connect to the target node and see the output containing `APIVER <number>` on the screen without being prompted for your password.
 
-Alternatively if `pam_ssh_agent_auth` is configured on the target node the SSH Config option `agent_forwarding` may be used to forward the SSH Agent that was used for the connection to the remote server. This can allow `sudo` without a password which validates public ssh key configured for `pam_ssh_agent_auth`.
+Alternatively if `pam_ssh_agent_auth` is configured on the target node the SSH Config option `agent_forwarding` may be used to forward the SSH agent that was used for the connection to the remote server. This can allow `sudo` without a password which validates public SSH key configured for `pam_ssh_agent_auth`.
 
 ### Node IP address used for SSH connection
 

docs/resources/virtual_environment_container.md

@@ -160,9 +160,9 @@ output "ubuntu_container_public_key" {
         - `ipv6` - (Optional) The IPv6 configuration.
             - `address` - (Optional) The IPv6 address in CIDR notation
               (e.g. fd1c::7334/64). Alternatively, set this
-              to `dhcp` for autodiscovery.
+              to `dhcp` for DHCPv6, or `auto` for SLAAC.
             - `gateway` - (Optional) The IPv6 gateway (must be omitted
-                when `dhcp` is used as the address).
+                when `dhcp` or `auto` are used as the address).
     - `user_account` - (Optional) The user account configuration.
         - `keys` - (Optional) The SSH keys for the root account.
         - `password` - (Optional) The password for the root account.
@@ -225,7 +225,8 @@ output "ubuntu_container_public_key" {
         - `opensuse` - openSUSE.
         - `ubuntu` - Ubuntu.
         - `unmanaged` - Unmanaged.
-- `pool_id` - (Optional) The identifier for a pool to assign the container to.
+- `pool_id` - (Optional, **Deprecated**) The identifier for a pool to assign the container to.
+  This field is deprecated and will be removed in a future release. To assign the container to a pool, use the `proxmox_virtual_environment_pool_membership` resource instead. 
 - `protection` - (Optional) Whether to set the protection flag of the container (defaults to `false`). This will prevent the container itself and its disk for remove/update operations.
 - `started` - (Optional) Whether to start the container (defaults to `true`).
 - `startup` - (Optional) Defines startup and shutdown behavior of the container.

docs/resources/virtual_environment_vm.md

@@ -390,9 +390,9 @@ output "ubuntu_vm_public_key" {
         - `ipv6` - (Optional) The IPv6 configuration.
             - `address` - (Optional) The IPv6 address in CIDR notation
                 (e.g. fd1c::7334/64). Alternatively, set this
-                to `dhcp` for autodiscovery.
+                to `dhcp` for DHCPv6, or `auto` for SLAAC.
             - `gateway` - (Optional) The IPv6 gateway (must be omitted
-                when `dhcp` is used as the address).
+                when `dhcp` or `auto` are used as the address).
     - `user_account` - (Optional) The user account configuration (conflicts
         with `user_data_file_id`).
         - `keys` - (Optional) The SSH keys.
@@ -503,7 +503,8 @@ output "ubuntu_vm_public_key" {
         - `win11` - Windows 11
         - `wvista` - Windows Vista.
         - `wxp` - Windows XP.
-- `pool_id` - (Optional) The identifier for a pool to assign the virtual machine to.
+- `pool_id` - (Optional, **Deprecated**) The identifier for a pool to assign the virtual machine to.
+  This field is deprecated and will be removed in a future release. To assign the VM to a pool, use the `proxmox_virtual_environment_pool_membership` resource instead.
 - `protection` - (Optional) Sets the protection flag of the VM. This will disable the remove VM and remove disk operations (defaults to `false`).
 - `reboot` - (Optional) Reboot the VM after initial creation (defaults to `false`).
 - `reboot_after_update` - (Optional) Reboot the VM after update if needed (defaults to `true`).

example/data_source_virtual_environment_sdn.tf

@@ -23,6 +23,13 @@ data "proxmox_virtual_environment_sdn_vnet" "test_vnet_1" {
   id = proxmox_virtual_environment_sdn_vnet.test_vnet_1.id
 }
 
+data "proxmox_virtual_environment_sdn_vnets" "all" {
+  depends_on = [
+    proxmox_virtual_environment_sdn_vnet.test_vnet_1,
+    proxmox_virtual_environment_sdn_vnet.test_vnet_2,
+  ]
+}
+
 data "proxmox_virtual_environment_sdn_subnet" "test_subnet_dhcp" {
   depends_on = [proxmox_virtual_environment_sdn_subnet.test_subnet_dhcp]
   cidr = proxmox_virtual_environment_sdn_subnet.test_subnet_dhcp.cidr
@@ -45,6 +52,10 @@ output "proxmox_virtual_environment_sdn_vnet" {
   value = data.proxmox_virtual_environment_sdn_vnet.test_vnet_1
 }
 
+output "proxmox_virtual_environment_sdn_vnets" {
+  value = data.proxmox_virtual_environment_sdn_vnets.all
+}
+
 output "proxmox_virtual_environment_sdn_subnet" {
   value = data.proxmox_virtual_environment_sdn_subnet.test_subnet_dhcp
 }

examples/data-sources/proxmox_virtual_environment_sdn_vnet/data-source.tf

@@ -0,0 +1,14 @@
+data "proxmox_virtual_environment_sdn_vnet" "example" {
+  id = "vnet1"
+}
+
+output "data_proxmox_virtual_environment_sdn_vnet" {
+  value = {
+    id            = data.proxmox_virtual_environment_sdn_vnet.example.id
+    zone          = data.proxmox_virtual_environment_sdn_vnet.example.zone
+    alias         = data.proxmox_virtual_environment_sdn_vnet.example.alias
+    isolate_ports = data.proxmox_virtual_environment_sdn_vnet.example.isolate_ports
+    tag           = data.proxmox_virtual_environment_sdn_vnet.example.tag
+    vlan_aware    = data.proxmox_virtual_environment_sdn_vnet.example.vlan_aware
+  }
+}

examples/data-sources/proxmox_virtual_environment_sdn_vnets/data-source.tf

@@ -0,0 +1,8 @@
+# List all SDN VNets
+data "proxmox_virtual_environment_sdn_vnets" "all" {}
+
+output "data_proxmox_virtual_environment_sdn_vnets_all" {
+  value = {
+    vnets = data.proxmox_virtual_environment_sdn_vnets.all.vnets
+  }
+}