0.3.10 (#78)

* network resource create_router ForceNew removed
subnet resource connect_network_to_router ForceNew removed
some fix in securitygroup resource to improve plan

* ignore_creds_auth_error DefaultFunc fixed

Co-authored-by: Alexandr Sokolov <[email protected]>

Author: alexk53

examples/resources/gcore_lblistener/resource.tf

@@ -10,11 +10,6 @@ resource "gcore_loadbalancer" "lb" {
   region_id = 1
   name = "test"
   flavor = "lb1-1-2"
-  listener {
-    name = "test"
-    protocol = "HTTP"
-    protocol_port = 80
-  }
 
   listener {
     name = "test3"

gcore/provider.go

@@ -49,12 +49,14 @@ func Provider() *schema.Provider {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Description: "Should be set to true when you are gonna to use storage resource with permanent API-token only.",
-				DefaultFunc: schema.EnvDefaultFunc("GCORE_PERMANENT_TOKEN", false),
+				DefaultFunc: func() (interface{}, error) {
+					return os.Getenv("GCORE_PERMANENT_TOKEN") != "", nil
+				},
 			},
 			"gcore_platform": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Platform ulr is used for generate jwt",
+				Description: "Platform url is used for generate jwt",
 				DefaultFunc: schema.EnvDefaultFunc("GCORE_PLATFORM", "https://api.gcdn.co"),
 			},
 			"gcore_api": {

gcore/resource_gcore_network.go

@@ -91,7 +91,6 @@ func resourceNetwork() *schema.Resource {
 			"create_router": &schema.Schema{
 				Type:        schema.TypeBool,
 				Optional:    true,
-				ForceNew:    true,
 				Default:     true,
 				Description: "Create external router to the network, default true",
 			},

gcore/resource_gcore_securitygroup.go

@@ -131,20 +131,24 @@ func resourceSecurityGroup() *schema.Resource {
 						"port_range_min": &schema.Schema{
 							Type:             schema.TypeInt,
 							Optional:         true,
+							Default:          0,
 							ValidateDiagFunc: validatePortRange,
 						},
 						"port_range_max": &schema.Schema{
 							Type:             schema.TypeInt,
 							Optional:         true,
+							Default:          0,
 							ValidateDiagFunc: validatePortRange,
 						},
 						"description": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
+							Default:  "",
 						},
 						"remote_ip_prefix": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
+							Default:  "",
 						},
 						"updated_at": &schema.Schema{
 							Type:     schema.TypeString,
@@ -266,6 +270,7 @@ func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m in
 
 	newSgRules := make([]interface{}, len(sg.SecurityGroupRules))
 	for i, sgr := range sg.SecurityGroupRules {
+		log.Printf("rules: %+v", sgr)
 		r := make(map[string]interface{})
 		r["id"] = sgr.ID
 		r["direction"] = sgr.Direction.String()
@@ -274,10 +279,9 @@ func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m in
 			r["ethertype"] = sgr.EtherType.String()
 		}
 
+		r["protocol"] = types.ProtocolAny
 		if sgr.Protocol != nil {
 			r["protocol"] = sgr.Protocol.String()
-		} else {
-			r["protocol"] = types.ProtocolAny
 		}
 
 		r["port_range_max"] = 0
@@ -296,7 +300,7 @@ func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, m in
 
 		r["remote_ip_prefix"] = ""
 		if sgr.RemoteIPPrefix != nil {
-			r["remote_ip_prefix"] = strings.TrimSuffix(*sgr.RemoteIPPrefix, "/32")
+			r["remote_ip_prefix"] = *sgr.RemoteIPPrefix
 		}
 
 		r["updated_at"] = sgr.UpdatedAt.String()

gcore/resource_gcore_subnet.go

@@ -97,7 +97,6 @@ func resourceSubnet() *schema.Resource {
 				Description: "True if the network's router should get a gateway in this subnet. Must be explicitly 'false' when gateway_ip is null. Default true.",
 				Optional:    true,
 				Default:     true,
-				ForceNew:    true,
 			},
 			"dns_nameservers": &schema.Schema{
 				Type:     schema.TypeList,

gcore/utils.go

@@ -582,7 +582,7 @@ func secGroupUniqueID(i interface{}) int {
 	io.WriteString(h, strconv.Itoa(e["port_range_min"].(int)))
 	io.WriteString(h, strconv.Itoa(e["port_range_max"].(int)))
 	io.WriteString(h, e["description"].(string))
-	io.WriteString(h, strings.TrimSuffix(e["remote_ip_prefix"].(string), "/32"))
+	io.WriteString(h, e["remote_ip_prefix"].(string))
 
 	return int(binary.BigEndian.Uint64(h.Sum(nil)))
 }
@@ -609,10 +609,8 @@ func extractSecurityGroupRuleMap(r interface{}, gid string) securitygroups.Creat
 		opts.PortRangeMax = &maxP
 	}
 
-	descr := rule["description"].(string)
-	if descr != "" {
-		opts.Description = &descr
-	}
+	descr, _ := rule["description"].(string)
+	opts.Description = &descr
 
 	remoteIPPrefix := rule["remote_ip_prefix"].(string)
 	if remoteIPPrefix != "" {

go.mod

@@ -9,8 +9,7 @@ require (
 	github.com/G-Core/gcorelabscloud-go v0.4.42
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-exec v0.15.0 // indirect
-	github.com/hashicorp/terraform-plugin-docs v0.5.1 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mattn/go-colorable v0.1.11 // indirect
 	github.com/mitchellh/mapstructure v1.4.1
 	github.com/zclconf/go-cty v1.10.0 // indirect