updated id computation for pfw

decort/data_source_compute.go

@@ -263,7 +263,7 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 	d.Set("rg_name", model.RgName)
 	d.Set("account_id", model.AccountID)
 	d.Set("account_name", model.AccountName)
-	d.Set("arch", model.Arch)
+	d.Set("driver", model.Driver)
 	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
@@ -367,7 +367,7 @@ func dataSourceCompute() *schema.Resource {
 				Description: "Name of the account this compute instance belongs to.",
 			},
 
-			"arch": {
+			"driver": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "Hardware architecture of this compute instance.",

decort/models_api.go

@@ -356,6 +356,7 @@ type ComputeGetResp struct {
 	Cpu                int               `json:"cpus"`
 	Desc               string            `json:"desc"`
 	Disks              []DiskRecord      `json:"disks"`
+	Driver             string            `json:"driver"`
 	GridID             int               `json:"gid"`
 	ID                 uint              `json:"id"`
 	ImageID            int               `json:"imageId"`

decort/osusers_subresource.go

@@ -27,9 +27,9 @@ import (
 func parseOsUsers(logins []OsUserRecord) []interface{} {
 	var result = make([]interface{}, len(logins))
 
-	elem := make(map[string]interface{})
-
 	for index, value := range logins {
+		elem := make(map[string]interface{})
+
 		elem["guid"] = value.Guid
 		elem["login"] = value.Login
 		elem["password"] = value.Password

decort/provider.go

@@ -103,7 +103,7 @@ func Provider() *schema.Provider {
 			"decort_kvmvm":    resourceCompute(),
 			"decort_disk":     resourceDisk(),
 			"decort_vins":     resourceVins(),
-			// "decort_pfw": resourcePfw(),
+			"decort_pfw":      resourcePfw(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

decort/resource_pfw.go

@@ -0,0 +1,202 @@
+/*
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Petr Krutov, <petr.krutov@digitalenergy.online>
+
+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.
+*/
+
+/*
+This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
+Technology platfom.
+
+Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
+*/
+
+package decort
+
+import (
+	"fmt"
+	"net/url"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	log "github.com/sirupsen/logrus"
+)
+
+func resourcePfwCreate(d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourcePfwCreate: called for compute %d", d.Get("compute_id").(int))
+
+	controller := m.(*ControllerCfg)
+	urlValues := &url.Values{}
+	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
+	urlValues.Add("publicPortStart", strconv.Itoa(d.Get("public_port_start").(int)))
+	urlValues.Add("localBasePort", strconv.Itoa(d.Get("local_base_port").(int)))
+	urlValues.Add("proto", d.Get("proto").(string))
+
+	if portEnd, ok := d.GetOk("public_port_end"); ok {
+		urlValues.Add("publicPortEnd", strconv.Itoa(portEnd.(int)))
+	}
+
+	pfwId, err := controller.decortAPICall("POST", ComputePfwAddAPI, urlValues)
+	if err != nil {
+		return err
+	}
+
+	d.SetId(fmt.Sprintf("%d-%s", d.Get("compute_id").(int), pfwId))
+
+	pfw, err := utilityPfwCheckPresence(d, m)
+	if err != nil {
+		return err
+	}
+
+	d.Set("local_ip", pfw.LocalIP)
+	if _, ok := d.GetOk("public_port_end"); !ok {
+		d.Set("public_port_end", pfw.PublicPortEnd)
+	}
+
+	return nil
+}
+
+func resourcePfwRead(d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourcePfwRead: called for compute %d, rule %s", d.Get("compute_id").(int), d.Id())
+
+	pfw, err := utilityPfwCheckPresence(d, m)
+	if pfw == nil {
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+
+	d.Set("compute_id", pfw.ComputeID)
+	d.Set("public_port_start", pfw.PublicPortStart)
+	d.Set("public_port_end", pfw.PublicPortEnd)
+	d.Set("local_ip", pfw.LocalIP)
+	d.Set("local_base_port", pfw.LocalPort)
+	d.Set("proto", pfw.Protocol)
+
+	return nil
+}
+
+func resourcePfwDelete(d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourcePfwDelete: called for compute %d, rule %s", d.Get("compute_id").(int), d.Id())
+
+	pfw, err := utilityPfwCheckPresence(d, m)
+	if pfw == nil {
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+
+	controller := m.(*ControllerCfg)
+	urlValues := &url.Values{}
+	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
+	urlValues.Add("ruleId", d.Id())
+
+	_, err = controller.decortAPICall("POST", ComputePfwDelAPI, urlValues)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func resourcePfwExists(d *schema.ResourceData, m interface{}) (bool, error) {
+	log.Debugf("resourcePfwExists: called for compute %d, rule %s", d.Get("compute_id").(int), d.Id())
+
+	pfw, err := utilityPfwCheckPresence(d, m)
+	if pfw == nil {
+		if err != nil {
+			return false, err
+		}
+		return false, nil
+	}
+
+	return true, nil
+}
+
+func resourcePfwSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"compute_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			ForceNew:    true,
+			Description: "ID of compute instance.",
+		},
+
+		"public_port_start": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.IntBetween(1, 65535),
+			Description:  "External start port number for the rule.",
+		},
+
+		"public_port_end": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.IntBetween(1, 65535),
+			Description:  "End port number (inclusive) for the ranged rule.",
+		},
+
+		"local_ip": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "IP address of compute instance.",
+		},
+
+		"local_base_port": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.IntBetween(1, 65535),
+			Description:  "Internal base port number.",
+		},
+
+		"proto": {
+			Type:         schema.TypeString,
+			Required:     true,
+			ForceNew:     true,
+			ValidateFunc: validation.StringInSlice([]string{"tcp", "udp"}, false),
+			Description:  "Network protocol, either 'tcp' or 'udp'.",
+		},
+	}
+}
+
+func resourcePfw() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		Create: resourcePfwCreate,
+		Read:   resourcePfwRead,
+		Delete: resourcePfwDelete,
+		Exists: resourcePfwExists,
+
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &Timeout60s,
+			Read:    &Timeout30s,
+			Update:  &Timeout60s,
+			Delete:  &Timeout60s,
+			Default: &Timeout60s,
+		},
+
+		Schema: resourcePfwSchemaMake(),
+	}
+}

decort/utility_pfw.go

@@ -0,0 +1,44 @@
+package decort
+
+import (
+	"encoding/json"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func utilityPfwCheckPresence(d *schema.ResourceData, m interface{}) (*PfwRecord, error) {
+	controller := m.(*ControllerCfg)
+	urlValues := &url.Values{}
+
+	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
+	resp, err := controller.decortAPICall("POST", ComputePfwListAPI, urlValues)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp == "" {
+		return nil, nil
+	}
+
+	idS := strings.Split(d.Id(), "-")[1]
+	id, err := strconv.Atoi(idS)
+	if err != nil {
+		return nil, err
+	}
+
+	var pfws []PfwRecord
+	if err := json.Unmarshal([]byte(resp), &pfws); err != nil {
+		return nil, err
+	}
+
+	for _, pfw := range pfws {
+		if pfw.ID == id {
+			return &pfw, nil
+		}
+	}
+
+	return nil, nil
+}

docs/data-sources/kvmvm.md

@@ -29,12 +29,12 @@ description: |-
 
 - **account_id** (Number) ID of the account this compute instance belongs to.
 - **account_name** (String) Name of the account this compute instance belongs to.
-- **arch** (String) Hardware architecture of this compute instance.
 - **boot_disk_id** (Number) This compute instance boot disk ID.
 - **boot_disk_size** (Number) This compute instance boot disk size in GB.
 - **cloud_init** (String) Placeholder for cloud_init parameters.
 - **cpu** (Number) Number of CPUs allocated for this compute instance.
 - **description** (String) User-defined text description of this compute instance.
+- **driver** (String) Hardware architecture of this compute instance.
 - **extra_disks** (Set of Number) IDs of the extra disk(s) attached to this compute.
 - **image_id** (Number) ID of the OS image this compute instance is based on.
 - **image_name** (String) Name of the OS image this compute instance is based on.

docs/resources/pfw.md

@@ -0,0 +1,46 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_pfw Resource - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_pfw (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **compute_id** (Number) ID of compute instance.
+- **local_base_port** (Number) Internal base port number.
+- **proto** (String) Network protocol, either 'tcp' or 'udp'.
+- **public_port_start** (Number) External start port number for the rule.
+
+### Optional
+
+- **id** (String) The ID of this resource.
+- **public_port_end** (Number) End port number (inclusive) for the ranged rule.
+- **timeouts** (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- **local_ip** (String) IP address of compute instance.
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- **create** (String)
+- **default** (String)
+- **delete** (String)
+- **read** (String)
+- **update** (String)
+
+