New resource and datasource vcd_nsxt_edgegateway_dns for DNS configuration management

.changes/v3.11.0/1154-features.md

@@ -0,0 +1,2 @@
+* **New Resource:** `vcd_nsxt_edgegateway_dns` to manage Edge Gateway DNS forwarder configuration [GH-1154]
+* **New Data Source:** `vcd_nsxt_edgegateway_dns` to read Edge Gateway DNS forwarder configuration [GH-1154]

go.mod

@@ -65,3 +65,5 @@ require (
 	google.golang.org/grpc v1.57.1 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 )
+
+replace github.com/vmware/go-vcloud-director/v2 => github.com/adezxc/go-vcloud-director/v2 v2.20.0-alpha.15.0.20231117001919-7a6e0e6c5b34

go.sum

@@ -3,6 +3,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs=
 github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ=
+github.com/adezxc/go-vcloud-director/v2 v2.20.0-alpha.15.0.20231117001919-7a6e0e6c5b34 h1:WT+eXET/RjXASZXqbWZJXOqHIMnBoRUk7p7Z9HKCQrw=
+github.com/adezxc/go-vcloud-director/v2 v2.20.0-alpha.15.0.20231117001919-7a6e0e6c5b34/go.mod h1:QPxGFgrUcSyzy9IlpwDE4UNT3tsOy2047tJOPEJ4nlw=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
@@ -124,8 +126,6 @@ github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/vmware/go-vcloud-director/v2 v2.22.0-alpha.11 h1:Q71HXQSRSKKf5gcKGHQKvldFRyiOO7MpLJOaIIKCosg=
-github.com/vmware/go-vcloud-director/v2 v2.22.0-alpha.11/go.mod h1:QPxGFgrUcSyzy9IlpwDE4UNT3tsOy2047tJOPEJ4nlw=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc=

vcd/datasource_not_found_test.go

@@ -250,8 +250,8 @@ func addMandatoryParams(dataSourceName string, mandatoryFields []string, t *test
 		if (dataSourceName == "vcd_nsxt_edgegateway_bgp_configuration" || dataSourceName == "vcd_nsxt_alb_settings" ||
 			dataSourceName == "vcd_nsxt_edgegateway_rate_limiting" || dataSourceName == "vcd_nsxt_edgegateway_dhcp_forwarding" ||
 			dataSourceName == "vcd_nsxt_firewall" || dataSourceName == "vcd_nsxt_route_advertisement" ||
-			dataSourceName == "vcd_nsxt_edgegateway_dhcpv6") &&
-			mandatoryFields[fieldIndex] == "edge_gateway_id" {
+			// #nosec G101 -- not a credential
+			dataSourceName == "vcd_nsxt_edgegateway_dhcpv6") || dataSourceName == "vcd_nsxt_edgegateway_dns" && mandatoryFields[fieldIndex] == "edge_gateway_id" {
 			// injecting fake Edge Gateway ID
 			templateFields = templateFields + `edge_gateway_id = "urn:vcloud:gateway:784feb3d-87e4-4905-202a-bfe9faa5476f"` + "\n"
 			return templateFields

vcd/datasource_vcd_nsxt_edgegateway_dns.go

@@ -0,0 +1,120 @@
+package vcd
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func datasourceVcdNsxtEdgeGatewayDns() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: datasourceVcdNsxtEdgeGatewayDnsRead,
+		Schema: map[string]*schema.Schema{
+			"org": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Description: "The name of organization to use, optional if defined at provider " +
+					"level. Useful when connected as sysadmin working across different organizations",
+			},
+			"edge_gateway_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Edge gateway ID for DNS configuration",
+			},
+			"enabled": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "Status of the DNS Forwarder.",
+			},
+			"listener_ip": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "IP on which the DNS forwarder listens.",
+			},
+			"snat_rule_enabled": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "The value is `true` if a SNAT rule exists for the DNS forwarder.",
+			},
+			"snat_rule_ip_address": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The external IP address of the SNAT rule. (VCD 10.5.0+)",
+			},
+			"default_forwarder_zone": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "The default forwarder zone.",
+				Elem:        defaultForwarderZoneDS,
+			},
+			"conditional_forwarder_zone": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: "Conditional forwarder zone",
+				Elem:        conditionalForwarderZoneDS,
+			},
+		},
+	}
+}
+
+var defaultForwarderZoneDS = &schema.Resource{
+	Schema: map[string]*schema.Schema{
+		"id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Unique ID of the forwarder zone.",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Name of the forwarder zone.",
+		},
+		"upstream_servers": {
+			Type:        schema.TypeSet,
+			Computed:    true,
+			Description: "Servers to which DNS requests should be forwarded to.",
+			Elem: &schema.Schema{
+				Type:         schema.TypeString,
+				ValidateFunc: validation.IsIPAddress,
+			},
+		},
+	},
+}
+
+var conditionalForwarderZoneDS = &schema.Resource{
+	Schema: map[string]*schema.Schema{
+		"id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Unique ID of the forwarder zone.",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Name of the forwarder zone.",
+		},
+		"upstream_servers": {
+			Type:        schema.TypeSet,
+			Computed:    true,
+			Description: "Servers to which DNS requests should be forwarded to.",
+			Elem: &schema.Schema{
+				Type:         schema.TypeString,
+				ValidateFunc: validation.IsIPAddress,
+			},
+		},
+		"domain_names": {
+			Type:        schema.TypeSet,
+			Computed:    true,
+			Description: "Set of domain names on which conditional forwarding is based.",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+	},
+}
+
+func datasourceVcdNsxtEdgeGatewayDnsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	return genericVcdNsxtEdgegatewayDnsRead(ctx, d, meta, "datasource")
+}

vcd/provider.go

@@ -150,6 +150,7 @@ var globalDataSourceMap = map[string]*schema.Resource{
 	"vcd_nsxt_global_default_segment_profile_template": datasourceVcdGlobalDefaultSegmentProfileTemplate(),     // 3.11
 	"vcd_org_vdc_nsxt_network_profile":                 datasourceVcdNsxtOrgVdcNetworkProfile(),                // 3.11
 	"vcd_nsxt_network_segment_profile":                 datasourceVcdNsxtOrgVdcNetworkSegmentProfileTemplate(), // 3.11
+	"vcd_nsxt_edgegateway_dns":                         datasourceVcdNsxtEdgeGatewayDns(),                      // 3.11
 }
 
 var globalResourceMap = map[string]*schema.Resource{
@@ -257,6 +258,7 @@ var globalResourceMap = map[string]*schema.Resource{
 	"vcd_org_vdc_nsxt_network_profile":                 resourceVcdNsxtOrgVdcNetworkProfile(),                // 3.11
 	"vcd_nsxt_network_segment_profile":                 resourceVcdNsxtOrgVdcNetworkSegmentProfileTemplate(), // 3.11
 	"vcd_network_pool":                                 resourceVcdNetworkPool(),                             // 3.11
+	"vcd_nsxt_edgegateway_dns":                         resourceVcdNsxtEdgeGatewayDns(),                      // 3.11
 }
 
 // Provider returns a terraform.ResourceProvider.