4.12.0

internal/service/cloudbroker/zone/data_source_zone.go

@@ -150,6 +150,50 @@ func dataSourceZoneSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"drs": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"drs_uid": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"drs_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"sso_url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"app_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"decort_url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"domain": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ping_addr": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"broadcast_addr": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ssl_skip_verify": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"sso_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 	}
 }
 

internal/service/cloudbroker/zone/data_source_zone_list.go

@@ -158,6 +158,50 @@ func dataSourceZoneListSchemaMake() map[string]*schema.Schema {
 							Type: schema.TypeInt,
 						},
 					},
+					"drs": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"drs_uid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"drs_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"sso_url": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"app_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"decort_url": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"domain": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ping_addr": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"broadcast_addr": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ssl_skip_verify": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"sso_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 				},
 			},
 		},

internal/service/cloudbroker/zone/flattens.go

@@ -60,6 +60,17 @@ func flattenZone(d *schema.ResourceData, item *zone.RecordZone) error {
 	d.Set("bservice_ids", item.BserviceIDs)
 	d.Set("k8s_ids", item.K8SIDs)
 	d.Set("auto_start", item.AutoStart)
+	d.Set("drs", item.DRS)
+	d.Set("drs_uid", item.DRSUID)
+	d.Set("drs_name", item.DRSName)
+	d.Set("sso_url", item.SSOURL)
+	d.Set("app_id", item.AppID)
+	d.Set("decort_url", item.DecortURL)
+	d.Set("ping_addr", item.PingAddr)
+	d.Set("broadcast_addr", item.BroadcastAddr)
+	d.Set("ssl_skip_verify", item.SSLSkipVerify)
+	d.Set("domain", item.Domain)
+	d.Set("sso_type", item.SSOType)
 
 	log.Debugf("flattenZone: decoded RecordZone name %q / ID %d, complete",
 		item.Name, item.ID)
@@ -71,17 +82,28 @@ func flattenZoneList(zone *zone.ListZones) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(zone.Data))
 	for _, zone := range zone.Data {
 		temp := map[string]interface{}{
-			"zone_id":      int(zone.ID),
-			"guid":         int(zone.GUID),
-			"gid":          int(zone.GID),
-			"name":         zone.Name,
-			"description":  zone.Description,
-			"deletable":    zone.Deletable,
-			"status":       zone.Status,
-			"created_time": zone.CreatedTime,
-			"updated_time": zone.UpdatedTime,
-			"node_ids":     zone.NodeIDs,
-			"auto_start":   zone.AutoStart,
+			"zone_id":         int(zone.ID),
+			"guid":            int(zone.GUID),
+			"gid":             int(zone.GID),
+			"name":            zone.Name,
+			"description":     zone.Description,
+			"deletable":       zone.Deletable,
+			"status":          zone.Status,
+			"created_time":    zone.CreatedTime,
+			"updated_time":    zone.UpdatedTime,
+			"node_ids":        zone.NodeIDs,
+			"auto_start":      zone.AutoStart,
+			"drs":             zone.DRS,
+			"drs_uid":         zone.DRSUID,
+			"drs_name":        zone.DRSName,
+			"sso_url":         zone.SSOURL,
+			"app_id":          zone.AppID,
+			"decort_url":      zone.DecortURL,
+			"ping_addr":       zone.PingAddr,
+			"broadcast_addr":  zone.BroadcastAddr,
+			"ssl_skip_verify": zone.SSLSkipVerify,
+			"domain":          zone.Domain,
+			"sso_type":        zone.SSOType,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/zone/resource_zone.go

@@ -64,6 +64,10 @@ func resourceZoneCreate(ctx context.Context, d *schema.ResourceData, m interface
 		req.Description = desc.(string)
 	}
 
+	if drs, ok := d.GetOkExists("drs"); ok {
+		req.DRS = drs.(bool)
+	}
+
 	zoneID, err := c.CloudBroker().Zone().Create(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
@@ -202,6 +206,51 @@ func resourceZoneSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"drs": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
+		"drs_uid": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"drs_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"sso_url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"app_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"decort_url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"domain": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ping_addr": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"broadcast_addr": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ssl_skip_verify": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"sso_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"zone_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudbroker/zone/utility_zone.go

@@ -1,159 +1,159 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package zone
-
-import (
-	"context"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/zone"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func utilityZoneCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*zone.RecordZone, error) {
-	c := m.(*controller.ControllerCfg)
-	req := zone.GetRequest{}
-
-	if d.Id() != "" {
-		zoneId, _ := strconv.ParseUint(d.Id(), 10, 64)
-		req.ID = zoneId
-	} else {
-		req.ID = uint64(d.Get("zone_id").(int))
-	}
-
-	zoneData, err := c.CloudBroker().Zone().Get(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return zoneData, nil
-}
-
-func utilityZoneUpdate(ctx context.Context, d *schema.ResourceData, m interface{}, zoneID uint64) error {
-	c := m.(*controller.ControllerCfg)
-
-	if d.HasChanges("name", "description", "auto_start") {
-		req := zone.UpdateRequest{
-			ID: zoneID,
-		}
-
-		if d.HasChange("name") {
-			req.Name = d.Get("name").(string)
-		}
-		if d.HasChange("description") {
-			req.Description = d.Get("description").(string)
-		}
-
-		if d.HasChange("auto_start") {
-			req.AutoStart = d.Get("auto_start").(bool)
-		}
-
-		_, err := c.CloudBroker().Zone().Update(ctx, req)
-		if err != nil {
-			return err
-		}
-		log.Debugf("utilityZoneUpdate: update zone with ID: %d, complete with params=%v", zoneID, req)
-	}
-
-	addedNodes := make([]interface{}, 0)
-	removedNodes := make([]interface{}, 0)
-
-	old_set, new_set := d.GetChange("node_ids")
-	oldSlice := old_set.([]interface{})
-	newSlice := new_set.([]interface{})
-
-	for _, oldElem := range oldSlice {
-		if !containsNodes(newSlice, oldElem) {
-			removedNodes = append(removedNodes, oldElem)
-		}
-	}
-
-	for _, newElem := range newSlice {
-		if !containsNodes(oldSlice, newElem) {
-			addedNodes = append(addedNodes, newElem)
-		}
-	}
-
-	log.Debugf("Found node_ids change with %v deletion(s) and %v addition(s) [zoneID=%v]", len(removedNodes), len(addedNodes), zoneID)
-
-	if len(addedNodes) > 0 {
-
-		addedUint := make([]uint64, len(addedNodes))
-		for i, v := range addedNodes {
-			addedUint[i] = uint64(v.(int))
-		}
-
-		req := zone.AddNodeRequest{
-			ID:      zoneID,
-			NodeIDs: addedUint,
-		}
-		if _, err := c.CloudBroker().Zone().AddNode(ctx, req); err != nil {
-			return err
-		}
-
-	}
-
-	if len(removedNodes) > 0 {
-		removedUint := make([]uint64, len(removedNodes))
-		for i, v := range removedNodes {
-			removedUint[i] = uint64(v.(int))
-		}
-
-		req := zone.DelNodeRequest{
-			ID:      zoneID,
-			NodeIDs: removedUint,
-		}
-		log.Debug("del")
-		log.Debug(req.NodeIDs)
-		if _, err := c.CloudBroker().Zone().DelNode(ctx, req); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func containsNodes(set []interface{}, check interface{}) bool {
-	for _, elem := range set {
-		elemConv := elem.(int)
-		checkConv := check.(int)
-		if elemConv == checkConv {
-			return true
-		}
-	}
-
-	return false
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package zone
+
+import (
+	"context"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/zone"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+)
+
+func utilityZoneCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*zone.RecordZone, error) {
+	c := m.(*controller.ControllerCfg)
+	req := zone.GetRequest{}
+
+	if d.Id() != "" {
+		zoneId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		req.ID = zoneId
+	} else {
+		req.ID = uint64(d.Get("zone_id").(int))
+	}
+
+	zoneData, err := c.CloudBroker().Zone().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return zoneData, nil
+}
+
+func utilityZoneUpdate(ctx context.Context, d *schema.ResourceData, m interface{}, zoneID uint64) error {
+	c := m.(*controller.ControllerCfg)
+
+	if d.HasChanges("name", "description", "auto_start") {
+		req := zone.UpdateRequest{
+			ID: zoneID,
+		}
+
+		if d.HasChange("name") {
+			req.Name = d.Get("name").(string)
+		}
+		if d.HasChange("description") {
+			req.Description = d.Get("description").(string)
+		}
+
+		if d.HasChange("auto_start") {
+			req.AutoStart = d.Get("auto_start").(bool)
+		}
+
+		_, err := c.CloudBroker().Zone().Update(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityZoneUpdate: update zone with ID: %d, complete with params=%v", zoneID, req)
+	}
+
+	addedNodes := make([]interface{}, 0)
+	removedNodes := make([]interface{}, 0)
+
+	old_set, new_set := d.GetChange("node_ids")
+	oldSlice := old_set.([]interface{})
+	newSlice := new_set.([]interface{})
+
+	for _, oldElem := range oldSlice {
+		if !containsNodes(newSlice, oldElem) {
+			removedNodes = append(removedNodes, oldElem)
+		}
+	}
+
+	for _, newElem := range newSlice {
+		if !containsNodes(oldSlice, newElem) {
+			addedNodes = append(addedNodes, newElem)
+		}
+	}
+
+	log.Debugf("Found node_ids change with %v deletion(s) and %v addition(s) [zoneID=%v]", len(removedNodes), len(addedNodes), zoneID)
+
+	if len(addedNodes) > 0 {
+
+		addedUint := make([]uint64, len(addedNodes))
+		for i, v := range addedNodes {
+			addedUint[i] = uint64(v.(int))
+		}
+
+		req := zone.AddNodeRequest{
+			ID:      zoneID,
+			NodeIDs: addedUint,
+		}
+		if _, err := c.CloudBroker().Zone().AddNode(ctx, req); err != nil {
+			return err
+		}
+
+	}
+
+	if len(removedNodes) > 0 {
+		removedUint := make([]uint64, len(removedNodes))
+		for i, v := range removedNodes {
+			removedUint[i] = uint64(v.(int))
+		}
+
+		req := zone.DelNodeRequest{
+			ID:      zoneID,
+			NodeIDs: removedUint,
+		}
+		log.Debug("del")
+		log.Debug(req.NodeIDs)
+		if _, err := c.CloudBroker().Zone().DelNode(ctx, req); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func containsNodes(set []interface{}, check interface{}) bool {
+	for _, elem := range set {
+		elemConv := elem.(int)
+		checkConv := check.(int)
+		if elemConv == checkConv {
+			return true
+		}
+	}
+
+	return false
+}

internal/service/cloudbroker/zone/utility_zone_list.go

@@ -1,85 +1,85 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package zone
-
-import (
-	"context"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/zone"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityZoneListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*zone.ListZones, error) {
-	c := m.(*controller.ControllerCfg)
-	req := zone.ListRequest{}
-
-	if byId, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(byId.(int))
-	}
-	if gid, ok := d.GetOk("gid"); ok {
-		req.GID = uint64(gid.(int))
-	}
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-	if description, ok := d.GetOk("description"); ok {
-		req.Description = description.(string)
-	}
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-	if deletable, ok := d.GetOk("deletable"); ok {
-		req.Deletable = deletable.(bool)
-	}
-	if nodeID, ok := d.GetOk("nodeId"); ok {
-		req.NodeID = uint64(nodeID.(int))
-	}
-	if sortBy, ok := d.GetOk("sort_by"); ok {
-		req.SortBy = sortBy.(string)
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	zoneList, err := c.CloudBroker().Zone().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return zoneList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package zone
+
+import (
+	"context"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/zone"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityZoneListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*zone.ListZones, error) {
+	c := m.(*controller.ControllerCfg)
+	req := zone.ListRequest{}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+	if gid, ok := d.GetOk("gid"); ok {
+		req.GID = uint64(gid.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if description, ok := d.GetOk("description"); ok {
+		req.Description = description.(string)
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if deletable, ok := d.GetOk("deletable"); ok {
+		req.Deletable = deletable.(bool)
+	}
+	if nodeID, ok := d.GetOk("nodeId"); ok {
+		req.NodeID = uint64(nodeID.(int))
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	zoneList, err := c.CloudBroker().Zone().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return zoneList, nil
+}