From f3e5de6561c9c0da0bb8214f426ab25d3b5612ce Mon Sep 17 00:00:00 2001 From: Arseniy Volkov Date: Mon, 15 Jun 2026 12:46:03 +0400 Subject: [PATCH] 4.9.11 --- CHANGELOG.md | 8 ++--- Makefile | 2 +- docs/index.md | 2 +- .../service/cloudbroker/flipgroup/flattens.go | 30 +++++++++++++++++++ .../flipgroup/resource_flipgroup.go | 5 ++-- 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a47f6267..175f059a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -## Version 4.9.10 +## Version 4.9.11 -### Добавлено +### Исправлено -#### kvmvm +#### flipgroup | Идентификатор
задачи | Описание | | --- | --- | -| BATF-1270 | Опциональное поле `iotune` в блоке `disks` в resource `decort_kvmvm` в cloudapi/kvmvm и в resource `decort_cb_kvmvm` в cloudbroker/kvmvm | \ No newline at end of file +| BATF-1283 | Установка поля `desc` с платформы в ресурсе `decort_cb_flipgroup` в cloudbroker/flipgroup | \ No newline at end of file diff --git a/Makefile b/Makefile index f05a3363..241ff891 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ ZIPDIR = ./zip BINARY=${NAME} WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} MAINPATH = ./cmd/decort/ -VERSION=4.9.10 +VERSION=4.9.11 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) FILES = ${BINARY}_${VERSION}_darwin_amd64\ diff --git a/docs/index.md b/docs/index.md index d324b72b..4865f24e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -18,7 +18,6 @@ description: |- ### Required - `authenticator` (String) Authentication mode to use when connecting to DECORT cloud API. Should be one of 'decs3o', 'legacy', 'jwt' or 'bvs'. -- `controller_url` (String) URL of DECORT Cloud controller to use. API calls will be directed to this URL. ### Optional @@ -27,6 +26,7 @@ description: |- - `app_secret` (String) Application secret to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode. - `bvs_password` (String) User password for DECORT cloud API operations in 'bvs' authentication mode. - `bvs_user` (String) User name for DECORT cloud API operations in 'bvs' authentication mode. +- `controller_url` (String) URL of DECORT Cloud controller to use. API calls will be directed to this URL. - `domain` (String) User password for DECORT cloud API operations in 'bvs' authentication mode. - `jwt` (String) JWT to access DECORT cloud API in 'jwt' authentication mode. - `oauth2_url` (String) OAuth2 application URL in 'decs3o' and 'bvs' authentication mode. diff --git a/internal/service/cloudbroker/flipgroup/flattens.go b/internal/service/cloudbroker/flipgroup/flattens.go index 4c35c5cb..a5b32f82 100644 --- a/internal/service/cloudbroker/flipgroup/flattens.go +++ b/internal/service/cloudbroker/flipgroup/flattens.go @@ -70,6 +70,36 @@ func flattenFlipgroup(d *schema.ResourceData, flip *flipgroup.RecordFLIPGroup) { d.Set("updated_time", flip.UpdatedTime) } +func flattenFlipgroupResource(d *schema.ResourceData, flip *flipgroup.RecordFLIPGroup) { + d.Set("flipgroup_id", flip.ID) + d.Set("account_id", flip.AccountID) + d.Set("account_name", flip.AccountName) + d.Set("client_ids", flip.ClientIDs) + d.Set("client_names", flip.ClientNames) + d.Set("client_type", flip.ClientType) + d.Set("conn_id", flip.ConnID) + d.Set("conn_type", flip.ConnType) + d.Set("created_by", flip.CreatedBy) + d.Set("created_time", flip.CreatedTime) + d.Set("default_gw", flip.DefaultGW) + d.Set("deleted_by", flip.DeletedBy) + d.Set("deleted_time", flip.DeletedTime) + d.Set("description", flip.Description) + d.Set("gid", flip.GID) + d.Set("guid", flip.GUID) + d.Set("ip", flip.IP) + d.Set("milestones", flip.Milestones) + d.Set("name", flip.Name) + d.Set("net_id", flip.NetID) + d.Set("net_type", flip.NetType) + d.Set("network", flip.Network) + d.Set("rg_id", flip.RGID) + d.Set("rg_name", flip.RGName) + d.Set("status", flip.Status) + d.Set("updated_by", flip.UpdatedBy) + d.Set("updated_time", flip.UpdatedTime) +} + func flattenFlipgroupsList(fg *flipgroup.ListFLIPGroups) []map[string]interface{} { res := make([]map[string]interface{}, 0, len(fg.Data)) for _, flip := range fg.Data { diff --git a/internal/service/cloudbroker/flipgroup/resource_flipgroup.go b/internal/service/cloudbroker/flipgroup/resource_flipgroup.go index efbaf100..059bd634 100644 --- a/internal/service/cloudbroker/flipgroup/resource_flipgroup.go +++ b/internal/service/cloudbroker/flipgroup/resource_flipgroup.go @@ -37,6 +37,7 @@ package flipgroup import ( "context" "fmt" + "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/flipgroup" @@ -107,9 +108,9 @@ func resourceFlipgroupRead(ctx context.Context, d *schema.ResourceData, m interf return diag.Errorf("The flipgroup status is destroyed and cannot be read.") } - flattenFlipgroup(d, fg) + flattenFlipgroupResource(d, fg) - log.Debugf("resourceFlipgroupRead: after flattenFlipgroup: flipgroup_id %s, name %s", + log.Debugf("resourceFlipgroupRead: after flattenFlipgroupResource: flipgroup_id %s, name %s", d.Id(), d.Get("name").(string)) return nil