-
Notifications
You must be signed in to change notification settings - Fork 594
Add validation to require serial device when vga type is set to serial #1443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kmonticolo
wants to merge
2
commits into
Telmate:master
Choose a base branch
from
kmonticolo:feature/validate-vga-serial
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -612,6 +612,10 @@ func resourceVmQemuCreate(ctx context.Context, d *schema.ResourceData, meta inte | |
| config.EFIDisk = qemuEfiDisks[0] | ||
| } | ||
|
|
||
| if err := validateVGAAndSerial(d); err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| var vmr *pveSDK.VmRef | ||
| if guestID := vmID.Get(d); guestID != 0 { // Manually set vmID | ||
| log.Print("[DEBUG][QemuVmCreate] checking if vmId: " + guestID.String() + " already exists") | ||
|
|
@@ -871,6 +875,10 @@ func resourceVmQemuUpdate(ctx context.Context, d *schema.ResourceData, meta inte | |
| return diags | ||
| } | ||
|
|
||
| if err := validateVGAAndSerial(d); err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| logger.Debug().Int(vmID.Root, int(resourceID.ID)).Msgf("Updating VM with the following configuration: %+v", config) | ||
|
|
||
| var rebootRequired bool | ||
|
|
@@ -1521,3 +1529,37 @@ func mapToSDK_QemuGuestAgent(d *schema.ResourceData) *pveSDK.QemuGuestAgent { | |
| Enable: &tmpEnable, | ||
| } | ||
| } | ||
|
|
||
| func validateVGAAndSerial(d *schema.ResourceData) error { | ||
| // Get VGA configuration | ||
| vgaList := d.Get("vga").([]interface{}) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This panics when |
||
|
|
||
| if len(vgaList) > 0 { | ||
| vga := vgaList[0].(map[string]interface{}) | ||
| vgaType := vga["type"].(string) | ||
|
|
||
| // Check if vga type is serial0, serial1, serial2, or serial3 | ||
| if strings.HasPrefix(vgaType, "serial") { | ||
| // Extract serial number (0-3) | ||
| serialNum := strings.TrimPrefix(vgaType, "serial") | ||
|
|
||
| // Check if corresponding serial device is defined | ||
| serialList := d.Get("serial").([]interface{}) | ||
| serialFound := false | ||
|
|
||
| for _, s := range serialList { | ||
| serial := s.(map[string]interface{}) | ||
| if fmt.Sprintf("%d", serial["id"].(int)) == serialNum { | ||
| serialFound = true | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if !serialFound { | ||
| return fmt.Errorf("vga type '%s' requires serial device with id=%s to be defined", vgaType, serialNum) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My advise would be to implement the logic by parsing the config defined by:
terraform-provider-proxmox/proxmox/resource_vm_qemu.go
Line 548 in 7d83bac