|
|
|
@ -40,6 +40,7 @@ import (
|
|
|
|
|
|
|
|
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
|
|
|
|
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmppc"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmppc"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86"
|
|
|
|
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
|
|
|
|
@ -47,12 +48,16 @@ import (
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
|
|
|
|
|
|
|
|
"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
|
|
|
|
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// DiskKey is custom string type to set up context Key for Disk ID
|
|
|
|
|
|
|
|
type DiskKey string
|
|
|
|
|
|
|
|
|
|
|
|
func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
|
|
|
|
func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
|
|
|
|
log.Debugf("resourceComputeCreate: called for Compute name %q, RG ID %d", d.Get("name").(string), d.Get("rg_id").(int))
|
|
|
|
log.Debugf("resourceComputeCreate: called for Compute name %q, RG ID %d", d.Get("name").(string), d.Get("rg_id").(int))
|
|
|
|
c := m.(*controller.ControllerCfg)
|
|
|
|
c := m.(*controller.ControllerCfg)
|
|
|
|
@ -307,11 +312,13 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
req.ImageID = uint64(diskConv["image_id"].(int))
|
|
|
|
req.ImageID = uint64(diskConv["image_id"].(int))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
_, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
|
|
|
|
diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
cleanup = true
|
|
|
|
cleanup = true
|
|
|
|
return diag.FromErr(err)
|
|
|
|
return diag.FromErr(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -541,7 +548,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if err = flattenCompute(d, computeRec); err != nil {
|
|
|
|
if err = flattenCompute(ctx, d, computeRec); err != nil {
|
|
|
|
return diag.FromErr(err)
|
|
|
|
return diag.FromErr(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -747,14 +754,23 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
if d.HasChange("disks") {
|
|
|
|
if d.HasChange("disks") {
|
|
|
|
deletedDisks := make([]interface{}, 0)
|
|
|
|
deletedDisks := make([]interface{}, 0)
|
|
|
|
addedDisks := make([]interface{}, 0)
|
|
|
|
addedDisks := make([]interface{}, 0)
|
|
|
|
updatedDisks := make([]interface{}, 0)
|
|
|
|
resizedDisks := make([]interface{}, 0)
|
|
|
|
|
|
|
|
renamedDisks := make([]interface{}, 0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// save permanently in disks based on disk_id to context
|
|
|
|
|
|
|
|
for _, diskItemInterface := range d.Get("disks").([]interface{}) {
|
|
|
|
|
|
|
|
diskItem := diskItemInterface.(map[string]interface{})
|
|
|
|
|
|
|
|
diskId := diskItem["disk_id"].(int)
|
|
|
|
|
|
|
|
permanently := diskItem["permanently"].(bool)
|
|
|
|
|
|
|
|
ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(diskId)), permanently)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
oldDisks, newDisks := d.GetChange("disks")
|
|
|
|
oldDisks, newDisks := d.GetChange("disks")
|
|
|
|
oldConv := oldDisks.([]interface{})
|
|
|
|
oldConv := oldDisks.([]interface{})
|
|
|
|
newConv := newDisks.([]interface{})
|
|
|
|
newConv := newDisks.([]interface{})
|
|
|
|
|
|
|
|
|
|
|
|
for _, el := range oldConv {
|
|
|
|
for _, el := range oldConv {
|
|
|
|
if !isContainsDisk(newConv, el) {
|
|
|
|
if !isContainsDisk(newConv, el) && !isRenameDisk(newConv, el) && !isResizeDisk(newConv, el) {
|
|
|
|
flag := false
|
|
|
|
flag := false
|
|
|
|
extraDisks := d.Get("extra_disks").(*schema.Set).List()
|
|
|
|
extraDisks := d.Get("extra_disks").(*schema.Set).List()
|
|
|
|
delDisk := el.(map[string]interface{})
|
|
|
|
delDisk := el.(map[string]interface{})
|
|
|
|
@ -778,10 +794,12 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
for _, el := range newConv {
|
|
|
|
for _, el := range newConv {
|
|
|
|
if !isContainsDisk(oldConv, el) {
|
|
|
|
if !isContainsDisk(oldConv, el) {
|
|
|
|
addedDisks = append(addedDisks, el)
|
|
|
|
addedDisks = append(addedDisks, el)
|
|
|
|
} else {
|
|
|
|
|
|
|
|
if isChangeDisk(oldConv, el) {
|
|
|
|
|
|
|
|
updatedDisks = append(updatedDisks, el)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if isResizeDisk(oldConv, el) {
|
|
|
|
|
|
|
|
resizedDisks = append(resizedDisks, el)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if isRenameDisk(oldConv, el) {
|
|
|
|
|
|
|
|
renamedDisks = append(renamedDisks, el)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -850,15 +868,17 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
if diskConv["image_id"].(int) != 0 {
|
|
|
|
if diskConv["image_id"].(int) != 0 {
|
|
|
|
req.ImageID = uint64(diskConv["image_id"].(int))
|
|
|
|
req.ImageID = uint64(diskConv["image_id"].(int))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
|
|
|
|
diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return diag.FromErr(err)
|
|
|
|
return diag.FromErr(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if len(updatedDisks) > 0 {
|
|
|
|
if len(resizedDisks) > 0 {
|
|
|
|
for _, disk := range updatedDisks {
|
|
|
|
for _, disk := range resizedDisks {
|
|
|
|
diskConv := disk.(map[string]interface{})
|
|
|
|
diskConv := disk.(map[string]interface{})
|
|
|
|
if diskConv["disk_type"].(string) == "B" {
|
|
|
|
if diskConv["disk_type"].(string) == "B" {
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
@ -875,6 +895,22 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if len(renamedDisks) > 0 {
|
|
|
|
|
|
|
|
for _, disk := range renamedDisks {
|
|
|
|
|
|
|
|
diskConv := disk.(map[string]interface{})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
req := disks.RenameRequest{
|
|
|
|
|
|
|
|
DiskID: uint64(diskConv["disk_id"].(int)),
|
|
|
|
|
|
|
|
Name: diskConv["disk_name"].(string),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_, err := c.CloudAPI().Disks().Rename(ctx, req)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return diag.FromErr(err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if d.HasChange("started") {
|
|
|
|
if d.HasChange("started") {
|
|
|
|
@ -1398,7 +1434,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
|
|
|
|
return warnings.Get()
|
|
|
|
return warnings.Get()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func isChangeDisk(els []interface{}, el interface{}) bool {
|
|
|
|
func isResizeDisk(els []interface{}, el interface{}) bool {
|
|
|
|
for _, elOld := range els {
|
|
|
|
for _, elOld := range els {
|
|
|
|
elOldConv := elOld.(map[string]interface{})
|
|
|
|
elOldConv := elOld.(map[string]interface{})
|
|
|
|
elConv := el.(map[string]interface{})
|
|
|
|
elConv := el.(map[string]interface{})
|
|
|
|
@ -1410,11 +1446,23 @@ func isChangeDisk(els []interface{}, el interface{}) bool {
|
|
|
|
return false
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func isRenameDisk(els []interface{}, el interface{}) bool {
|
|
|
|
|
|
|
|
for _, elOld := range els {
|
|
|
|
|
|
|
|
elOldConv := elOld.(map[string]interface{})
|
|
|
|
|
|
|
|
elConv := el.(map[string]interface{})
|
|
|
|
|
|
|
|
if elOldConv["disk_id"].(int) == elConv["disk_id"].(int) &&
|
|
|
|
|
|
|
|
elOldConv["disk_name"].(string) != elConv["disk_name"].(string) {
|
|
|
|
|
|
|
|
return true
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func isContainsDisk(els []interface{}, el interface{}) bool {
|
|
|
|
func isContainsDisk(els []interface{}, el interface{}) bool {
|
|
|
|
for _, elOld := range els {
|
|
|
|
for _, elOld := range els {
|
|
|
|
elOldConv := elOld.(map[string]interface{})
|
|
|
|
elOldConv := elOld.(map[string]interface{})
|
|
|
|
elConv := el.(map[string]interface{})
|
|
|
|
elConv := el.(map[string]interface{})
|
|
|
|
if elOldConv["disk_name"].(string) == elConv["disk_name"].(string) {
|
|
|
|
if elOldConv["disk_id"].(int) == elConv["disk_id"].(int) {
|
|
|
|
return true
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1505,7 +1553,7 @@ func disksSubresourceSchemaMake() map[string]*schema.Schema {
|
|
|
|
"permanently": {
|
|
|
|
"permanently": {
|
|
|
|
Type: schema.TypeBool,
|
|
|
|
Type: schema.TypeBool,
|
|
|
|
Optional: true,
|
|
|
|
Optional: true,
|
|
|
|
Default: true,
|
|
|
|
Default: false,
|
|
|
|
Description: "Disk deletion status",
|
|
|
|
Description: "Disk deletion status",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"disk_id": {
|
|
|
|
"disk_id": {
|
|
|
|
@ -1636,7 +1684,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
|
|
|
|
"ram": {
|
|
|
|
"ram": {
|
|
|
|
Type: schema.TypeInt,
|
|
|
|
Type: schema.TypeInt,
|
|
|
|
Required: true,
|
|
|
|
Required: true,
|
|
|
|
ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
|
|
|
|
ValidateFunc: validation.All(
|
|
|
|
|
|
|
|
validation.IntAtLeast(constants.MinRamPerCompute),
|
|
|
|
|
|
|
|
validators.DivisibleBy(constants.RAMDivisibility),
|
|
|
|
|
|
|
|
),
|
|
|
|
Description: "Amount of RAM in MB to allocate to this compute instance.",
|
|
|
|
Description: "Amount of RAM in MB to allocate to this compute instance.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"image_id": {
|
|
|
|
"image_id": {
|
|
|
|
@ -1686,7 +1737,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"value": {
|
|
|
|
"value": {
|
|
|
|
Type: schema.TypeString,
|
|
|
|
Type: schema.TypeString,
|
|
|
|
Required: true,
|
|
|
|
Optional: true,
|
|
|
|
Description: "value that must match the key to be taken into account when analyzing this rule",
|
|
|
|
Description: "value that must match the key to be taken into account when analyzing this rule",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
@ -1722,7 +1773,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"value": {
|
|
|
|
"value": {
|
|
|
|
Type: schema.TypeString,
|
|
|
|
Type: schema.TypeString,
|
|
|
|
Required: true,
|
|
|
|
Optional: true,
|
|
|
|
Description: "value that must match the key to be taken into account when analyzing this rule",
|
|
|
|
Description: "value that must match the key to be taken into account when analyzing this rule",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
