Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: recover externally removed Talos VMs #29

Merged
eding merged 5 commits from fix/rebuild-absent-vm into main 2026-09-06 10:55:18 +02:00
Conversation 0 Commits 5 Files changed 6 +45 -29
2 changed files with 45 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 62540c69a2 - Show all commits

2
internal/bootstrap/bootstrap.go
View file

@ -1407,7 +1407,7 @@ func terraformReconcileTargets(cfg config.Config) []string {
func (r Runner) rebuildTalosVMs(terraformDir string, environment []string) error { func (r Runner) rebuildTalosVMs(terraformDir string, environment []string) error {
if err := r.importConfiguredTalosVMs(terraformDir, environment); err != nil { if err := r.importConfiguredTalosVMs(terraformDir, environment); err != nil {
var apiErr proxmox.APIError var apiErr proxmox.APIError
if errors.As(err, &apiErr) && apiErr.StatusCode == 404 { if errors.As(err, &apiErr) && (apiErr.StatusCode == 404 || apiErr.StatusCode == 500 && apiErr.Message == `{"data":null}` && strings.HasSuffix(apiErr.Path, "/config")) {
return nil return nil
} }
return err return err

18
internal/bootstrap/bootstrap_test.go
View file

@ -1294,8 +1294,9 @@ func TestRebuildTerraformSkipsAlreadyAbsentTalosVM(t *testing.T) {
Nodes: []config.TalosNode{{Name: "cp-01", ProxmoxNode: "pve", VMID: 100, Role: "controlplane"}}, Nodes: []config.TalosNode{{Name: "cp-01", ProxmoxNode: "pve", VMID: 100, Role: "controlplane"}},
}} }}
var events []string var events []string
for _, apiErr := range []proxmox.APIError{{StatusCode: 404}, {StatusCode: 500, Message: `{"data":null}`, Path: "/nodes/pve/qemu/100/config"}} {
verifyTalosVMs = func(config.Config) error { verifyTalosVMs = func(config.Config) error {
return fmt.Errorf("inspect configured Talos VM: %w", proxmox.APIError{StatusCode: 404}) return fmt.Errorf("inspect configured Talos VM: %w", apiErr)
} }
destroyTalosVMs = func(string, []string) error { destroyTalosVMs = func(string, []string) error {
t.Fatal("destroy ran for an already-absent VM") t.Fatal("destroy ran for an already-absent VM")
@ -1320,6 +1321,21 @@ func TestRebuildTerraformSkipsAlreadyAbsentTalosVM(t *testing.T) {
if strings.Join(events, ",") != "init,plan,apply" { if strings.Join(events, ",") != "init,plan,apply" {
t.Fatalf("Terraform phase order = %q", events) t.Fatalf("Terraform phase order = %q", events)
} }
events = nil
}
}
func TestRebuildTerraformRejectsUnexpectedProxmoxError(t *testing.T) {
originalVerify := verifyTalosVMs
t.Cleanup(func() { verifyTalosVMs = originalVerify })
verifyTalosVMs = func(config.Config) error {
return fmt.Errorf("inspect configured Talos VM: %w", proxmox.APIError{StatusCode: 500, Message: "server unavailable", Path: "/nodes/pve/qemu/100/config"})
}
err := (Runner{Config: config.Config{Talos: config.TalosConfig{Nodes: []config.TalosNode{{Name: "cp-01", ProxmoxNode: "pve", VMID: 100}}}}, Mode: Rebuild}).rebuildTalosVMs(t.TempDir(), nil)
if err == nil || !strings.Contains(err.Error(), "server unavailable") {
t.Fatalf("unexpected Proxmox error was accepted: %v", err)
}
} }
func TestEnsureLifecycleIdentityStoresMetadataUnderGeneratedDirectory(t *testing.T) { func TestEnsureLifecycleIdentityStoresMetadataUnderGeneratedDirectory(t *testing.T) {