4.5.1

2023-12-18 18:36:55 +03:00
parent 294680282e
commit e2ee45ee14
155 changed files with 10125 additions and 17209 deletions
--- a/internal/service/cloudbroker/flipgroup/data_source_flipgroup.go
+++ b/internal/service/cloudbroker/flipgroup/data_source_flipgroup.go
@@ -56,153 +56,6 @@ func dataSourceFlipgroupRead(ctx context.Context, d *schema.ResourceData, m inte
 	return nil
 }

-func dataSourceFlipgroupSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"flipgroup_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "flipgroup_id",
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "account_id",
-		},
-		"account_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "account_name",
-		},
-		"client_ids": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "client_ids",
-		},
-		"client_names": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "client_names",
-		},
-		"client_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "client_type",
-		},
-		"conn_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "conn_id",
-		},
-		"conn_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "conn_type",
-		},
-		"created_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "created_by",
-		},
-		"created_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "created_time",
-		},
-		"default_gw": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "default_gw",
-		},
-		"deleted_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "deleted_by",
-		},
-		"deleted_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "deleted_time",
-		},
-		"description": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "description",
-		},
-		"gid": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "gid",
-		},
-		"guid": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "guid",
-		},
-		"ip": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ip",
-		},
-		"milestones": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "milestones",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "name",
-		},
-		"net_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "net_id",
-		},
-		"net_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "net_type",
-		},
-		"network": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "network",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "rg_id",
-		},
-		"rg_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "rg_name",
-		},
-		"status": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "status",
-		},
-		"updated_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "updated_by",
-		},
-		"updated_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "updated_time",
-		},
-	}
-	return rets
-}
-
 func DataSourceFlipgroup() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
--- a/internal/service/cloudbroker/flipgroup/data_sourse_flipgroup_list.go
+++ b/internal/service/cloudbroker/flipgroup/data_sourse_flipgroup_list.go
@@ -58,175 +58,6 @@ func dataSourceFlipgroupListRead(ctx context.Context, d *schema.ResourceData, m
 	return nil
 }

-func dataSourceFlipgroupItemSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"ckey": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ckey",
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "account_id",
-		},
-		"client_ids": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "client_ids",
-		},
-		"client_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "client_type",
-		},
-		"conn_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "conn_id",
-		},
-		"conn_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "conn_type",
-		},
-		"default_gw": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "default_gw",
-		},
-		"description": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "description",
-		},
-		"gid": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "gid",
-		},
-		"guid": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "guid",
-		},
-		"flipgroup_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "flipgroup_id",
-		},
-		"ip": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ip",
-		},
-		"milestones": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "milestones",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "name",
-		},
-		"net_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "net_id",
-		},
-		"net_type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "net_type",
-		},
-		"net_mask": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "net_mask",
-		},
-		"status": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "status",
-		},
-	}
-	return rets
-}
-
-func dataSourceFlipgroupsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "name",
-		},
-		"vins_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "vins_id",
-		},
-		"vins_name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "vins_name",
-		},
-		"extnet_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "extnet_id",
-		},
-		"by_ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "by_ip",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "rg_id",
-		},
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "by_id",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: dataSourceFlipgroupItemSchemaMake(),
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-			Description: "entry_count",
-		},
-	}
-	return res
-}
-
 func DataSourceFlipgroupList() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
--- a/internal/service/cloudbroker/flipgroup/resource_check_input_values.go
+++ b/internal/service/cloudbroker/flipgroup/resource_check_input_values.go
@@ -36,35 +36,35 @@ package flipgroup

 import (
 	"context"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"

+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vins"
 )

-func existAccountID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	c := m.(*controller.ControllerCfg)
+func checkParamsExistence(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) diag.Diagnostics {
+	var errs []error
+
 	accountId := uint64(d.Get("account_id").(int))
-	req := account.ListRequest{}
+	netType := d.Get("net_type").(string)
+	netId := uint64(d.Get("net_id").(int))

-	accountList, err := c.CloudBroker().Account().List(ctx, req)
-	if err != nil {
-		return false, err
+	if err := ic.ExistAccount(ctx, accountId, c); err != nil {
+		errs = append(errs, err)
 	}

-	return len(accountList.FilterByID(accountId).Data) != 0, nil
-}
-
-func existNetID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
-	c := m.(*controller.ControllerCfg)
-	netID := uint64(d.Get("net_id").(int))
-	req := vins.ListRequest {}
-
-	vinsList, err := c.CloudBroker().VINS().List(ctx, req)
-	if err != nil {
-		return false, err
+	switch netType {
+	case "VINS":
+		if err := ic.ExistVins(ctx, netId, c); err != nil {
+			errs = append(errs, err)
+		}
+	case "EXTNET":
+		if err := ic.ExistExtNet(ctx, netId, c); err != nil {
+			errs = append(errs, err)
+		}
 	}

-	return len(vinsList.FilterByID(netID).Data) != 0, nil
+	return dc.ErrorsToDiagnostics(errs)
 }
--- a/internal/service/cloudbroker/flipgroup/resource_flipgroup.go
+++ b/internal/service/cloudbroker/flipgroup/resource_flipgroup.go
@@ -37,14 +37,13 @@ package flipgroup
 import (
 	"context"
 	"fmt"
-
 	"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/validation"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/flipgroup"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"

 	log "github.com/sirupsen/logrus"
 )
@@ -53,43 +52,34 @@ func resourceFlipgroupCreate(ctx context.Context, d *schema.ResourceData, m inte
 	log.Debugf("resourceFlipgroupCreate called with name: %s, accountID %v", d.Get("name").(string), d.Get("account_id").(int))

 	c := m.(*controller.ControllerCfg)
-	req := flipgroup.CreateRequest{
-		Name:        d.Get("name").(string),
-		NetType:     d.Get("net_type").(string),
-		ClientType:  d.Get("client_type").(string),
-	}
-	
-	haveAccount, err := existAccountID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	if !haveAccount {
-		return diag.Errorf("resourceFlipgroupCreate: can't create Flipgroup because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-	}
-	req.AccountID =   uint64(d.Get("account_id").(int))

-	haveVINS, err := existNetID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
+	if diags := checkParamsExistence(ctx, d, c); diags != nil {
+		return diags
 	}
-	if !haveVINS {
-		return diag.Errorf("resourceFlipgroupCreate: can't create Flipgroup because VinsID %d is not allowed or does not exist", d.Get("net_id").(int))
+
+	req := flipgroup.CreateRequest{
+		Name:       d.Get("name").(string),
+		NetType:    d.Get("net_type").(string),
+		ClientType: d.Get("client_type").(string),
+		AccountID:  uint64(d.Get("account_id").(int)),
+		NetID:      uint64(d.Get("net_id").(int)),
 	}
-	req.NetID = uint64(d.Get("net_id").(int))
-	
+
 	if IP, ok := d.GetOk("ip"); ok {
 		req.IP = IP.(string)
 	}
 	if description, ok := d.GetOk("desc"); ok {
 		req.Description = description.(string)
 	}
-	
+
 	resp, err := c.CloudBroker().FLIPGroup().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}

 	d.SetId(fmt.Sprint(resp.ID))
+	d.Set("flipgroup_id", resp.ID)

 	var warnings dc.Warnings

@@ -102,14 +92,26 @@ func resourceFlipgroupCreate(ctx context.Context, d *schema.ResourceData, m inte
 }

 func resourceFlipgroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceFlipgroupRead: called for flipgroup_id %s, name %s",
+		d.Id(), d.Get("name").(string))
+
 	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}

+	switch fg.Status {
+	case status.Destroyed:
+		d.SetId("")
+		return diag.Errorf("The flipgroup status is destroyed and cannot be read.")
+	}
+
 	flattenFlipgroup(d, fg)

+	log.Debugf("resourceFlipgroupRead: after flattenFlipgroup: flipgroup_id %s, name %s",
+		d.Id(), d.Get("name").(string))
+
 	return nil
 }

@@ -117,19 +119,8 @@ func resourceFlipgroupUpdate(ctx context.Context, d *schema.ResourceData, m inte
 	log.Debugf("resourceFlipgroupUpdate called with id: %v", d.Get("flipgroup_id").(int))
 	c := m.(*controller.ControllerCfg)

-	haveAccount, err := existAccountID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	if !haveAccount {
-		return diag.Errorf("resourceFlipgroupUpdate: can't update Flipgroup because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-	}
-		haveVINS, err := existNetID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	if !haveVINS {
-		return diag.Errorf("resourceFlipgroupUpdate: can't update Flipgroup because VinsID %d is not allowed or does not exist", d.Get("net_id").(int))
+	if diags := checkParamsExistence(ctx, d, c); diags != nil {
+		return diags
 	}

 	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
@@ -138,6 +129,12 @@ func resourceFlipgroupUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		return diag.FromErr(err)
 	}

+	switch fg.Status {
+	case status.Destroyed:
+		d.SetId("")
+		return diag.Errorf("The flipgroup status is destroyed and cannot be updated.")
+	}
+
 	var warnings dc.Warnings
 	basicUpdate := false
 	req := flipgroup.EditRequest{FLIPGroupID: fg.ID}
@@ -172,6 +169,7 @@ func resourceFlipgroupDelete(ctx context.Context, d *schema.ResourceData, m inte

 	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}

@@ -179,163 +177,16 @@ func resourceFlipgroupDelete(ctx context.Context, d *schema.ResourceData, m inte
 		FLIPGroupID: fg.ID,
 	}

+	// When FLIPGroup().Delete() is executed, flipgroup automatically is removed from the compute it has been attached to, if any.
+	// No need to specifically call for FlipGroup().ComputeRemove().
 	_, err = c.CloudBroker().FLIPGroup().Delete(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}

-	return nil
-}
+	d.SetId("")

-func resourceFlipgroupSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "Account ID",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "Flipgroup name",
-		},
-		"net_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "EXTNET or ViNS ID",
-		},
-		"net_type": {
-			Type:         schema.TypeString,
-			Required:     true,
-			ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, true),
-			Description:  "Network type, EXTNET or VINS",
-		},
-		"client_type": {
-			Type:         schema.TypeString,
-			Required:     true,
-			Description:  "Type of client, 'compute' ('vins' will be later)",
-			ValidateFunc: validation.StringInSlice([]string{"compute"}, true),
-		},
-		"ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "IP address to associate with this group. If empty, the platform will autoselect IP address",
-		},
-		"desc": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "Text description of this Flipgroup instance",
-		},
-		"client_ids": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "List of clients attached to this Flipgroup instance",
-		},
-		"client_names": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "client_names",
-		},
-		"account_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "account_name",
-		},
-		"flipgroup_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"conn_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"conn_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "created_by",
-		},
-		"created_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "created_time",
-		},
-		"default_gw": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "deleted_by",
-		},
-		"deleted_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "deleted_time",
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"network": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "network",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "rg_id",
-		},
-		"rg_name": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "rg_name",
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "updated_by",
-		},
-		"updated_time": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "updated_time",
-		},
-		"net_mask": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
+	return nil
 }

 func ResourceFlipgroup() *schema.Resource {
--- a/internal/service/cloudbroker/flipgroup/utility_flipgroup.go
+++ b/internal/service/cloudbroker/flipgroup/utility_flipgroup.go
@@ -46,6 +46,7 @@ import (
 )

 func utilityFlipgroupCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*flipgroup.RecordFLIPGroup, error) {
+	log.Debugf("utilityFlipgroupCheckPresence")
 	c := m.(*controller.ControllerCfg)
 	req := flipgroup.GetRequest{}

@@ -56,7 +57,6 @@ func utilityFlipgroupCheckPresence(ctx context.Context, d *schema.ResourceData,
 		req.FLIPGroupID = uint64(d.Get("flipgroup_id").(int))
 	}

-	log.Debugf("utilityDiskCheckPresence: load disk")
 	flipgroup, err := c.CloudBroker().FLIPGroup().Get(ctx, req)
 	if err != nil {
 		return nil, err