chore(deps): update cloudstack sdk to v2.15.0

Author: fabiomatavelli

cloudstack/resource_cloudstack_autoscale_vm_profile.go

@@ -22,7 +22,6 @@ package cloudstack
 import (
 	"fmt"
 	"log"
-	"net/url"
 	"strings"
 	"time"
 
@@ -101,16 +100,15 @@ func resourceCloudStackAutoScaleVMProfileCreate(d *schema.ResourceData, meta int
 		if err != nil {
 			return err
 		}
-		p.SetDestroyvmgraceperiod(int(duration.Seconds()))
+		p.SetExpungevmgraceperiod(int(duration.Seconds()))
 	}
 
 	if v, ok := d.GetOk("other_deploy_params"); ok {
-		otherMap := v.(map[string]interface{})
-		result := url.Values{}
-		for k, v := range otherMap {
-			result.Set(k, fmt.Sprint(v))
+		nv := make(map[string]string)
+		for k, v := range v.(map[string]interface{}) {
+			nv[k] = v.(string)
 		}
-		p.SetOtherdeployparams(result.Encode())
+		p.SetOtherdeployparams(nv)
 	}
 
 	// Create the new vm profile
@@ -164,19 +162,10 @@ func resourceCloudStackAutoScaleVMProfileRead(d *schema.ResourceData, meta inter
 	setValueOrID(d, "template", template.Name, p.Templateid)
 	setValueOrID(d, "zone", zone.Name, p.Zoneid)
 
-	d.Set("destroy_vm_grace_period", (time.Duration(p.Destroyvmgraceperiod) * time.Second).String())
+	d.Set("destroy_vm_grace_period", (time.Duration(p.Expungevmgraceperiod) * time.Second).String())
 
-	if p.Otherdeployparams != "" {
-		var values url.Values
-		values, err = url.ParseQuery(p.Otherdeployparams)
-		if err != nil {
-			return err
-		}
-		otherParams := make(map[string]interface{}, len(values))
-		for key := range values {
-			otherParams[key] = values.Get(key)
-		}
-		d.Set("other_deploy_params", otherParams)
+	if p.Otherdeployparams != nil {
+		d.Set("other_deploy_params", p.Otherdeployparams)
 	}
 
 	metadata, err := getMetadata(cs, d, "AutoScaleVmProfile")
@@ -211,7 +200,7 @@ func resourceCloudStackAutoScaleVMProfileUpdate(d *schema.ResourceData, meta int
 		if err != nil {
 			return err
 		}
-		p.SetDestroyvmgraceperiod(int(duration.Seconds()))
+		p.SetExpungevmgraceperiod(int(duration.Seconds()))
 	}
 
 	_, err := cs.AutoScale.UpdateAutoScaleVmProfile(p)

cloudstack/resource_cloudstack_autoscale_vm_profile_test.go

@@ -21,6 +21,7 @@ package cloudstack
 
 import (
 	"fmt"
+	"reflect"
 	"testing"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
@@ -162,7 +163,10 @@ func testAccCheckCloudStackAutoscaleVMProfileBasicAttributes(
 			return fmt.Errorf("Bad zone: %s", vmProfile.Zoneid)
 		}
 
-		if vmProfile.Otherdeployparams != "displayname=display1&networkids=net1" {
+		if reflect.DeepEqual(vmProfile.Otherdeployparams, map[string]string{
+			"displayname": "display1",
+			"networkids":  "net1",
+		}) {
 			return fmt.Errorf("Bad otherdeployparams: %s", vmProfile.Otherdeployparams)
 		}
 
@@ -174,8 +178,8 @@ func testAccCheckCloudStackAutoscaleVMProfileUpdatedAttributes(
 	vmProfile *cloudstack.AutoScaleVmProfile) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 
-		if vmProfile.Destroyvmgraceperiod != 10 {
-			return fmt.Errorf("Bad destroy_vm_grace_period: %d", vmProfile.Destroyvmgraceperiod)
+		if vmProfile.Expungevmgraceperiod != 10 {
+			return fmt.Errorf("Bad destroy_vm_grace_period: %d", vmProfile.Expungevmgraceperiod)
 		}
 
 		return nil

cloudstack/resource_cloudstack_instance.go

@@ -635,7 +635,11 @@ func resourceCloudStackInstanceUpdate(d *schema.ResourceData, meta interface{})
 		if d.HasChange("keypair") {
 			log.Printf("[DEBUG] SSH keypair changed for %s, starting update", name)
 
-			p := cs.SSH.NewResetSSHKeyForVirtualMachineParams(d.Id(), d.Get("keypair").(string))
+			p := cs.SSH.NewResetSSHKeyForVirtualMachineParams(d.Id())
+
+			if keypair, ok := d.GetOk("keypair"); ok {
+				p.SetKeypair(keypair.(string))
+			}
 
 			// If there is a project supplied, we retrieve and set the project id
 			if err := setProjectid(p, cs, d); err != nil {

cloudstack/resource_cloudstack_loadbalancer_rule.go

@@ -22,6 +22,7 @@ package cloudstack
 import (
 	"fmt"
 	"log"
+	"strconv"
 	"strings"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
@@ -202,11 +203,21 @@ func resourceCloudStackLoadBalancerRuleRead(d *schema.ResourceData, meta interfa
 		return err
 	}
 
+	public_port, err := strconv.Atoi(lb.Publicport)
+	if err != nil {
+		return err
+	}
+
+	private_port, err := strconv.Atoi(lb.Privateport)
+	if err != nil {
+		return err
+	}
+
 	d.Set("name", lb.Name)
 	d.Set("ip_address_id", lb.Publicipid)
 	d.Set("algorithm", lb.Algorithm)
-	d.Set("public_port", lb.Publicport)
-	d.Set("private_port", lb.Privateport)
+	d.Set("public_port", public_port)
+	d.Set("private_port", private_port)
 	d.Set("protocol", lb.Protocol)
 
 	// Only set network if user specified it to avoid spurious diffs

cloudstack/resource_cloudstack_network.go

@@ -176,14 +176,12 @@ func resourceCloudStackNetworkCreate(d *schema.ResourceData, meta interface{}) e
 		return e.Error()
 	}
 
-	// Compute/set the display text
-	displaytext, ok := d.GetOk("display_text")
-	if !ok {
-		displaytext = name
-	}
-
 	// Create a new parameter struct
-	p := cs.Network.NewCreateNetworkParams(displaytext.(string), name, networkofferingid, zoneid)
+	p := cs.Network.NewCreateNetworkParams(name, networkofferingid, zoneid)
+
+	if displaytext, ok := d.GetOk("display_text"); ok {
+		p.SetDisplaytext(displaytext.(string))
+	}
 
 	// Get the network offering to check if it supports specifying IP ranges
 	no, _, err := cs.NetworkOffering.GetNetworkOfferingByID(networkofferingid)

cloudstack/resource_cloudstack_private_gateway.go

@@ -100,7 +100,6 @@ func resourceCloudStackPrivateGatewayCreate(d *schema.ResourceData, meta interfa
 		d.Get("gateway").(string),
 		ipaddress,
 		d.Get("netmask").(string),
-		d.Get("vlan").(string),
 		d.Get("vpc_id").(string),
 	)
 

go.mod

@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-cloudstack
 
 require (
-	github.com/apache/cloudstack-go/v2 v2.13.2
+	github.com/apache/cloudstack-go/v2 v2.15.0
 	github.com/go-ini/ini v1.67.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/terraform-plugin-go v0.22.0

go.sum

@@ -6,8 +6,8 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE
 github.com/ProtonMail/go-crypto v1.1.0-alpha.0/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/apache/cloudstack-go/v2 v2.13.2 h1:Y06CXNle++Gs24YjeNI7Ot8ZUQjLix2oPn/CMuVr/TU=
-github.com/apache/cloudstack-go/v2 v2.13.2/go.mod h1:aosD8Svfu5nhH5Sp4zcsVV1hT5UGt3mTgRXM8YqTKe0=
+github.com/apache/cloudstack-go/v2 v2.15.0 h1:oojn1qx0+wBwrFSSmA2rL8XjWd4BXqwYo0RVCrAXoHk=
+github.com/apache/cloudstack-go/v2 v2.15.0/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=