mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-02 19:43:00 +00:00
Code

More robust PVE version handling.

Browse Source 
Signed-off-by: Marco Attia <54147992+Vaneixus@users.noreply.github.com>
This commit is contained in:
Marco Attia 2025-06-10 13:50:40 +00:00
parent d88f0efd75
commit 15d9a1286d
No known key found for this signature in database
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
proxmoxtf/resource/file.go
View File

@ -29,6 +29,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/bpg/terraform-provider-proxmox/proxmox"
"github.com/bpg/terraform-provider-proxmox/proxmox/api" "github.com/bpg/terraform-provider-proxmox/proxmox/api"
"github.com/bpg/terraform-provider-proxmox/proxmoxtf" "github.com/bpg/terraform-provider-proxmox/proxmoxtf"
"github.com/bpg/terraform-provider-proxmox/proxmoxtf/resource/validators" "github.com/bpg/terraform-provider-proxmox/proxmoxtf/resource/validators"
@ -618,30 +619,32 @@ func fileCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag
return diags return diags
} }
func fileGetContentType(ctx context.Context, d *schema.ResourceData, c proxmoxtf.ProviderConfiguration) (*string, diag.Diagnostics) { func fileGetContentType(ctx context.Context, d *schema.ResourceData, c proxmox.Client) (*string, diag.Diagnostics) {
contentType := d.Get(mkResourceVirtualEnvironmentFileContentType).(string) contentType := d.Get(mkResourceVirtualEnvironmentFileContentType).(string)
sourceFile := d.Get(mkResourceVirtualEnvironmentFileSourceFile).([]interface{}) sourceFile := d.Get(mkResourceVirtualEnvironmentFileSourceFile).([]interface{})
sourceRaw := d.Get(mkResourceVirtualEnvironmentFileSourceRaw).([]interface{}) sourceRaw := d.Get(mkResourceVirtualEnvironmentFileSourceRaw).([]interface{})
release := 0.0 releaseMajor := 0
pc, err := c.GetClient() releaseMinor := 0
version, err := c.Version().Version(ctx)
if err != nil { if err != nil {
tflog.Warn(ctx, "failed to determine Proxmox Client API version", map[string]interface{}{ tflog.Warn(ctx, "failed to determine Proxmox VE version", map[string]interface{}{
"error": err, "error": err,
}) })
} else { } else {
version, err := pc.Version().Version(context.Background()) release := strings.Split(version.Release, ".")
releaseMajor, err = strconv.Atoi(release[0])
if err != nil { if err != nil {
tflog.Warn(ctx, "failed to determine Proxmox VE version", map[string]interface{}{ tflog.Warn(ctx, "failed to parse Proxmox VE version Major", map[string]interface{}{
"error": err,
})
}
releaseMinor, err = strconv.Atoi(release[1])
if err != nil {
tflog.Warn(ctx, "failed to parse Proxmox VE version Minor", map[string]interface{}{
"error": err, "error": err,
}) })
} else {
release, err = strconv.ParseFloat(version.Release, 32)
if err != nil {
tflog.Warn(ctx, "failed to parse Proxmox VE version", map[string]interface{}{
"error": err,
})
}
} }
} }
@ -665,7 +668,8 @@ func fileGetContentType(ctx context.Context, d *schema.ResourceData, c proxmoxtf
if strings.HasSuffix(sourceFilePath, ".tar.gz") || if strings.HasSuffix(sourceFilePath, ".tar.gz") ||
strings.HasSuffix(sourceFilePath, ".tar.xz") { strings.HasSuffix(sourceFilePath, ".tar.xz") {
contentType = "vztmpl" contentType = "vztmpl"
} else if release > 8.4 && (strings.HasSuffix(sourceFilePath, ".qcow2") || // For Proxmox VE 8.4 and later, we can import VM images to the "import" content type.
} else if releaseMajor >= 8 && releaseMinor > 4 && (strings.HasSuffix(sourceFilePath, ".qcow2") ||
strings.HasSuffix(sourceFilePath, ".raw") || strings.HasSuffix(sourceFilePath, ".raw") ||
strings.HasSuffix(sourceFilePath, ".vmdk")) { strings.HasSuffix(sourceFilePath, ".vmdk")) {
contentType = "import" contentType = "import"
@ -742,7 +746,7 @@ func fileGetSourceFileName(d *schema.ResourceData) (*string, error) {
return &sourceFileFileName, nil return &sourceFileFileName, nil
} }
func fileGetVolumeID(ctx context.Context, d *schema.ResourceData, c proxmoxtf.ProviderConfiguration) (fileVolumeID, diag.Diagnostics) { func fileGetVolumeID(ctx context.Context, d *schema.ResourceData, c proxmox.Client) (fileVolumeID, diag.Diagnostics) {
fileName, err := fileGetSourceFileName(d) fileName, err := fileGetSourceFileName(d)
if err != nil { if err != nil {
return fileVolumeID{}, diag.FromErr(err) return fileVolumeID{}, diag.FromErr(err)