diff --git a/main.go b/main.go index 8320a40c..31233249 100644 --- a/main.go +++ b/main.go @@ -6,6 +6,7 @@ package main import ( "flag" + "github.com/bpg/terraform-provider-proxmox/proxmoxtf" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" diff --git a/proxmox/virtual_environment_client.go b/proxmox/virtual_environment_client.go index 1719cd5c..c9fb5591 100644 --- a/proxmox/virtual_environment_client.go +++ b/proxmox/virtual_environment_client.go @@ -11,12 +11,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/hashicorp/terraform-plugin-log/tflog" "io" "net/http" "net/url" "strings" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/google/go-querystring/query" ) diff --git a/proxmox/virtual_environment_nodes.go b/proxmox/virtual_environment_nodes.go index df6b6ca5..af67f722 100644 --- a/proxmox/virtual_environment_nodes.go +++ b/proxmox/virtual_environment_nodes.go @@ -8,12 +8,13 @@ import ( "context" "errors" "fmt" - "github.com/hashicorp/terraform-plugin-log/tflog" "net/url" "sort" "strings" "time" + "github.com/hashicorp/terraform-plugin-log/tflog" + "golang.org/x/crypto/ssh" ) diff --git a/proxmox/virtual_environment_vm_types_test.go b/proxmox/virtual_environment_vm_types_test.go index 53ef3955..fb3ffbca 100644 --- a/proxmox/virtual_environment_vm_types_test.go +++ b/proxmox/virtual_environment_vm_types_test.go @@ -1,8 +1,9 @@ package proxmox import ( - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" ) func TestCustomStorageDevice_UnmarshalJSON(t *testing.T) { diff --git a/proxmoxtf/data_source_virtual_environment_cluster_alias.go b/proxmoxtf/data_source_virtual_environment_cluster_alias.go index 473ac534..77eee763 100644 --- a/proxmoxtf/data_source_virtual_environment_cluster_alias.go +++ b/proxmoxtf/data_source_virtual_environment_cluster_alias.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_cluster_aliases.go b/proxmoxtf/data_source_virtual_environment_cluster_aliases.go index e7953f0f..d5055b0d 100644 --- a/proxmoxtf/data_source_virtual_environment_cluster_aliases.go +++ b/proxmoxtf/data_source_virtual_environment_cluster_aliases.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_datastores.go b/proxmoxtf/data_source_virtual_environment_datastores.go index 6fa9895a..daf5d042 100644 --- a/proxmoxtf/data_source_virtual_environment_datastores.go +++ b/proxmoxtf/data_source_virtual_environment_datastores.go @@ -7,9 +7,10 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "sort" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_datastores_test.go b/proxmoxtf/data_source_virtual_environment_datastores_test.go index ad6743df..345ab7b2 100644 --- a/proxmoxtf/data_source_virtual_environment_datastores_test.go +++ b/proxmoxtf/data_source_virtual_environment_datastores_test.go @@ -5,8 +5,9 @@ package proxmoxtf import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // TestDataSourceVirtualEnvironmentDatastoresInstantiation tests whether the DataSourceVirtualEnvironmentDatastores instance can be instantiated. diff --git a/proxmoxtf/data_source_virtual_environment_dns.go b/proxmoxtf/data_source_virtual_environment_dns.go index aec810a5..d54ad6e6 100644 --- a/proxmoxtf/data_source_virtual_environment_dns.go +++ b/proxmoxtf/data_source_virtual_environment_dns.go @@ -7,6 +7,7 @@ package proxmoxtf import ( "context" "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" diff --git a/proxmoxtf/data_source_virtual_environment_dns_test.go b/proxmoxtf/data_source_virtual_environment_dns_test.go index 245f034e..53ff6ff0 100644 --- a/proxmoxtf/data_source_virtual_environment_dns_test.go +++ b/proxmoxtf/data_source_virtual_environment_dns_test.go @@ -5,8 +5,9 @@ package proxmoxtf import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // TestDataSourceVirtualEnvironmentDNSInstantiation tests whether the DataSourceVirtualEnvironmentDNS instance can be instantiated. diff --git a/proxmoxtf/data_source_virtual_environment_group.go b/proxmoxtf/data_source_virtual_environment_group.go index 902b384f..6657be6c 100644 --- a/proxmoxtf/data_source_virtual_environment_group.go +++ b/proxmoxtf/data_source_virtual_environment_group.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_groups.go b/proxmoxtf/data_source_virtual_environment_groups.go index 01381fe3..7ee56546 100644 --- a/proxmoxtf/data_source_virtual_environment_groups.go +++ b/proxmoxtf/data_source_virtual_environment_groups.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_groups_test.go b/proxmoxtf/data_source_virtual_environment_groups_test.go index 8255dea1..044d9394 100644 --- a/proxmoxtf/data_source_virtual_environment_groups_test.go +++ b/proxmoxtf/data_source_virtual_environment_groups_test.go @@ -5,8 +5,9 @@ package proxmoxtf import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // TestDataSourceVirtualEnvironmentGroupsInstantiation tests whether the DataSourceVirtualEnvironmentGroups instance can be instantiated. diff --git a/proxmoxtf/data_source_virtual_environment_hosts.go b/proxmoxtf/data_source_virtual_environment_hosts.go index 2c315ccd..f90266d9 100644 --- a/proxmoxtf/data_source_virtual_environment_hosts.go +++ b/proxmoxtf/data_source_virtual_environment_hosts.go @@ -7,9 +7,10 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_hosts_test.go b/proxmoxtf/data_source_virtual_environment_hosts_test.go index acfa135d..1779f49c 100644 --- a/proxmoxtf/data_source_virtual_environment_hosts_test.go +++ b/proxmoxtf/data_source_virtual_environment_hosts_test.go @@ -5,8 +5,9 @@ package proxmoxtf import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // TestDataSourceVirtualEnvironmentHostsInstantiation tests whether the DataSourceVirtualEnvironmentHosts instance can be instantiated. diff --git a/proxmoxtf/data_source_virtual_environment_nodes.go b/proxmoxtf/data_source_virtual_environment_nodes.go index a6224ca1..00762a45 100644 --- a/proxmoxtf/data_source_virtual_environment_nodes.go +++ b/proxmoxtf/data_source_virtual_environment_nodes.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "math" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_pool.go b/proxmoxtf/data_source_virtual_environment_pool.go index ee7f9ffd..54f215ce 100644 --- a/proxmoxtf/data_source_virtual_environment_pool.go +++ b/proxmoxtf/data_source_virtual_environment_pool.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_pools.go b/proxmoxtf/data_source_virtual_environment_pools.go index 365eca7f..fff71a27 100644 --- a/proxmoxtf/data_source_virtual_environment_pools.go +++ b/proxmoxtf/data_source_virtual_environment_pools.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_role.go b/proxmoxtf/data_source_virtual_environment_role.go index 87780cb8..b8e5299d 100644 --- a/proxmoxtf/data_source_virtual_environment_role.go +++ b/proxmoxtf/data_source_virtual_environment_role.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_roles.go b/proxmoxtf/data_source_virtual_environment_roles.go index d9e99e5a..ccd866bc 100644 --- a/proxmoxtf/data_source_virtual_environment_roles.go +++ b/proxmoxtf/data_source_virtual_environment_roles.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_roles_test.go b/proxmoxtf/data_source_virtual_environment_roles_test.go index 63fb19d7..8de21dbf 100644 --- a/proxmoxtf/data_source_virtual_environment_roles_test.go +++ b/proxmoxtf/data_source_virtual_environment_roles_test.go @@ -5,8 +5,9 @@ package proxmoxtf import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // TestDataSourceVirtualEnvironmentRolesInstantiation tests whether the DataSourceVirtualEnvironmentRoles instance can be instantiated. diff --git a/proxmoxtf/data_source_virtual_environment_time.go b/proxmoxtf/data_source_virtual_environment_time.go index 2d3ea80f..d90283dc 100644 --- a/proxmoxtf/data_source_virtual_environment_time.go +++ b/proxmoxtf/data_source_virtual_environment_time.go @@ -7,9 +7,10 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_user.go b/proxmoxtf/data_source_virtual_environment_user.go index 36d4eb86..ada27b92 100644 --- a/proxmoxtf/data_source_virtual_environment_user.go +++ b/proxmoxtf/data_source_virtual_environment_user.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_users.go b/proxmoxtf/data_source_virtual_environment_users.go index e5282e23..00dd8b24 100644 --- a/proxmoxtf/data_source_virtual_environment_users.go +++ b/proxmoxtf/data_source_virtual_environment_users.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/data_source_virtual_environment_version.go b/proxmoxtf/data_source_virtual_environment_version.go index 422b48b1..d15f8536 100644 --- a/proxmoxtf/data_source_virtual_environment_version.go +++ b/proxmoxtf/data_source_virtual_environment_version.go @@ -6,6 +6,7 @@ package proxmoxtf import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/provider.go b/proxmoxtf/provider.go index a0c8c8d8..5fba4ec8 100644 --- a/proxmoxtf/provider.go +++ b/proxmoxtf/provider.go @@ -7,10 +7,11 @@ package proxmoxtf import ( "context" "errors" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "net/url" "os" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_certificate.go b/proxmoxtf/resource_virtual_environment_certificate.go index d3b50df2..ed675bb0 100644 --- a/proxmoxtf/resource_virtual_environment_certificate.go +++ b/proxmoxtf/resource_virtual_environment_certificate.go @@ -7,10 +7,11 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_cluster_alias.go b/proxmoxtf/resource_virtual_environment_cluster_alias.go index 69a569de..34c47967 100644 --- a/proxmoxtf/resource_virtual_environment_cluster_alias.go +++ b/proxmoxtf/resource_virtual_environment_cluster_alias.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_cluster_ipset.go b/proxmoxtf/resource_virtual_environment_cluster_ipset.go index 4ae743ee..2410aaba 100644 --- a/proxmoxtf/resource_virtual_environment_cluster_ipset.go +++ b/proxmoxtf/resource_virtual_environment_cluster_ipset.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_dns.go b/proxmoxtf/resource_virtual_environment_dns.go index 703758bc..db07a3ae 100644 --- a/proxmoxtf/resource_virtual_environment_dns.go +++ b/proxmoxtf/resource_virtual_environment_dns.go @@ -7,6 +7,7 @@ package proxmoxtf import ( "context" "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/bpg/terraform-provider-proxmox/proxmox" diff --git a/proxmoxtf/resource_virtual_environment_file.go b/proxmoxtf/resource_virtual_environment_file.go index debaa729..70341032 100644 --- a/proxmoxtf/resource_virtual_environment_file.go +++ b/proxmoxtf/resource_virtual_environment_file.go @@ -10,9 +10,6 @@ import ( "crypto/sha256" "crypto/tls" "fmt" - "github.com/hashicorp/go-cty/cty" - "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "io" "net/http" "net/url" @@ -21,6 +18,10 @@ import ( "strings" "time" + "github.com/hashicorp/go-cty/cty" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_group.go b/proxmoxtf/resource_virtual_environment_group.go index 8e52acd0..fce336a2 100644 --- a/proxmoxtf/resource_virtual_environment_group.go +++ b/proxmoxtf/resource_virtual_environment_group.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_hosts.go b/proxmoxtf/resource_virtual_environment_hosts.go index b0b34b87..9df81091 100644 --- a/proxmoxtf/resource_virtual_environment_hosts.go +++ b/proxmoxtf/resource_virtual_environment_hosts.go @@ -7,9 +7,10 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_pool.go b/proxmoxtf/resource_virtual_environment_pool.go index d5aa17a6..50c36be5 100644 --- a/proxmoxtf/resource_virtual_environment_pool.go +++ b/proxmoxtf/resource_virtual_environment_pool.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_role.go b/proxmoxtf/resource_virtual_environment_role.go index 62c7750c..106e4c31 100644 --- a/proxmoxtf/resource_virtual_environment_role.go +++ b/proxmoxtf/resource_virtual_environment_role.go @@ -6,9 +6,10 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_time.go b/proxmoxtf/resource_virtual_environment_time.go index 0a6f0fd4..b1058ed2 100644 --- a/proxmoxtf/resource_virtual_environment_time.go +++ b/proxmoxtf/resource_virtual_environment_time.go @@ -7,9 +7,10 @@ package proxmoxtf import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/proxmoxtf/resource_virtual_environment_user.go b/proxmoxtf/resource_virtual_environment_user.go index 74928f6c..1bc61631 100644 --- a/proxmoxtf/resource_virtual_environment_user.go +++ b/proxmoxtf/resource_virtual_environment_user.go @@ -6,10 +6,11 @@ package proxmoxtf import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "strings" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/bpg/terraform-provider-proxmox/proxmox" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" diff --git a/proxmoxtf/resource_virtual_environment_vm.go b/proxmoxtf/resource_virtual_environment_vm.go index 2be65f2e..f952209f 100644 --- a/proxmoxtf/resource_virtual_environment_vm.go +++ b/proxmoxtf/resource_virtual_environment_vm.go @@ -3737,6 +3737,11 @@ func resourceVirtualEnvironmentVMUpdate(ctx context.Context, d *schema.ResourceD updateBody.Description = &description } + if d.HasChange(mkResourceVirtualEnvironmentVMOnBoot) { + startOnBoot := proxmox.CustomBool(d.Get(mkResourceVirtualEnvironmentVMOnBoot).(bool)) + updateBody.StartOnBoot = &startOnBoot + } + if d.HasChange(mkResourceVirtualEnvironmentVMTags) { tagString := resourceVirtualEnvironmentVMGetTagsString(d) updateBody.Tags = &tagString