Merge branch 'dev-old' into 'main'

Dev old

See merge request rudecs/terraform-provider-decort!30

CHANGELOG.md

@@ -1,35 +1,2 @@
-### Bug fixes
-- changing boot\_disk\_size in kvmvm
-- downsizing CPU and RAM in kvmvm
-- pfw recreation if public\_port\_end unspecified
-
-### New datasources
-- disk\_list
-- rg\_list
-- account\_list
-- account\_computes\_list
-- account\_disks\_list
-- account\_vins\_list
-- account\_audits\_list
-- account
-- account\_rg\_list
-- account\_counsumed\_units
-- account\_counsumed\_units\_by\_type
-- account\_reserved\_units
-- account\_templates\_list
-- account\_deleted\_list
-- bservice\_list
-- bservice\_snapshot\_list
-- bservice\_deleted\_list
-- bservice
-- bservice\_group
-- extnet\_default
-- extnet\_list
-- extnet
-- extnet\_computes\_list
-- vins\_list
-
-### New resources
-- account
-- bservice
-- bservice\_group
+### Resources updated
+- kvmvm - added sep\_id and pool parameters

decort/controller.go

@@ -27,7 +27,6 @@ package decort
 import (
 	"bytes"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -140,12 +139,9 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}} //nolint:gosec
 		ret_config.cc_client = &http.Client{
 			Transport: transCfg,
-			Timeout:   Timeout180s,
 		}
 	} else {
-		ret_config.cc_client = &http.Client{
-			Timeout: Timeout180s, // time.Second * 30,
-		}
+		ret_config.cc_client = &http.Client{}
 	}
 
 	switch ret_config.auth_mode_code {
@@ -379,13 +375,15 @@ func (config *ControllerCfg) decortAPICall(method string, api_name string, url_v
 		req.Header.Set("Authorization", fmt.Sprintf("bearer %s", config.jwt))
 	}
 
+	var resp *http.Response
+	var body []byte
 	for i := 0; i < 5; i++ {
-		resp, err := config.cc_client.Do(req)
+		resp, err = config.cc_client.Do(req)
 		if err != nil {
 			return "", err
 		}
 
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err = ioutil.ReadAll(resp.Body)
 		if err != nil {
 			return "", err
 		}
@@ -405,5 +403,6 @@ func (config *ControllerCfg) decortAPICall(method string, api_name string, url_v
 		}
 	}
 
-	return "", errors.New("number of retries exceeded")
+	return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
+		resp.StatusCode, req.URL, params_str, body)
 }

decort/data_source_compute.go

@@ -96,6 +96,17 @@ func parseBootDiskId(disks []DiskRecord) uint {
 	return 0
 }
 
+func findBootDisk(disks []DiskRecord) *DiskRecord {
+	for _, d := range disks {
+		if d.Type == "B" {
+			return &d
+		}
+	}
+
+	// some computes don't have a boot disk, so...
+	return &DiskRecord{}
+}
+
 // Parse the list of interfaces from compute/get response into a list of networks
 // attached to this compute
 func parseComputeInterfacesToNetworks(ifaces []InterfaceRecord) []interface{} {
@@ -148,8 +159,6 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 	d.Set("cpu", model.Cpu)
 	d.Set("ram", model.Ram)
 	// d.Set("boot_disk_size", model.BootDiskSize) - bootdiskSize key in API compute/get is always zero, so we set boot_disk_size in another way
-	d.Set("boot_disk_size", parseBootDiskSize(model.Disks))
-	d.Set("boot_disk_id", parseBootDiskId(model.Disks)) // we may need boot disk ID in resize operations
 	d.Set("image_id", model.ImageID)
 	d.Set("description", model.Desc)
 	d.Set("cloud_init", "applied") // NOTE: for existing compute we hard-code this value as an indicator for DiffSuppress fucntion
@@ -162,6 +171,13 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 		d.Set("started", false)
 	}
 
+	bootDisk := findBootDisk(model.Disks)
+
+	d.Set("boot_disk_size", bootDisk.SizeMax)
+	d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations
+	d.Set("sep_id", bootDisk.SepID)
+	d.Set("pool", bootDisk.Pool)
+
 	if len(model.Disks) > 0 {
 		log.Debugf("flattenCompute: calling parseComputeDisksToExtraDisks for %d disks", len(model.Disks))
 		if err = d.Set("extra_disks", parseComputeDisksToExtraDisks(model.Disks)); err != nil {

decort/resource_compute.go

@@ -75,6 +75,13 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
 		urlValues.Add("desc", argVal.(string))
 	}
 
+	if sepID, ok := d.GetOk("sep_id"); ok {
+		urlValues.Add("sepId", strconv.Itoa(sepID.(int)))
+	}
+
+	if pool, ok := d.GetOk("pool"); ok {
+		urlValues.Add("pool", pool.(string))
+	}
 	/*
 		sshKeysVal, sshKeysSet := d.GetOk("ssh_keys")
 		if sshKeysSet {
@@ -456,6 +463,22 @@ func resourceCompute() *schema.Resource {
 				Description: "This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.",
 			},
 
+			"sep_id": {
+				Type: schema.TypeInt,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
+			},
+
+			"pool": {
+				Type: schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
+			},
+
 			"extra_disks": {
 				Type:     schema.TypeSet,
 				Optional: true,