Merge pull request #31 from sp-yduck/dot-github

update

Author: sp-yduck

.github/workflows/golangci-lint.yaml

@@ -20,4 +20,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.4.0
         with:
-          version: v1.52.2
+          version: v1.52.2
+          args: --timeout 5m

cloud/scope/machine.go

@@ -147,7 +147,7 @@ func (m *MachineScope) GetBiosUUID() *string {
 	if err != nil {
 		return nil
 	}
-	return pointer.StringPtr(parsed.ID())
+	return pointer.String(parsed.ID())
 }
 
 func (m *MachineScope) GetProviderID() string {
@@ -194,7 +194,7 @@ func (m *MachineScope) SetProviderID(uuid string) error {
 	if err != nil {
 		return err
 	}
-	m.ProxmoxMachine.Spec.ProviderID = pointer.StringPtr(providerid.String())
+	m.ProxmoxMachine.Spec.ProviderID = pointer.String(providerid.String())
 	return nil
 }
 
@@ -207,7 +207,7 @@ func (m *MachineScope) SetReady() {
 }
 
 func (m *MachineScope) SetFailureMessage(v error) {
-	m.ProxmoxMachine.Status.FailureMessage = pointer.StringPtr(v.Error())
+	m.ProxmoxMachine.Status.FailureMessage = pointer.String(v.Error())
 }
 
 func (m *MachineScope) SetFailureReason(v capierrors.MachineStatusError) {

cloud/services/compute/instance/qemu.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
-	"net/url"
-	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -141,12 +139,3 @@ func generateVMOptions(vmName, storageName string, network infrav1.Network, hard
 	}
 	return vmoptions
 }
-
-// URL encodes the ssh keys
-func sshKeyUrlEncode(keys string) (encodedKeys string) {
-	encodedKeys = url.PathEscape(keys + "\n")
-	encodedKeys = strings.Replace(encodedKeys, "+", "%2B", -1)
-	encodedKeys = strings.Replace(encodedKeys, "@", "%40", -1)
-	encodedKeys = strings.Replace(encodedKeys, "=", "%3D", -1)
-	return
-}

cloud/services/compute/instance/reconcile.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -37,7 +36,9 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	}
 
 	log.Info(fmt.Sprintf("Reconciled instance: bios-uuid=%s", *uuid))
-	s.scope.SetProviderID(*uuid)
+	if err := s.scope.SetProviderID(*uuid); err != nil {
+		return err
+	}
 	s.scope.SetInstanceStatus(infrav1.InstanceStatus(instance.Status))
 	// s.scope.SetAddresses()
 	return nil
@@ -127,7 +128,7 @@ func getBiosUUID(vm *vm.VirtualMachine) (*string, error) {
 	if err != nil {
 		return nil, err
 	}
-	return pointer.StringPtr(uuid), nil
+	return pointer.String(uuid), nil
 }
 
 func convertSMBiosToUUID(smbios string) (string, error) {
@@ -140,29 +141,6 @@ func convertSMBiosToUUID(smbios string) (string, error) {
 	return strings.Split(match, "=")[1], nil
 }
 
-// will be abolished
-func (s *Service) getInstanceFromInstanceID(instanceID string) (*vm.VirtualMachine, error) {
-	vmid, err := strconv.Atoi(instanceID)
-	if err != nil {
-		return nil, err
-	}
-	nodes, err := s.client.Nodes()
-	if err != nil {
-		return nil, err
-	}
-	if len(nodes) == 0 {
-		return nil, errors.New("proxmox nodes not found")
-	}
-	for _, node := range nodes {
-		vm, err := node.VirtualMachine(vmid)
-		if err != nil {
-			continue
-		}
-		return vm, nil
-	}
-	return nil, api.ErrNotFound
-}
-
 func (s *Service) getInstanceFromBiosUUID(uuid string) (*vm.VirtualMachine, error) {
 	nodes, err := s.client.Nodes()
 	if err != nil {

cloud/services/compute/storage/reconcile.go

@@ -2,6 +2,7 @@ package storage
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/sp-yduck/proxmox/pkg/api"
@@ -28,11 +29,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 }
 
 func (s *Service) Delete(ctx context.Context) error {
-	// return s.deleteStorage(ctx)
-	// not worthy to delete Storage
-	// since deleting Storage will block vm deletion
-	// and does not delete actual content in the node
-	return nil
+	return s.deleteStorage(ctx)
 }
 
 // createOrGetStorage gets Proxmox Storage for VMs
@@ -77,6 +74,17 @@ func (s *Service) deleteStorage(ctx context.Context) error {
 			log.Info(err.Error())
 			continue
 		}
+
+		// check if storage is empty
+		contents, err := storage.Contents()
+		if err != nil {
+			return err
+		}
+		if len(contents) > 0 {
+			return errors.New("Storage must be empty to be deleted")
+		}
+
+		// delete
 		if _, err := storage.Delete(); err != nil {
 			log.Info(err.Error())
 			return err