From 97ca22abbba4bf50895b56324ce3c3e693b46e2f Mon Sep 17 00:00:00 2001 From: Remko Molier Date: Thu, 4 May 2023 02:36:10 +0200 Subject: [PATCH] fix(vm): Fix IPv6 handling (#319) * fix: Fix IPv6 handling in resource "virtual_environment_vm" * also use "*IPv6Address" keys --------- Co-authored-by: Remko Molier Co-authored-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com> --- example/resource_virtual_environment_vm.tf | 3 +++ proxmoxtf/resource/vm.go | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/example/resource_virtual_environment_vm.tf b/example/resource_virtual_environment_vm.tf index abc9e009..5a92ebf5 100644 --- a/example/resource_virtual_environment_vm.tf +++ b/example/resource_virtual_environment_vm.tf @@ -42,6 +42,9 @@ resource "proxmox_virtual_environment_vm" "example_template" { ipv4 { address = "dhcp" } + # ipv6 { + # address = "dhcp" + #} } user_data_file_id = proxmox_virtual_environment_file.user_config.id diff --git a/proxmoxtf/resource/vm.go b/proxmoxtf/resource/vm.go index 1ce881bb..dff6c776 100644 --- a/proxmoxtf/resource/vm.go +++ b/proxmoxtf/resource/vm.go @@ -3295,16 +3295,16 @@ func vmReadCustom( if ipConfig.GatewayIPv6 != nil || ipConfig.IPv6 != nil { ipv6 := map[string]interface{}{} - if ipConfig.IPv4 != nil { - ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Address] = *ipConfig.IPv6 + if ipConfig.IPv6 != nil { + ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Address] = *ipConfig.IPv6 } else { - ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Address] = "" + ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Address] = "" } - if ipConfig.GatewayIPv4 != nil { - ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Gateway] = *ipConfig.GatewayIPv6 + if ipConfig.GatewayIPv6 != nil { + ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Gateway] = *ipConfig.GatewayIPv6 } else { - ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv4Gateway] = "" + ipv6[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6Gateway] = "" } ipConfigItem[mkResourceVirtualEnvironmentVMInitializationIPConfigIPv6] = []interface{}{