Remove all occurrence of global projectID in cloudstack client because we can set it as default option

Author: elivlo

pkg/cloud/cloud.go

@@ -26,6 +26,7 @@ import (
 	"errors"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"k8s.io/klog/v2"
 )
 
 // Interface is the CloudStack client interface.
@@ -70,6 +71,7 @@ type Volume struct {
 	DeviceID         string
 }
 
+// Volume represents a CloudStack snapshot.
 type Snapshot struct {
 	ID   string
 	Name string
@@ -99,12 +101,18 @@ var (
 // client is the implementation of Interface.
 type client struct {
 	*cloudstack.CloudStackClient
-	projectID string
 }
 
 // New creates a new cloud connector, given its configuration.
 func New(config *Config) Interface {
 	csClient := cloudstack.NewAsyncClient(config.APIURL, config.APIKey, config.SecretKey, config.VerifySSL)
 
-	return &client{csClient, config.ProjectID}
+	// Set the project id to every request.
+	// This is possible because we just could work in one project with the previous implementation.
+	if config.ProjectID != "" {
+		csClient.DefaultOptions(cloudstack.WithProject(config.ProjectID))
+		klog.Background().V(2).Info("Set projectID to cloud connector", "projectID", config.ProjectID)
+	}
+
+	return &client{csClient}
 }

pkg/cloud/snapshots.go

@@ -34,12 +34,8 @@ func (c *client) GetSnapshotByID(ctx context.Context, snapshotID string) (*Snaps
 	if snapshotID != "" {
 		p.SetId(snapshotID)
 	}
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
 	logger.V(2).Info("CloudStack API call", "command", "ListSnapshots", "params", map[string]string{
-		"id":        snapshotID,
-		"projectid": c.projectID,
+		"id": snapshotID,
 	})
 	l, err := c.Snapshot.ListSnapshots(p)
 	if err != nil {
@@ -112,12 +108,8 @@ func (c *client) GetSnapshotByName(ctx context.Context, name string) (*Snapshot,
 	}
 	p := c.Snapshot.NewListSnapshotsParams()
 	p.SetName(name)
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
 	logger.V(2).Info("CloudStack API call", "command", "ListSnapshots", "params", map[string]string{
-		"name":      name,
-		"projectid": c.projectID,
+		"name": name,
 	})
 	l, err := c.Snapshot.ListSnapshots(p)
 	if err != nil {
@@ -152,13 +144,9 @@ func (c *client) ListSnapshots(ctx context.Context, volumeID, snapshotID string)
 	if volumeID != "" {
 		p.SetVolumeid(volumeID)
 	}
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
 	logger.V(2).Info("CloudStack API call", "command", "ListSnapshots", "params", map[string]string{
-		"id":        snapshotID,
-		"volumeid":  volumeID,
-		"projectid": c.projectID,
+		"id":       snapshotID,
+		"volumeid": volumeID,
 	})
 	l, err := c.Snapshot.ListSnapshots(p)
 	if err != nil {

pkg/cloud/vms.go

@@ -29,8 +29,7 @@ import (
 func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 	logger := klog.FromContext(ctx)
 	logger.V(2).Info("CloudStack API call", "command", "ListVirtualMachines", "params", map[string]string{
-		"id":        vmID,
-		"projectID": c.projectID,
+		"id": vmID,
 	})
 
 	return c.getVMByParam(ctx, func(p *cloudstack.ListVirtualMachinesParams) {
@@ -41,8 +40,7 @@ func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 func (c *client) getVMByName(ctx context.Context, name string) (*VM, error) {
 	logger := klog.FromContext(ctx)
 	logger.V(2).Info("CloudStack API call", "command", "ListVirtualMachines", "params", map[string]string{
-		"name":      name,
-		"projectID": c.projectID,
+		"name": name,
 	})
 
 	return c.getVMByParam(ctx, func(p *cloudstack.ListVirtualMachinesParams) {
@@ -53,10 +51,6 @@ func (c *client) getVMByName(ctx context.Context, name string) (*VM, error) {
 func (c *client) getVMByParam(ctx context.Context, setParams func(p *cloudstack.ListVirtualMachinesParams)) (*VM, error) {
 	p := c.VirtualMachine.NewListVirtualMachinesParams()
 
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
-
 	// set params for virtual machine list
 	setParams(p)
 

pkg/cloud/volumes.go

@@ -62,12 +62,8 @@ func (c *client) GetVolumeByID(ctx context.Context, volumeID string) (*Volume, e
 	logger := klog.FromContext(ctx)
 	p := c.Volume.NewListVolumesParams()
 	p.SetId(volumeID)
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
 	logger.V(2).Info("CloudStack API call", "command", "ListVolumes", "params", map[string]string{
-		"id":        volumeID,
-		"projectid": c.projectID,
+		"id": volumeID,
 	})
 
 	return c.listVolumes(p)
@@ -91,15 +87,11 @@ func (c *client) CreateVolume(ctx context.Context, diskOfferingID, zoneID, name
 	p.SetZoneid(zoneID)
 	p.SetName(name)
 	p.SetSize(sizeInGB)
-	if c.projectID != "" {
-		p.SetProjectid(c.projectID)
-	}
 	logger.V(2).Info("CloudStack API call", "command", "CreateVolume", "params", map[string]string{
 		"diskofferingid": diskOfferingID,
 		"zoneid":         zoneID,
 		"name":           name,
 		"size":           strconv.FormatInt(sizeInGB, 10),
-		"projectid":      c.projectID,
 	})
 	vol, err := c.Volume.CreateVolume(p)
 	if err != nil {
@@ -199,7 +191,6 @@ func (c *client) CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, pro
 		"name":       name,
 		"size":       strconv.FormatInt(sizeInGB, 10),
 		"snapshotid": snapshotID,
-		"projectid":  projectID,
 		"zoneid":     zoneID,
 	})
 	// Execute the API call to create volume from snapshot