network and subnet updated, create_router default is true, connect_to_network_router default is true. Docs updated.

Author: Alexandr Sokolov

docs/resources/gcore_baremetal.md

@@ -49,7 +49,7 @@ resource "gcore_baremetal" "bm" {
 ### Required
 
 - **flavor_id** (String)
-- **interface** (Block Set, Min: 1) (see [below for nested schema](#nestedblock--interface))
+- **interface** (Block List, Min: 1) (see [below for nested schema](#nestedblock--interface))
 
 ### Optional
 

docs/resources/gcore_cdn_resource.md

@@ -3,12 +3,12 @@
 page_title: "gcore_cdn_resource Resource - terraform-provider-gcorelabs"
 subcategory: ""
 description: |-
-  Represent cdn resource
+  Represent CDN resource
 ---
 
 # gcore_cdn_resource (Resource)
 
-Represent cdn resource
+Represent CDN resource
 
 ## Example Usage
 

docs/resources/gcore_instance.md

@@ -173,7 +173,7 @@ resource "gcore_instance" "v" {
 ### Required
 
 - **flavor_id** (String)
-- **interface** (Block Set, Min: 1) (see [below for nested schema](#nestedblock--interface))
+- **interface** (Block List, Min: 1) (see [below for nested schema](#nestedblock--interface))
 - **volume** (Block Set, Min: 1) (see [below for nested schema](#nestedblock--volume))
 
 ### Optional

docs/resources/gcore_network.md

@@ -38,6 +38,7 @@ resource "gcore_network" "network" {
 
 ### Optional
 
+- **create_router** (Boolean) Create external router to the network, default true
 - **id** (String) The ID of this resource.
 - **last_updated** (String)
 - **mtu** (Number)

docs/resources/gcore_subnet.md

@@ -60,7 +60,7 @@ resource "gcore_subnet" "subnet" {
 
 ### Optional
 
-- **connect_to_network_router** (Boolean)
+- **connect_to_network_router** (Boolean) True if the network's router should get a gateway in this subnet. Must be explicitly 'false' when gateway_ip is null. Default true.
 - **dns_nameservers** (List of String)
 - **enable_dhcp** (Boolean)
 - **gateway_ip** (String)

gcore/resource_gcore_network.go

@@ -91,7 +91,9 @@ func resourceNetwork() *schema.Resource {
 			"create_router": &schema.Schema{
 				Type:        schema.TypeBool,
 				Optional:    true,
-				Description: "Create external router to the network, default false",
+				ForceNew:    true,
+				Default:     true,
+				Description: "Create external router to the network, default true",
 			},
 			"last_updated": &schema.Schema{
 				Type:     schema.TypeString,
@@ -113,21 +115,14 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
-	var createRouter bool
-	//for backwards compatibility
-	if createRouterValue, ok := d.GetOk("create_router"); !ok {
-		createRouter = true
-	} else {
-		createRouter = createRouterValue.(bool)
-	}
-
 	createOpts := networks.CreateOpts{
 		Name:         d.Get("name").(string),
 		Mtu:          d.Get("mtu").(int),
 		Type:         d.Get("type").(string),
-		CreateRouter: createRouter,
+		CreateRouter: d.Get("create_router").(bool),
 	}
 
+	log.Printf("Create network ops: %+v", createOpts)
 	results, err := networks.Create(client, createOpts).Extract()
 	if err != nil {
 		return diag.FromErr(err)
@@ -184,6 +179,9 @@ func resourceNetworkRead(ctx context.Context, d *schema.ResourceData, m interfac
 	d.Set("region_id", network.RegionID)
 	d.Set("project_id", network.ProjectID)
 
+	fields := []string{"create_router"}
+	revertState(d, &fields)
+
 	log.Println("[DEBUG] Finish network reading")
 	return diags
 }

gcore/resource_gcore_subnet.go

@@ -93,8 +93,11 @@ func resourceSubnet() *schema.Resource {
 				Required: true,
 			},
 			"connect_to_network_router": &schema.Schema{
-				Type:     schema.TypeBool,
-				Optional: true,
+				Type:        schema.TypeBool,
+				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,
@@ -192,14 +195,15 @@ func resourceSubnetCreate(ctx context.Context, d *schema.ResourceData, m interfa
 	createOpts.EnableDHCP = d.Get("enable_dhcp").(bool)
 	createOpts.NetworkID = d.Get("network_id").(string)
 	createOpts.ConnectToNetworkRouter = d.Get("connect_to_network_router").(bool)
-	gateway_ip := d.Get("gateway_ip").(string)
-	gw := net.ParseIP(gateway_ip)
-	if gateway_ip == "disable" {
+	gatewayIP := d.Get("gateway_ip").(string)
+	gw := net.ParseIP(gatewayIP)
+	if gatewayIP == "disable" {
 		createOpts.ConnectToNetworkRouter = false
 	} else {
 		createOpts.GatewayIP = &gw
 	}
 
+	log.Printf("Create subnet ops: %+v", createOpts)
 	results, err := subnets.Create(client, createOpts).Extract()
 	if err != nil {
 		return diag.FromErr(err)