Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error on "nameResolution.dnsForwarding.siteIpv4/siteIpv6 is not a valid IP address." #340

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Fix error on "nameResolution.dnsForwarding.siteIpv4/siteIpv6 is not a valid IP address." #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
742af92
Add explicit empty string check for dns_forwarding.site_ipv4 and site…
mandopaloooza Nov 27, 2023
b9e43a2
site.name_resolution.dns_forwarding requires at least site_ipv4 or si…
mandopaloooza Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions appgate/resource_appgate_site.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,6 +1221,9 @@ func readSiteNameResolutionFromConfig(currentVersion *version.Version, nameresol
}
result.SetDnsForwarding(dnsForwardingResolvers)
}
if dnsForwardingResolvers.SiteIpv4 == nil && dnsForwardingResolvers.SiteIpv6 == nil {
return result, errors.New("either site_ipv4 or site_ipv6 must be set")
}
}
if currentVersion.GreaterThanOrEqual(Appliance61Version) {
if v, ok := raw["illumio_resolvers"]; ok {
Expand Down Expand Up @@ -1445,10 +1448,10 @@ func readDNSForwardingResolversFromConfig(currentVersion *version.Version, dnsFo
result := openapi.SiteAllOfNameResolutionDnsForwarding{}
for _, dnsForwarding := range dnsForwardingConfig {
raw := dnsForwarding.(map[string]interface{})
if v, ok := raw["site_ipv4"]; ok {
if v, ok := raw["site_ipv4"]; ok && v != "" {
result.SetSiteIpv4(v.(string))
}
if v, ok := raw["site_ipv6"]; ok {
if v, ok := raw["site_ipv6"]; ok && v != "" {
result.SetSiteIpv6(v.(string))
}
if v, ok := raw["dns_servers"]; ok {
Expand Down
100 changes: 100 additions & 0 deletions appgate/resource_appgate_site_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,3 +2545,103 @@ resource "appgatesdp_site" "test_site" {
}
`
}

func TestAccSiteBasic3(t *testing.T) {
resourceName := "appgatesdp_site.test_site"
rName := RandStringFromCharSet(10, CharSetAlphaNum)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckSiteDestroy,
Steps: []resource.TestStep{
{
Config: testAccCheckSite3(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckSiteExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "default_gateway.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.enabled_v4", "false"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.enabled_v6", "false"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.excluded_subnets.#", "0"),
resource.TestCheckResourceAttr(resourceName, "entitlement_based_routing", "false"),
resource.TestCheckResourceAttr(resourceName, "ip_pool_mappings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "network_subnets.#", "1"),
resource.TestCheckResourceAttr(resourceName, "network_subnets.0", "10.0.0.0/16"),
resource.TestCheckResourceAttr(resourceName, "notes", "This object has been created for test purposes."),
resource.TestCheckResourceAttr(resourceName, "vpn.#", "1"),
resource.TestCheckResourceAttr(resourceName, "vpn.0.snat", "false"),
resource.TestCheckResourceAttr(resourceName, "vpn.0.state_sharing", "false"),
),
},
{
Config: testAccCheckSite3Updated(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckSiteExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "default_gateway.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.enabled_v4", "false"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.enabled_v6", "false"),
resource.TestCheckResourceAttr(resourceName, "default_gateway.0.excluded_subnets.#", "0"),
resource.TestCheckResourceAttr(resourceName, "entitlement_based_routing", "false"),
resource.TestCheckResourceAttr(resourceName, "ip_pool_mappings.#", "0"),
resource.TestCheckResourceAttr(resourceName, "name", rName),
resource.TestCheckResourceAttr(resourceName, "network_subnets.#", "1"),
resource.TestCheckResourceAttr(resourceName, "network_subnets.0", "10.0.0.0/16"),
resource.TestCheckResourceAttr(resourceName, "notes", "This object has been created for test purposes."),
resource.TestCheckResourceAttr(resourceName, "vpn.#", "1"),
resource.TestCheckResourceAttr(resourceName, "vpn.0.snat", "false"),
resource.TestCheckResourceAttr(resourceName, "vpn.0.state_sharing", "false"),
resource.TestCheckResourceAttr(resourceName, "name_resolution.0.dns_forwarding.0.allow_destinations.#", "1"),
resource.TestCheckResourceAttr(resourceName, "name_resolution.0.dns_forwarding.0.allow_destinations.0.%", "2"),
resource.TestCheckResourceAttr(resourceName, "name_resolution.0.dns_forwarding.0.allow_destinations.0.address", "1.1.1.1"),
resource.TestCheckResourceAttr(resourceName, "name_resolution.0.dns_forwarding.0.allow_destinations.0.netmask", "32"),
resource.TestCheckResourceAttr(resourceName, "name_resolution.0.dns_forwarding.0.site_ipv4", "192.168.1.1"),
),
},
},
})
}

func testAccCheckSite3(rName string) string {
return fmt.Sprintf(`
resource "appgatesdp_site" "test_site" {
name = "%s"
network_subnets = [
"10.0.0.0/16"
]
notes = "This object has been created for test purposes."
vpn {
state_sharing = false
snat = false
}
}
`, rName)
}

func testAccCheckSite3Updated(rName string) string {
return fmt.Sprintf(`
resource "appgatesdp_site" "test_site" {
name = "%s"
network_subnets = [
"10.0.0.0/16"
]
notes = "This object has been created for test purposes."
vpn {
state_sharing = false
snat = false
}
name_resolution {
dns_forwarding {
default_ttl_seconds = 300
site_ipv4 = "192.168.1.1"
dns_servers = [
"1.1.1.1"
]
allow_destinations {
address = "1.1.1.1"
netmask = 32
}
}
}
}
`, rName)
}
Loading