.all-contributorsrc

@@ -717,6 +717,15 @@
         "bug",
         "ideas"
       ]
+    },
+    {
+      "login": "LEI",
+      "name": "Guillaume",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4112243?v=4",
+      "profile": "https://github.com/LEI",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 8,

.vscode/extensions.json

@@ -1,7 +1,8 @@
 {
     "recommendations": [
         "davidanson.vscode-markdownlint",
-        "joshbolduc.commitlint",
+        "golang.go",
         "hashicorp.terraform",
+        "joshbolduc.commitlint",
     ]
 }

.vscode/launch.json

@@ -1,6 +1,16 @@
 {
     "version": "0.2.0",
     "configurations": [      
+        {
+            "name": "Debug Acceptance Tests",
+            "type": "go",
+            "request": "launch",
+            "mode": "test",
+            "program": "${workspaceFolder}/fwprovider/tests",
+            "envFile": "${workspaceFolder}/testacc.env",
+            "args": ["-test.v", "-test.timeout", "30s"]
+
+        },
         {
             "name": "Debug Provider",
             "type": "go",

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.42.1](https://github.com/bpg/terraform-provider-proxmox/compare/v0.42.0...v0.42.1) (2023-12-29)
+
+
+### Bug Fixes
+
+* accept ipv6 in dns servers initialization ([bf5cbd9](https://github.com/bpg/terraform-provider-proxmox/commit/bf5cbd9dad116a4515bd2eb193c296097b1e4b84))
+* **lxc:** add missing `onboot` param on container clone create ([#838](https://github.com/bpg/terraform-provider-proxmox/issues/838)) ([40102a6](https://github.com/bpg/terraform-provider-proxmox/commit/40102a6a501a5ead3219492f34255a25c4f21371))
+* **vm,lxc:** accept IPv6 in `initialization.dns.servers` attribute ([#842](https://github.com/bpg/terraform-provider-proxmox/issues/842)) ([bf5cbd9](https://github.com/bpg/terraform-provider-proxmox/commit/bf5cbd9dad116a4515bd2eb193c296097b1e4b84))
+* **vm,lxc:** unexpected state drift when using `initialization.dns.servers` ([#844](https://github.com/bpg/terraform-provider-proxmox/issues/844)) ([ac923cd](https://github.com/bpg/terraform-provider-proxmox/commit/ac923cd1b42c0c64d9829beb1ab552680b21d98b))
+* **vm:** Fixed missing default for disk discard ([#840](https://github.com/bpg/terraform-provider-proxmox/issues/840)) ([5281ac2](https://github.com/bpg/terraform-provider-proxmox/commit/5281ac24921795ed933047e5d9ca953add15bdd0))
+
+
+### Miscellaneous
+
+* **deps:** bump github.com/go-git/go-git/v5 from 5.7.0 to 5.11.0 in /tools ([#839](https://github.com/bpg/terraform-provider-proxmox/issues/839)) ([f860c4b](https://github.com/bpg/terraform-provider-proxmox/commit/f860c4bab54344beb4fd54366adcf940ea1463fe))
+* **tests:** Update acceptance tests to PVE 8.1, add docs ([#834](https://github.com/bpg/terraform-provider-proxmox/issues/834)) ([d8f82d4](https://github.com/bpg/terraform-provider-proxmox/commit/d8f82d47b3a74e4b64a26757522c067a635e4fa3))
+
 ## [0.42.0](https://github.com/bpg/terraform-provider-proxmox/compare/v0.41.0...v0.42.0) (2023-12-23)
 
 

CONTRIBUTING.md

@@ -47,6 +47,27 @@ existing ones in order to target your changes.
 
 You can run all the test cases by invoking `make test`.
 
+### Acceptance tests
+
+The project has a limited set of acceptance tests which are run against a real Proxmox
+instance. These tests are developed alongside the framework-based resource and datasource implementations, and are located in the `fwprovider/tests` directory.
+
+To run the acceptance tests, you need to have a Proxmox instance available. See more details in the [Setup Proxmox for Tests](./howtos/setup-proxmox-for-tests/README.md) section.
+Create a `testacc.env` file in the project's root directory with the following contents:
+
+```env
+TF_ACC=1
+PROXMOX_VE_API_TOKEN="root@pam!<token name>=<token value>"
+PROXMOX_VE_ENDPOINT="https://<pve instance>:8006/"
+PROXMOX_VE_SSH_AGENT="true"
+PROXMOX_VE_SSH_USERNAME="root"
+```
+
+Then use `make testacc` to run the acceptance tests.
+
+> [!NOTE]
+> The acceptance tests support is still in development. Only handful of resources and data sources are covered by the tests. Some tests may require extra configuration on the Proxmox instance, and fail if the configuration is not present.
+
 ## Manual Testing
 
 You can manually test the provider by running it locally. This is useful for
@@ -72,7 +93,6 @@ testing changes to the provider before submitting a PR.
 
   ```bash
   go install .
-
   ```
 
 - Run `terraform init` in a directory containing a Terraform configuration
@@ -106,11 +126,12 @@ testing changes to the provider before submitting a PR.
 
 ## Coding conventions
 
-We expect that all code contributions have been formatted using `gofmt`. You can
-run `make fmt` to format your code.
+We expect that all code contributions have been formatted using `gofmt`.
+
+You can run `make fmt` to format your code.
+
+We also expect that all code contributions have been linted using `golangci-lint`.
 
-We also expect that all code contributions have been linted
-using `golangci-lint`.
 You can run `make lint` to lint your code.
 
 ## Commit message conventions

Makefile

@@ -2,7 +2,7 @@ GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 NAME=terraform-provider-proxmox
 TARGETS=darwin linux windows
 TERRAFORM_PLUGIN_EXTENSION=
-VERSION=0.42.0# x-release-please-version
+VERSION=0.42.1# x-release-please-version
 
 ifeq ($(OS),Windows_NT)
 	TERRAFORM_PLATFORM=windows_amd64
@@ -87,11 +87,8 @@ test:
 
 .PHONY: testacc
 testacc:
-    # env vars required for acceptance tests
-    #   - PROXMOX_VE_ENDPOINT
-    #   - PROXMOX_VE_USERNAME
-    #   - PROXMOX_VE_PASSWORD
-	TF_ACC=1 go test ./...
+	@# explicitly add TF_ACC=1 to trigger the acceptance tests, `testacc.env` might be missing or incomplete  
+	@TF_ACC=1 env $$(cat testacc.env | xargs) go test ./...
 
 .PHONY: lint
 lint:

README.md

@@ -230,6 +230,7 @@ using SFTP. This requires the use of a PAM account (standard Linux account).
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/bitchecker"><img src="https://avatars.githubusercontent.com/u/11056930?v=4?s=50" width="50px;" alt="bitchecker"/><br /><sub><b>bitchecker</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=bitchecker" title="Code">💻</a></td>
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/olemathias"><img src="https://avatars.githubusercontent.com/u/891048?v=4?s=50" width="50px;" alt="Ole Mathias Aa. Heggem"/><br /><sub><b>Ole Mathias Aa. Heggem</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/issues?q=author%3Aolemathias" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/scibi"><img src="https://avatars.githubusercontent.com/u/703860?v=4?s=50" width="50px;" alt="scibi"/><br /><sub><b>scibi</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/issues?q=author%3Ascibi" title="Bug reports">🐛</a> <a href="#ideas-scibi" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="12.5%"><a href="https://github.com/LEI"><img src="https://avatars.githubusercontent.com/u/4112243?v=4?s=50" width="50px;" alt="Guillaume"/><br /><sub><b>Guillaume</b></sub></a><br /><a href="https://github.com/bpg/terraform-provider-proxmox/commits?author=LEI" title="Code">💻</a></td>
     </tr>
   </tbody>
   <tfoot>

example/resource_virtual_environment_container.tf

@@ -1,6 +1,8 @@
 resource "proxmox_virtual_environment_container" "example_template" {
   description = "Managed by Terraform"
 
+  start_on_boot = "true"
+
   disk {
     datastore_id = element(data.proxmox_virtual_environment_datastores.example.datastore_ids, index(data.proxmox_virtual_environment_datastores.example.datastore_ids, "local-lvm"))
     size         = 10

fwprovider/tests/datasource_version_test.go

@@ -29,13 +29,13 @@ func TestAccDatasourceVersion(t *testing.T) {
 			{
 				Config: `data "proxmox_virtual_environment_version" "test" {}`,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr(datasourceName, "release", "8.0"),
+					resource.TestCheckResourceAttr(datasourceName, "release", "8.1"),
 					resource.TestCheckResourceAttrSet(datasourceName, "repository_id"),
 					resource.TestCheckResourceAttrWith(datasourceName, "version", func(value string) error {
-						if strings.HasPrefix(value, "8.0") {
+						if strings.HasPrefix(value, "8.1") {
 							return nil
 						}
-						return fmt.Errorf("version %s does not start with 8.0", value)
+						return fmt.Errorf("version %s does not start with 8.1", value)
 					}),
 					resource.TestCheckResourceAttrSet(datasourceName, "id"),
 				),

fwprovider/tests/resource_container_test.go

@@ -74,6 +74,7 @@ resource "proxmox_virtual_environment_container" "test_container" {
   }
 
   operating_system {
+	# TODO: this file needs to be upload to PVE first
     template_file_id = "local:vztmpl/ubuntu-23.04-standard_23.04-1_amd64.tar.zst"
     type             = "ubuntu"
   }

fwprovider/tests/resource_file_test.go

@@ -124,7 +124,7 @@ func uploadSnippetFile(t *testing.T, file *os.File) {
 	u, err := url.ParseRequestURI(endpoint)
 	require.NoError(t, err)
 
-	sshUsername := strings.Split(utils.GetAnyStringEnv("PROXMOX_VE_USERNAME"), "@")[0]
+	sshUsername := utils.GetAnyStringEnv("PROXMOX_VE_SSH_USERNAME")
 	sshAgentSocket := utils.GetAnyStringEnv("SSH_AUTH_SOCK", "PROXMOX_VE_SSH_AUTH_SOCK", "PM_VE_SSH_AUTH_SOCK")
 
 	sshClient, err := ssh.NewClient(

fwprovider/tests/resource_linux_vlan_test.go

@@ -25,7 +25,7 @@ func TestAccResourceLinuxVLAN(t *testing.T) {
 
 	accProviders := testAccMuxProviders(context.Background(), t)
 
-	iface := "enp6s18"
+	iface := "ens18"
 	vlan1 := gofakeit.Number(10, 4094)
 	customName := fmt.Sprintf("iface_%s", gofakeit.Word())
 	vlan2 := gofakeit.Number(10, 4094)

howtos/README.md

@@ -4,9 +4,9 @@ A collection of HOW-TOs for common tasks.
 
 ## Virtual Machines
 
-- [Create a VM from a Cloud Image](howtos/cloud-image/README.md)
-- [Configure a VM with Cloud-Init](howtos/cloud-init/README.md)
+- [Create a VM from a Cloud Image](./cloud-image/README.md)
+- [Configure a VM with Cloud-Init](./cloud-init/README.md)
 
 ## Contributors
 
-- [Setup VM with proxmox to run make example](howtos/setup-proxmox-for-make-example/README.md)
+- [Setup VM with proxmox to run examples and acceptance tests](./setup-proxmox-for-tests/README.md)

howtos/setup-proxmox-for-make-example/README.md → howtos/setup-proxmox-for-tests/README.md

@@ -1,4 +1,4 @@
-# Setup VM with proxmox to run make example
+# Setup VM with proxmox to run examples and acceptance tests
 
 ## Who
 
@@ -16,11 +16,11 @@ Be sure to install `go` and `terraform` on your system first.
 
 ## Linux (Debian/Ubuntu) with virt-manager
 
-Goal is to have a proxmox node in VM using https://virt-manager.org/ for a job. This text assumes some linux knowledge. Tested on Debian 12 bookworm and proxmox VE 8.1. For other distros, with any luck steps should be similar.
+Goal is to have a proxmox node in VM using <https://virt-manager.org/> for a job. This text assumes some linux knowledge. Tested on Debian 12 bookworm and proxmox VE 8.1. For other distros, with any luck steps should be similar.
 
 1. `sudo apt-get install virt-manager`.
 
-2. Download some proxmox image from http://download.proxmox.com/iso/, currently latest is `proxmox-ve_8.1-1.iso`.
+2. Download some proxmox image from <http://download.proxmox.com/iso/>, currently latest is `proxmox-ve_8.1-1.iso`.
 
 3. Run `virt-manager` and "create a new virtual machine", use a file you just downloaded, choose debian as a operating system, leave default network settings.
 
@@ -32,7 +32,7 @@ Goal is to have a proxmox node in VM using https://virt-manager.org/ for a job.
 
    It may look like this:
 
-   ```
+   ```txt
    root@proxmox:~# ip a
    1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000
        link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
@@ -52,7 +52,7 @@ Goal is to have a proxmox node in VM using https://virt-manager.org/ for a job.
 
 7. (Optional) On **your** computer, there should be new interface created mapped to that one you see on proxmox. Again `ip a`:
 
-   ```
+   ```txt
    ...
 
    8: virbr0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
@@ -70,11 +70,11 @@ Goal is to have a proxmox node in VM using https://virt-manager.org/ for a job.
    ssh root@192.168.122.43
    ```
 
-   You can also use browser and visit console at https://192.168.122.43:8006.
+   You can also use browser and visit console at <https://192.168.122.43:8006>.
 
 9. Create `terraform.tfvars` file (it will be git ignored file) in `example` folder with credentials for you new proxmox node.
 
-   ```
+   ```txt
    # example/terraform.tfvars
    virtual_environment_username = "root@pam"
    virtual_environment_endpoint = "https://192.168.122.43:8006/"
@@ -84,4 +84,4 @@ Goal is to have a proxmox node in VM using https://virt-manager.org/ for a job.
 
 10. Now you can run `make example`.
 
-11. If you see error with proxmox_virtual_environment_file: the datastore "local" does not support content type "snippets"; supported content types are: [backup iso vztmpl], you need to enable them, see https://registry.terraform.io/providers/bpg/proxmox/latest/docs/resources/virtual_environment_file#snippets.
+11. If you see error with proxmox_virtual_environment_file: the datastore "local" does not support content type "snippets"; supported content types are: [backup iso vztmpl], you need to enable them, see <https://registry.terraform.io/providers/bpg/proxmox/latest/docs/resources/virtual_environment_file#snippets>.

proxmox/ssh/client.go

@@ -294,9 +294,9 @@ func (c *client) openNodeShell(ctx context.Context, node ProxmoxNode) (*ssh.Clie
 	sshClient, err = ssh.Dial("tcp", sshHost, sshConfig)
 	if err != nil {
 		if c.password == "" {
-			return nil, fmt.Errorf("unable to authenticate over SSH to %s. Please verify that ssh-agent is "+
+			return nil, fmt.Errorf("unable to authenticate user %q over SSH to %q. Please verify that ssh-agent is "+
 				"correctly loaded with an authorized key via 'ssh-add -L' (NOTE: configurations in ~/.ssh/config are "+
-				"not considered by golang's ssh implementation). The exact error from ssh.Dial: %w", sshHost, err)
+				"not considered by golang's ssh implementation). The exact error from ssh.Dial: %w", c.username, sshHost, err)
 		}
 
 		return nil, fmt.Errorf("failed to dial %s: %w", sshHost, err)

proxmoxtf/resource/container.go

@@ -398,7 +398,7 @@ func Container() *schema.Resource {
 										Type:        schema.TypeList,
 										Description: "The list of DNS servers",
 										Optional:    true,
-										Elem:        &schema.Schema{Type: schema.TypeString, ValidateFunc: validation.IsIPv4Address},
+										Elem:        &schema.Schema{Type: schema.TypeString, ValidateFunc: validation.IsIPAddress},
 										MinItems:    0,
 									},
 								},
@@ -918,6 +918,9 @@ func containerCreateClone(ctx context.Context, d *schema.ResourceData, m interfa
 	// Now that the virtual machine has been cloned, we need to perform some modifications.
 	updateBody := &containers.UpdateRequestBody{}
 
+	startOnBoot := types.CustomBool(d.Get(mkResourceVirtualEnvironmentContainerStartOnBoot).(bool))
+	updateBody.StartOnBoot = &startOnBoot
+
 	console := d.Get(mkResourceVirtualEnvironmentContainerConsole).([]interface{})
 
 	if len(console) > 0 {
@@ -2008,11 +2011,28 @@ func containerRead(ctx context.Context, d *schema.ResourceData, m interface{}) d
 			initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSDomain] = ""
 		}
 
-		if containerConfig.DNSServer != nil {
-			initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServer] = *containerConfig.DNSServer
+		// check what we have in the plan
+		currentInitializationDNSBlock := map[string]interface{}{}
+		currentInitialization := d.Get(mkResourceVirtualEnvironmentContainerInitialization).([]interface{})
+
+		if len(currentInitialization) > 0 {
+			currentInitializationBlock := currentInitialization[0].(map[string]interface{})
+			//nolint:lll
+			currentInitializationDNS := currentInitializationBlock[mkResourceVirtualEnvironmentContainerInitializationDNS].([]interface{})
+			if len(currentInitializationDNS) > 0 {
+				currentInitializationDNSBlock = currentInitializationDNS[0].(map[string]interface{})
+			}
+		}
 
-			dnsServer := strings.Split(*containerConfig.DNSServer, " ")
-			initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServers] = dnsServer
+		//nolint:lll
+		currentInitializationDNSServer, ok := currentInitializationDNSBlock[mkResourceVirtualEnvironmentContainerInitializationDNSServer]
+		if containerConfig.DNSServer != nil {
+			if ok && currentInitializationDNSServer != "" {
+				initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServer] = *containerConfig.DNSServer
+			} else {
+				dnsServer := strings.Split(*containerConfig.DNSServer, " ")
+				initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServers] = dnsServer
+			}
 		} else {
 			initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServer] = ""
 			initializationDNS[mkResourceVirtualEnvironmentContainerInitializationDNSServers] = []string{}

proxmoxtf/resource/vm.go

@@ -69,7 +69,7 @@ const (
 	dvResourceVirtualEnvironmentVMDiskSize                          = 8
 	dvResourceVirtualEnvironmentVMDiskIOThread                      = false
 	dvResourceVirtualEnvironmentVMDiskSSD                           = false
-	dvResourceVirtualEnvironmentVMDiskDiscard                       = ""
+	dvResourceVirtualEnvironmentVMDiskDiscard                       = "ignore"
 	dvResourceVirtualEnvironmentVMDiskCache                         = "none"
 	dvResourceVirtualEnvironmentVMDiskSpeedRead                     = 0
 	dvResourceVirtualEnvironmentVMDiskSpeedReadBurstable            = 0
@@ -897,7 +897,7 @@ func VM() *schema.Resource {
 										Type:        schema.TypeList,
 										Description: "The list of DNS servers",
 										Optional:    true,
-										Elem:        &schema.Schema{Type: schema.TypeString, ValidateFunc: validation.IsIPv4Address},
+										Elem:        &schema.Schema{Type: schema.TypeString, ValidateFunc: validation.IsIPAddress},
 										MinItems:    0,
 									},
 								},
@@ -4481,11 +4481,29 @@ func vmReadCustom(
 			initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSDomain] = ""
 		}
 
-		if vmConfig.CloudInitDNSServer != nil {
-			initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServer] = *vmConfig.CloudInitDNSServer
+		// check what we have in the plan
+		currentInitializationDNSBlock := map[string]interface{}{}
+		currentInitialization := d.Get(mkResourceVirtualEnvironmentVMInitialization).([]interface{})
+
+		if len(currentInitialization) > 0 {
+			currentInitializationBlock := currentInitialization[0].(map[string]interface{})
+			//nolint:lll
+			currentInitializationDNS := currentInitializationBlock[mkResourceVirtualEnvironmentVMInitializationDNS].([]interface{})
+			if len(currentInitializationDNS) > 0 {
+				currentInitializationDNSBlock = currentInitializationDNS[0].(map[string]interface{})
+			}
+		}
 
-			dnsServer := strings.Split(*vmConfig.CloudInitDNSServer, " ")
-			initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServers] = dnsServer
+		//nolint:lll
+		currentInitializationDNSServer, ok := currentInitializationDNSBlock[mkResourceVirtualEnvironmentVMInitializationDNSServer]
+		if vmConfig.CloudInitDNSServer != nil {
+			if ok && currentInitializationDNSServer != "" {
+				// the template is using deprecated attribute mkResourceVirtualEnvironmentVMInitializationDNSServer
+				initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServer] = *vmConfig.CloudInitDNSServer
+			} else {
+				dnsServer := strings.Split(*vmConfig.CloudInitDNSServer, " ")
+				initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServers] = dnsServer
+			}
 		} else {
 			initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServer] = ""
 			initializationDNS[mkResourceVirtualEnvironmentVMInitializationDNSServers] = []string{}