remove proxmox pkg

Author: sp-yduck

api/v1beta1/type.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/api"
 )
 
 // ServerRef is used for configuring Proxmox client
@@ -127,7 +127,7 @@ type Storage struct {
 type InstanceStatus string
 
 var (
-	InstanceStatusPaused  = InstanceStatus(vm.ProcessStatusPaused)
-	InstanceStatusRunning = InstanceStatus(vm.ProcessStatusRunning)
-	InstanceStatusStopped = InstanceStatus(vm.ProcessStatusStopped)
+	InstanceStatusPaused  = InstanceStatus(api.ProcessStatusPaused)
+	InstanceStatusRunning = InstanceStatus(api.ProcessStatusRunning)
+	InstanceStatusStopped = InstanceStatus(api.ProcessStatusStopped)
 )

cloud/services/compute/instance/image.go

@@ -7,15 +7,15 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/api"
 	"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 *vm.VirtualMachine) error {
+func (s *Service) reconcileBootDevice(ctx context.Context, vm *api.VirtualMachine) error {
 	vmid := s.scope.GetVMID()
 	storage := s.scope.GetStorage()
 	image := s.scope.GetImage()

cloud/services/compute/instance/qemu.go

@@ -7,48 +7,47 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/api"
-	"github.com/sp-yduck/proxmox/pkg/service/node"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/api"
+	"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) (*vm.VirtualMachine, error) {
+func (s *Service) reconcileQEMU(ctx context.Context) (*api.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 	log.Info("Reconciling QEMU")
 
 	nodeName := s.scope.NodeName()
 	vmid := s.scope.GetVMID()
-	vm, err := s.getQEMU(nodeName, vmid)
-	if err == nil { // if vm is found, return it
-		return vm, nil
+	api, err := s.getQEMU(nodeName, vmid)
+	if err == nil { // if api is found, return it
+		return api, nil
 	}
 	if !IsNotFound(err) {
-		log.Error(err, fmt.Sprintf("failed to get vm: node=%s,vmid=%d", nodeName, *vmid))
+		log.Error(err, fmt.Sprintf("failed to get api: node=%s,vmid=%d", nodeName, *vmid))
 		return nil, err
 	}
 
-	// no vm found, create new one
+	// no api found, create new one
 	return s.createQEMU(ctx, nodeName, vmid)
 }
 
-func (s *Service) getQEMU(nodeName string, vmid *int) (*vm.VirtualMachine, error) {
+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)
 	}
-	return nil, api.ErrNotFound
+	return nil, rest.ErrNotFound
 }
 
-func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*vm.VirtualMachine, error) {
+func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*api.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 
-	var node *node.Node
+	var node *api.Node
 	var err error
 
 	// get node
@@ -81,31 +80,31 @@ func (s *Service) createQEMU(ctx context.Context, nodeName string, vmid *int) (*
 		vmid = &nextid
 	}
 
-	// create vm
+	// create api
 	vmoption := generateVMOptions(s.scope.Name(), s.scope.GetStorage().Name, s.scope.GetNetwork(), s.scope.GetHardware())
-	vm, err := node.CreateVirtualMachine(*vmid, vmoption)
+	api, err := node.CreateVirtualMachine(*vmid, vmoption)
 	if err != nil {
 		log.Error(err, "failed to create virtual machine")
 		return nil, err
 	}
 	s.scope.SetVMID(*vmid)
-	return vm, nil
+	return api, nil
 }
 
 func (s *Service) GetNextID() (int, error) {
-	return s.client.NextID()
+	return s.client.RESTClient().GetNextID(context.TODO())
 }
 
-func (s *Service) GetNodes() ([]*node.Node, error) {
-	return s.client.Nodes()
+func (s *Service) GetNodes() ([]*api.Node, error) {
+	return s.client.Nodes(context.TODO())
 }
 
-func (s *Service) GetNode(name string) (*node.Node, error) {
+func (s *Service) GetNode(name string) (*api.Node, error) {
 	return s.client.Node(name)
 }
 
 // GetRandomNode returns a node chosen randomly
-func (s *Service) GetRandomNode() (*node.Node, error) {
+func (s *Service) GetRandomNode() (*api.Node, error) {
 	nodes, err := s.GetNodes()
 	if err != nil {
 		return nil, err
@@ -118,23 +117,23 @@ func (s *Service) GetRandomNode() (*node.Node, error) {
 	return nodes[r.Intn(len(nodes))], nil
 }
 
-func generateVMOptions(vmName, storageName string, network infrav1.Network, hardware infrav1.Hardware) vm.VirtualMachineCreateOptions {
-	vmoptions := vm.VirtualMachineCreateOptions{
+func generateVMOptions(vmName, storageName string, network infrav1.Network, hardware infrav1.Hardware) api.VirtualMachineCreateOptions {
+	vmoptions := api.VirtualMachineCreateOptions{
 		Agent:        "enabled=1",
 		Cores:        hardware.CPU,
 		Memory:       hardware.Memory,
 		Name:         vmName,
 		NameServer:   network.NameServer,
 		Boot:         "order=scsi0",
-		Ide:          vm.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
+		Ide:          api.Ide{Ide2: fmt.Sprintf("file=%s:cloudinit,media=cdrom", storageName)},
 		CiCustom:     fmt.Sprintf("user=%s:%s", storageName, userSnippetPath(vmName)),
-		IPConfig:     vm.IPConfig{IPConfig0: network.IPConfig.String()},
-		OSType:       vm.L26,
-		Net:          vm.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
-		Scsi:         vm.Scsi{Scsi0: fmt.Sprintf("file=%s:8", storageName)},
-		ScsiHw:       vm.VirtioScsiPci,
+		IPConfig:     api.IPConfig{IPConfig0: network.IPConfig.String()},
+		OSType:       api.L26,
+		Net:          api.Net{Net0: "model=virtio,bridge=vmbr0,firewall=1"},
+		Scsi:         api.Scsi{Scsi0: fmt.Sprintf("file=%s:8", storageName)},
+		ScsiHw:       api.VirtioScsiPci,
 		SearchDomain: network.SearchDomain,
-		Serial:       vm.Serial{Serial0: "socket"},
+		Serial:       api.Serial{Serial0: "socket"},
 		VGA:          "serial0",
 	}
 	return vmoptions

cloud/services/compute/instance/reconcile.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/sp-yduck/proxmox/pkg/api"
-	"github.com/sp-yduck/proxmox/pkg/service/node/vm"
+	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/sp-yduck/proxmox-go/rest"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -72,7 +72,7 @@ func (s *Service) Delete(ctx context.Context) error {
 	return instance.Delete()
 }
 
-func (s *Service) createOrGetInstance(ctx context.Context) (*vm.VirtualMachine, error) {
+func (s *Service) createOrGetInstance(ctx context.Context) (*api.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 
 	log.Info("Getting bootstrap data for machine")
@@ -100,25 +100,25 @@ func (s *Service) createOrGetInstance(ctx context.Context) (*vm.VirtualMachine,
 	return instance, nil
 }
 
-func (s *Service) GetInstance(ctx context.Context) (*vm.VirtualMachine, error) {
+func (s *Service) GetInstance(ctx context.Context) (*api.VirtualMachine, error) {
 	log := log.FromContext(ctx)
 	biosUUID := s.scope.GetBiosUUID()
 	if biosUUID == nil {
-		return nil, api.ErrNotFound
+		return nil, rest.ErrNotFound
 	}
 	vm, err := s.getInstanceFromBiosUUID(*biosUUID)
 	if err != nil {
-		if api.IsNotFound(err) {
+		if rest.IsNotFound(err) {
 			log.Info("instance wasn't found")
-			return nil, api.ErrNotFound
+			return nil, rest.ErrNotFound
 		}
 		log.Error(err, "failed to get instance from bios UUID")
 		return nil, err
 	}
 	return vm, nil
 }
 
-func getBiosUUID(vm *vm.VirtualMachine) (*string, error) {
+func getBiosUUID(vm *api.VirtualMachine) (*string, error) {
 	config, err := vm.Config()
 	if err != nil {
 		return nil, err
@@ -141,7 +141,7 @@ func convertSMBiosToUUID(smbios string) (string, error) {
 	return strings.Split(match, "=")[1], nil
 }
 
-func (s *Service) getInstanceFromBiosUUID(uuid string) (*vm.VirtualMachine, error) {
+func (s *Service) getInstanceFromBiosUUID(uuid string) (*api.VirtualMachine, error) {
 	nodes, err := s.client.Nodes()
 	if err != nil {
 		return nil, err
@@ -170,7 +170,7 @@ func (s *Service) getInstanceFromBiosUUID(uuid string) (*vm.VirtualMachine, erro
 			}
 		}
 	}
-	return nil, api.ErrNotFound
+	return nil, rest.ErrNotFound
 }
 
 func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.VirtualMachine, error) {
@@ -202,20 +202,20 @@ func (s *Service) CreateInstance(ctx context.Context, bootstrap string) (*vm.Vir
 }
 
 func IsNotFound(err error) bool {
-	return api.IsNotFound(err)
+	return rest.IsNotFound(err)
 }
 
-func EnsureRunning(instance vm.VirtualMachine) error {
+func EnsureRunning(instance api.VirtualMachine) error {
 	// ensure instance is running
 	switch instance.Status {
-	case vm.ProcessStatusRunning:
+	case api.ProcessStatusRunning:
 		return nil
-	case vm.ProcessStatusStopped:
-		if err := instance.Start(vm.StartOption{}); err != nil {
+	case api.ProcessStatusStopped:
+		if err := instance.Start(api.StartOption{}); err != nil {
 			return err
 		}
-	case vm.ProcessStatusPaused:
-		if err := instance.Resume(vm.ResumeOption{}); err != nil {
+	case api.ProcessStatusPaused:
+		if err := instance.Resume(api.ResumeOption{}); err != nil {
 			return err
 		}
 	default:
@@ -224,15 +224,15 @@ func EnsureRunning(instance vm.VirtualMachine) error {
 	return nil
 }
 
-func EnsureStoppedOrPaused(instance vm.VirtualMachine) error {
+func EnsureStoppedOrPaused(instance api.VirtualMachine) error {
 	switch instance.Status {
-	case vm.ProcessStatusRunning:
+	case api.ProcessStatusRunning:
 		if err := instance.Stop(); err != nil {
 			return err
 		}
-	case vm.ProcessStatusPaused:
+	case api.ProcessStatusPaused:
 		return nil
-	case vm.ProcessStatusStopped:
+	case api.ProcessStatusStopped:
 		return nil
 	default:
 		return errors.Errorf("unexpected status : %s", instance.Status)

cloud/services/compute/storage/reconcile.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sp-yduck/proxmox/pkg/api"
-	"github.com/sp-yduck/proxmox/pkg/service/node/storage"
+	"github.com/sp-yduck/proxmox-go/api"
+	"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"
@@ -36,7 +36,7 @@ func (s *Service) Delete(ctx context.Context) error {
 func (s *Service) createOrGetStorage(ctx context.Context) error {
 	opts := generateVMStorageOptions(s.scope)
 	if err := s.getStorage(opts.Storage); err != nil {
-		if api.IsNotFound(err) {
+		if rest.IsNotFound(err) {
 			if err := s.createStorage(opts); err != nil {
 				return err
 			}
@@ -55,7 +55,7 @@ func (s *Service) getStorage(name string) error {
 	return nil
 }
 
-func (s *Service) createStorage(options storage.StorageCreateOptions) error {
+func (s *Service) createStorage(options api.StorageCreateOptions) error {
 	if _, err := s.client.CreateStorage(options.Storage, options.StorageType, options); err != nil {
 		return err
 	}
@@ -64,7 +64,7 @@ func (s *Service) createStorage(options storage.StorageCreateOptions) error {
 
 func (s *Service) deleteStorage(ctx context.Context) error {
 	log := log.FromContext(ctx)
-	nodes, err := s.client.Nodes()
+	nodes, err := s.client.Nodes(ctx)
 	if err != nil {
 		return err
 	}
@@ -93,9 +93,9 @@ func (s *Service) deleteStorage(ctx context.Context) error {
 	return nil
 }
 
-func generateVMStorageOptions(scope Scope) storage.StorageCreateOptions {
+func generateVMStorageOptions(scope Scope) api.StorageCreateOptions {
 	storageSpec := scope.Storage()
-	options := storage.StorageCreateOptions{
+	options := api.StorageCreateOptions{
 		Storage:     storageSpec.Name,
 		StorageType: "dir",
 		Content:     "images,snippets",

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.8
 	github.com/pkg/errors v0.9.1
-	github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f
 	github.com/sp-yduck/proxmox-go v0.0.0-alpha4
 	golang.org/x/crypto v0.11.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -288,8 +288,6 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f h1:n32eSWqWLtjk+jb4B1Ok+W5KoAxuYuouEkXjumqySXI=
-github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f/go.mod h1:VIKtGZXlx0nO9Y+K2vJ4z3rJLkZ3v0OvTnKbO22EnL4=
 github.com/sp-yduck/proxmox-go v0.0.0-alpha4 h1:z4S3zc/mGBvthz4gjP9Dj4SEzXnEgyDz9dPNimfB8vs=
 github.com/sp-yduck/proxmox-go v0.0.0-alpha4/go.mod h1:hrQc1bUUCN71yn+in+LkfdpJstaaMv2nrn3+GeKFbkA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=