migrate proxmox sdk to proxmox-go

Author: sp-yduck

README.md

@@ -27,9 +27,11 @@ clusterctl init --infrastructure=proxmox:v0.2.2 --config https://raw.githubuserc
 export CONTROLPLANE_HOST=X.X.X.X   # for control-plane node
 export GATEWAY_ADDRESS=X.X.X.X     # for control-plane node
 export NAMESERVER_ADDRESS=X.X.X.X  # for contro-lplane node
-export PROXMOX_URL=X.X.X.X:8006
-export PROXMOX_PASSWORD=password
-export PROXMOX_USER=user@pam
+export PROXMOX_URL=https://X.X.X.X:8006/api2/json
+# export PROXMOX_PASSWORD=password # (optional)
+# export PROXMOX_USER=user@pam     # (optional)
+export PROXMOX_TOKENID='root@pam!api-token-id'
+export PROXMOX_SECRET=aaaaaaaa-bbbb-cccc-dddd-ee12345678
 export NODE_URL=node.ssh.url:22
 export NODE_USER=node-ssh-user
 export NODE_PASSWORD=node-ssh-password

cloud/scope/clients.go

@@ -44,17 +44,11 @@ func newComputeService(ctx context.Context, serverRef infrav1.ServerRef, crClien
 		return nil, err
 	}
 
-	proxmoxUser, ok := secret.Data["PROXMOX_USER"]
-	if !ok {
-		return nil, errors.Errorf("failed to fetch PROXMOX_USER from Secret : %v", key)
-	}
-	proxmoxPassword, ok := secret.Data["PROXMOX_PASSWORD"]
-	if !ok {
-		return nil, errors.Errorf("failed to fetch PROXMOX_PASSWORD from Secret : %v", key)
-	}
 	authConfig := proxmox.AuthConfig{
-		Username: string(proxmoxUser),
-		Password: string(proxmoxPassword),
+		Username: string(secret.Data["PROXMOX_USER"]),
+		Password: string(secret.Data["PROXMOX_PASSWORD"]),
+		TokenID:  string(secret.Data["PROXMOX_TOKENID"]),
+		Secret:   string(secret.Data["PROXMOX_SECRET"]),
 	}
 
 	return proxmox.NewService(serverRef.Endpoint, authConfig, true)

cloud/services/compute/instance/cloudinit.go

@@ -1,6 +1,7 @@
 package instance
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/pkg/errors"
@@ -24,28 +25,21 @@ func (s *Service) reconcileCloudInit(bootstrap string) error {
 }
 
 // delete CloudConfig
-func (s *Service) deleteCloudConfig() error {
+func (s *Service) deleteCloudConfig(ctx context.Context) error {
 	storageName := s.scope.GetStorage().Name
 	path := userSnippetPath(s.scope.Name())
 	volumeID := fmt.Sprintf("%s:%s", storageName, path)
 
-	node, err := s.client.Node(s.scope.NodeName())
+	node, err := s.client.Node(ctx, s.scope.NodeName())
 	if err != nil {
 		return err
 	}
-	storage, err := node.Storage(storageName)
+	storage, err := s.client.Storage(ctx, storageName)
 	if err != nil {
 		return err
 	}
-	content, err := storage.GetContent(volumeID)
-	if IsNotFound(err) { // return nil if it's already deleted
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-
-	return content.DeleteVolume()
+	storage.Node = node.Node
+	return storage.DeleteVolume(ctx, volumeID)
 }
 
 func (s *Service) reconcileCloudInitUser(bootstrap string) error {

cloud/services/compute/instance/image.go

@@ -7,15 +7,15 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scope"
 )
 
 // reconcileBootDevice
-func (s *Service) reconcileBootDevice(ctx context.Context, vm *api.VirtualMachine) error {
+func (s *Service) reconcileBootDevice(ctx context.Context, vm *proxmox.VirtualMachine) error {
 	vmid := s.scope.GetVMID()
 	storage := s.scope.GetStorage()
 	image := s.scope.GetImage()
@@ -24,12 +24,12 @@ func (s *Service) reconcileBootDevice(ctx context.Context, vm *api.VirtualMachin
 	log.Info(fmt.Sprintf("%v", hardware))
 
 	// os image
-	if err := SetCloudImage(ctx, *vmid, storage, image, s.remote); err != nil {
+	if err := setCloudImage(ctx, *vmid, storage, image, s.remote); err != nil {
 		return err
 	}
 
 	// volume
-	if err := vm.ResizeVolume("scsi0", hardware.Disk); err != nil {
+	if err := vm.ResizeVolume(ctx, "scsi0", hardware.Disk); err != nil {
 		return err
 	}
 
@@ -38,7 +38,7 @@ func (s *Service) reconcileBootDevice(ctx context.Context, vm *api.VirtualMachin
 
 // setCloudImage downloads OS image into Proxmox node
 // and then sets it to specified storage
-func SetCloudImage(ctx context.Context, vmid int, storage infrav1.Storage, image infrav1.Image, ssh scope.SSHClient) error {
+func setCloudImage(ctx context.Context, vmid int, storage infrav1.Storage, image infrav1.Image, ssh scope.SSHClient) error {
 	log := log.FromContext(ctx)
 	log.Info("setting cloud image")
 

cloud/services/compute/instance/qemu.go

@@ -8,23 +8,24 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/sp-yduck/proxmox-go/proxmox"
 	"github.com/sp-yduck/proxmox-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
 )
 
-func (s *Service) reconcileQEMU(ctx context.Context) (*api.VirtualMachine, error) {
+func (s *Service) reconcileQEMU(ctx context.Context) (*proxmox.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 	log.Info("Reconciling QEMU")
 
 	nodeName := s.scope.NodeName()
 	vmid := s.scope.GetVMID()
-	api, err := s.getQEMU(nodeName, vmid)
+	api, err := s.getQEMU(ctx, vmid)
 	if err == nil { // if api is found, return it
 		return api, nil
 	}
-	if !IsNotFound(err) {
+	if !rest.IsNotFound(err) {
 		log.Error(err, fmt.Sprintf("failed to get api: node=%s,vmid=%d", nodeName, *vmid))
 		return nil, err
 	}
@@ -33,79 +34,67 @@ func (s *Service) reconcileQEMU(ctx context.Context) (*api.VirtualMachine, error
 	return s.createQEMU(ctx, nodeName, vmid)
 }
 
-func (s *Service) getQEMU(nodeName string, vmid *int) (*api.VirtualMachine, error) {
-	if vmid != nil && nodeName != "" {
-		node, err := s.GetNode(nodeName)
-		if err != nil {
-			return nil, err
-		}
-		return node.VirtualMachine(*vmid)
+func (s *Service) getQEMU(ctx context.Context, vmid *int) (*proxmox.VirtualMachine, error) {
+	if vmid != nil {
+		return s.client.VirtualMachine(ctx, *vmid)
 	}
-	return nil, rest.ErrNotFound
+	return nil, rest.NotFoundErr
 }
 
-func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*api.VirtualMachine, error) {
+func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*proxmox.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 
-	var node *api.Node
-	var err error
-
-	// get node
-	if nodeName != "" {
-		node, err = s.GetNode(nodeName)
-		if err != nil {
-			log.Error(err, fmt.Sprintf("failed to get node %s", nodeName))
-			return nil, err
-		}
-	} else {
+	// get nodej
+	if nodeName == "" {
 		// temp solution
-		node, err = s.GetRandomNode()
+		node, err := s.getRandomNode()
 		if err != nil {
 			log.Error(err, "failed to get random node")
 			return nil, err
 		}
-		s.scope.SetNodeName(node.Node)
+		nodeName = node.Node
+		s.scope.SetNodeName(nodeName)
 	}
 
 	// (for multiple node proxmox cluster support)
 	// to do : set ssh client for specific node
 
 	// if vmid is empty, generate new vmid
 	if vmid == nil {
-		nextid, err := s.GetNextID()
+		nextid, err := s.getNextID()
 		if err != nil {
 			log.Error(err, "failed to get available vmid")
 			return nil, err
 		}
 		vmid = &nextid
 	}
 
-	// create api
 	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork(), s.scope.GetHardware())
-	api, err := node.CreateVirtualMachine(*vmid, vmoption)
+	// to do : do not use RESTClient()
+	_, err := s.client.RESTClient().CreateVirtualMachine(ctx, nodeName, *vmid, vmoption)
 	if err != nil {
-		log.Error(err, "failed to create virtual machine")
+		log.Error(err, fmt.Sprintf("failed to get node %s", nodeName))
 		return nil, err
 	}
 	s.scope.SetVMID(*vmid)
-	return api, nil
+	return s.client.VirtualMachine(ctx, *vmid)
 }
 
-func (s *Service) GetNextID() (int, error) {
+func (s *Service) getNextID() (int, error) {
 	return s.client.RESTClient().GetNextID(context.TODO())
 }
 
-func (s *Service) GetNodes() ([]*api.Node, error) {
+func (s *Service) getNodes() ([]*api.Node, error) {
 	return s.client.Nodes(context.TODO())
 }
 
-func (s *Service) GetNode(name string) (*api.Node, error) {
-	return s.client.Node(name)
+func (s *Service) getNode(ctx context.Context, name string) (*api.Node, error) {
+	return s.client.Node(ctx, name)
 }
 
 // GetRandomNode returns a node chosen randomly
-func (s *Service) GetRandomNode() (*api.Node, error) {
-	nodes, err := s.GetNodes()
+func (s *Service) getRandomNode() (*api.Node, error) {
+	nodes, err := s.getNodes()
 	if err != nil {
 		return nil, err
 	}