feat(network) add dhcp property, default true (#1211)

Author: cgoetz-inovex

docs/data-sources/network.md

@@ -33,6 +33,7 @@ data "stackit_network" "example" {
 
 ### Read-Only
 
+- `dhcp` (Boolean) Shows if DHCP is enabled for the network.
 - `id` (String) Terraform's internal resource ID. It is structured as "`project_id`,`network_id`".
 - `ipv4_gateway` (String) The IPv4 gateway of a network. If not specified, the first IP of the network will be assigned as the gateway.
 - `ipv4_nameservers` (List of String) The IPv4 nameservers of the network.

docs/resources/network.md

@@ -64,6 +64,7 @@ import {
 
 ### Optional
 
+- `dhcp` (Boolean) If the network has DHCP enabled. Default value is `true`.
 - `ipv4_gateway` (String) The IPv4 gateway of a network. If not specified, the first IP of the network will be assigned as the gateway.
 - `ipv4_nameservers` (List of String) The IPv4 nameservers of the network.
 - `ipv4_prefix` (String) The IPv4 prefix of the network (CIDR).

stackit/internal/services/iaas/iaas_acc_test.go

@@ -286,6 +286,7 @@ var testConfigNetworkVarsMax = config.Variables{
 	"label":                config.StringVariable("label"),
 	"organization_id":      config.StringVariable(testutil.OrganizationId),
 	"service_account_mail": config.StringVariable(testutil.TestProjectServiceAccountEmail),
+	"dhcp":                 config.BoolVariable(true),
 }
 
 var testConfigNetworkVarsMaxUpdated = func() config.Variables {
@@ -295,6 +296,7 @@ var testConfigNetworkVarsMaxUpdated = func() config.Variables {
 	updatedConfig["ipv4_gateway"] = config.StringVariable("")
 	updatedConfig["ipv4_nameserver_0"] = config.StringVariable("10.2.2.10")
 	updatedConfig["label"] = config.StringVariable("updated")
+	updatedConfig["dhcp"] = config.BoolVariable(false)
 	return updatedConfig
 }()
 
@@ -656,6 +658,7 @@ func TestAccNetworkMin(t *testing.T) {
 					resource.TestCheckResourceAttrSet("stackit_network.network", "public_ip"),
 					resource.TestCheckResourceAttrSet("stackit_network.network", "region"),
 					resource.TestCheckNoResourceAttr("stackit_network.network", "routing_table_id"),
+					resource.TestCheckResourceAttr("stackit_network.network", "dhcp", "true"),
 				),
 			},
 			// Data source
@@ -682,6 +685,7 @@ func TestAccNetworkMin(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.stackit_network.network", "public_ip"),
 					resource.TestCheckResourceAttrSet("data.stackit_network.network", "region"),
 					resource.TestCheckNoResourceAttr("data.stackit_network.network", "routing_table_id"),
+					resource.TestCheckResourceAttr("stackit_network.network", "dhcp", "true"),
 				),
 			},
 
@@ -710,6 +714,7 @@ func TestAccNetworkMin(t *testing.T) {
 					resource.TestCheckResourceAttrSet("stackit_network.network", "public_ip"),
 					resource.TestCheckResourceAttrSet("stackit_network.network", "region"),
 					resource.TestCheckNoResourceAttr("stackit_network.network", "routing_table_id"),
+					resource.TestCheckResourceAttr("stackit_network.network", "dhcp", "true"),
 				),
 			},
 			// Update
@@ -725,6 +730,7 @@ func TestAccNetworkMin(t *testing.T) {
 					resource.TestCheckResourceAttrSet("stackit_network.network", "public_ip"),
 					resource.TestCheckResourceAttrSet("stackit_network.network", "region"),
 					resource.TestCheckNoResourceAttr("stackit_network.network", "routing_table_id"),
+					resource.TestCheckResourceAttr("stackit_network.network", "dhcp", "true"),
 				),
 			},
 			// Deletion is done by the framework implicitly
@@ -762,6 +768,7 @@ func TestAccNetworkMax(t *testing.T) {
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "routed", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["routed"])),
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "labels.acc-test", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["label"])),
 					resource.TestCheckResourceAttrSet("stackit_network.network_prefix", "public_ip"),
+					resource.TestCheckResourceAttr("stackit_network.network_prefix", "dhcp", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["dhcp"])),
 
 					// Network with prefix_length
 					resource.TestCheckResourceAttrSet("stackit_network.network_prefix_length", "network_id"),
@@ -848,6 +855,7 @@ func TestAccNetworkMax(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.stackit_network.network_prefix", "ipv6_prefixes.#"),
 					resource.TestCheckResourceAttr("data.stackit_network.network_prefix", "routed", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["routed"])),
 					resource.TestCheckResourceAttr("data.stackit_network.network_prefix", "labels.acc-test", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["label"])),
+					resource.TestCheckResourceAttr("data.stackit_network.network_prefix", "dhcp", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["dhcp"])),
 
 					// Network with prefix_length
 					resource.TestCheckResourceAttrSet("data.stackit_network.network_prefix_length", "network_id"),
@@ -931,6 +939,7 @@ func TestAccNetworkMax(t *testing.T) {
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "ipv4_prefixes.#", "1"),
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "ipv4_prefixes.0", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["ipv4_prefix"])),
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "routed", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["routed"])),
+					resource.TestCheckResourceAttr("stackit_network.network_prefix", "dhcp", testutil.ConvertConfigVariable(testConfigNetworkVarsMax["dhcp"])),
 				),
 			},
 			{
@@ -998,6 +1007,7 @@ func TestAccNetworkMax(t *testing.T) {
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "routed", testutil.ConvertConfigVariable(testConfigNetworkVarsMaxUpdated["routed"])),
 					resource.TestCheckResourceAttr("stackit_network.network_prefix", "labels.acc-test", testutil.ConvertConfigVariable(testConfigNetworkVarsMaxUpdated["label"])),
 					resource.TestCheckResourceAttrSet("stackit_network.network_prefix", "public_ip"),
+					resource.TestCheckResourceAttr("stackit_network.network_prefix", "dhcp", testutil.ConvertConfigVariable(testConfigNetworkVarsMaxUpdated["dhcp"])),
 
 					resource.TestCheckResourceAttrSet("stackit_network.network_prefix_length", "network_id"),
 					resource.TestCheckResourceAttrPair(

stackit/internal/services/iaas/network/datasource.go

@@ -48,6 +48,7 @@ type DataSourceModel struct {
 	Routed           types.Bool   `tfsdk:"routed"`
 	Region           types.String `tfsdk:"region"`
 	RoutingTableID   types.String `tfsdk:"routing_table_id"`
+	DHCP             types.Bool   `tfsdk:"dhcp"`
 }
 
 // NewNetworkDataSource is a helper function to simplify the provider implementation.
@@ -198,6 +199,10 @@ func (d *networkDataSource) Schema(_ context.Context, _ datasource.SchemaRequest
 					validate.NoSeparator(),
 				},
 			},
+			"dhcp": schema.BoolAttribute{
+				Description: "Shows if DHCP is enabled for the network.",
+				Computed:    true,
+			},
 		},
 	}
 }
@@ -397,6 +402,7 @@ func mapDataSourceFields(ctx context.Context, networkResp *iaas.Network, model *
 	model.Labels = labels
 	model.Routed = types.BoolPointerValue(networkResp.Routed)
 	model.Region = types.StringValue(region)
+	model.DHCP = types.BoolPointerValue(networkResp.Dhcp)
 
 	return nil
 }

stackit/internal/services/iaas/network/datasource_test.go

@@ -98,6 +98,7 @@ func TestMapDataSourceFields(t *testing.T) {
 					"key": "value",
 				},
 				Routed: utils.Ptr(true),
+				Dhcp:   utils.Ptr(true),
 			},
 			testRegion,
 			DataSourceModel{
@@ -141,6 +142,7 @@ func TestMapDataSourceFields(t *testing.T) {
 				IPv4Gateway: types.StringValue("gateway"),
 				IPv6Gateway: types.StringValue("gateway"),
 				Region:      types.StringValue(testRegion),
+				DHCP:        types.BoolValue(true),
 			},
 			true,
 		},

stackit/internal/services/iaas/network/resource.go

@@ -14,6 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
@@ -71,6 +72,7 @@ type Model struct {
 	NoIPv6Gateway    types.Bool   `tfsdk:"no_ipv6_gateway"`
 	Region           types.String `tfsdk:"region"`
 	RoutingTableID   types.String `tfsdk:"routing_table_id"`
+	DHCP             types.Bool   `tfsdk:"dhcp"`
 }
 
 // NewNetworkResource is a helper function to simplify the provider implementation.
@@ -378,6 +380,15 @@ func (r *networkResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 					stringplanmodifier.RequiresReplaceIfConfigured(),
 				},
 			},
+			"dhcp": schema.BoolAttribute{
+				Optional:    true,
+				Computed:    true,
+				Description: "If the network has DHCP enabled. Default value is `true`.",
+				Default:     booldefault.StaticBool(true),
+				PlanModifiers: []planmodifier.Bool{
+					boolplanmodifier.UseStateForUnknown(),
+				},
+			},
 		},
 	}
 }
@@ -747,6 +758,7 @@ func mapFields(ctx context.Context, networkResp *iaas.Network, model *Model, reg
 	model.Labels = labels
 	model.Routed = types.BoolPointerValue(networkResp.Routed)
 	model.Region = types.StringValue(region)
+	model.DHCP = types.BoolPointerValue(networkResp.Dhcp)
 
 	return nil
 }
@@ -862,6 +874,7 @@ func toCreatePayload(ctx context.Context, model *Model) (*iaas.CreateNetworkPayl
 		Ipv4:           ipv4Body,
 		Ipv6:           ipv6Body,
 		RoutingTableId: conversion.StringValueToPointer(model.RoutingTableID),
+		Dhcp:           conversion.BoolValueToPointer(model.DHCP),
 	}
 
 	return &payload, nil
@@ -944,6 +957,7 @@ func toUpdatePayload(ctx context.Context, model, stateModel *Model) (*iaas.Parti
 		Ipv4:           ipv4Body,
 		Ipv6:           ipv6Body,
 		RoutingTableId: conversion.StringValueToPointer(model.RoutingTableID),
+		Dhcp:           conversion.BoolValueToPointer(model.DHCP),
 	}
 
 	return &payload, nil

stackit/internal/services/iaas/network/resource_test.go

@@ -90,6 +90,7 @@ func TestMapFields(t *testing.T) {
 					"key": "value",
 				},
 				Routed: utils.Ptr(true),
+				Dhcp:   utils.Ptr(true),
 			},
 			testRegion,
 			Model{
@@ -133,6 +134,7 @@ func TestMapFields(t *testing.T) {
 				IPv4Gateway: types.StringValue("gateway"),
 				IPv6Gateway: types.StringValue("gateway"),
 				Region:      types.StringValue(testRegion),
+				DHCP:        types.BoolValue(true),
 			},
 			true,
 		},
@@ -403,6 +405,7 @@ func TestToCreatePayload(t *testing.T) {
 				Routed:      types.BoolValue(false),
 				IPv4Gateway: types.StringValue("gateway"),
 				IPv4Prefix:  types.StringValue("prefix"),
+				DHCP:        types.BoolValue(true),
 			},
 			&iaas.CreateNetworkPayload{
 				Name: utils.Ptr("name"),
@@ -420,6 +423,7 @@ func TestToCreatePayload(t *testing.T) {
 					"key": "value",
 				},
 				Routed: utils.Ptr(false),
+				Dhcp:   utils.Ptr(true),
 			},
 			true,
 		},
@@ -588,6 +592,7 @@ func TestToUpdatePayload(t *testing.T) {
 				}),
 				Routed:      types.BoolValue(true),
 				IPv4Gateway: types.StringValue("gateway"),
+				DHCP:        types.BoolValue(true),
 			},
 			Model{
 				ProjectId: types.StringValue("pid"),
@@ -606,6 +611,7 @@ func TestToUpdatePayload(t *testing.T) {
 				Labels: &map[string]interface{}{
 					"key": "value",
 				},
+				Dhcp: utils.Ptr(true),
 			},
 			true,
 		},

stackit/internal/services/iaas/testdata/resource-network-max.tf

@@ -8,6 +8,7 @@ variable "ipv4_prefix_length" {}
 variable "routed" {}
 variable "label" {}
 variable "service_account_mail" {}
+variable "dhcp" {}
 
 # no test candidate, just needed for the testing setup
 resource "stackit_network_area" "network_area" {
@@ -57,6 +58,7 @@ resource "stackit_network" "network_prefix" {
   labels = {
     "acc-test" : var.label
   }
+  dhcp = var.dhcp
 
   depends_on = [stackit_network_area_region.network_area_region]
 }