Skip to content

Commit

Permalink
Adds IPsec tunnel health_check_direction & health_check_rate paramete…
Browse files Browse the repository at this point in the history
…rs to cloudflare_ipsec_tunnel
  • Loading branch information
Christian Ehrig committed Feb 8, 2024
1 parent 928091e commit faab84c
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/3112.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
cloudflare_ipsec_tunnel: Adds IPsec tunnel health_check_direction & health_check_rate parameters
```
2 changes: 2 additions & 0 deletions docs/resources/ipsec_tunnel.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ resource "cloudflare_ipsec_tunnel" "example" {
- `health_check_enabled` (Boolean) Specifies if ICMP tunnel health checks are enabled. Default: `true`.
- `health_check_target` (String) The IP address of the customer endpoint that will receive tunnel health checks. Default: `<customer_gre_endpoint>`.
- `health_check_type` (String) Specifies the ICMP echo type for the health check (`request` or `reply`). Available values: `request`, `reply` Default: `reply`.
- `health_check_direction` (String) Specifies the direction for the health check (`unidirectional` or `bidirectional`). Available values: `unidirectional`, `bidirectional` Default: `unidirectional`.
- `health_check_rate` (String) Specifies the ICMP rate for the health check (`low`, `mid` or `high`). Available values: `low`, `mid`, `high` Default: `mid`.
- `hex_id` (String) `remote_id` as a hex string. This value is generated by cloudflare.
- `psk` (String, Sensitive) Pre shared key to be used with the IPsec tunnel. If left unset, it will be autogenerated.
- `remote_id` (String) ID to be used while setting up the IPsec tunnel. This value is generated by cloudflare.
Expand Down
42 changes: 42 additions & 0 deletions internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ func resourceCloudflareIPsecTunnelRead(ctx context.Context, d *schema.ResourceDa
d.Set("health_check_enabled", tunnel.HealthCheck.Enabled)
d.Set("health_check_target", tunnel.HealthCheck.Target)
d.Set("health_check_type", tunnel.HealthCheck.Type)
d.Set("health_check_direction", tunnel.HealthCheck.Direction)

Check failure on line 103 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / test

tunnel.HealthCheck.Direction undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)

Check failure on line 103 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Direction undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)

Check failure on line 103 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Direction undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)

Check failure on line 103 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Direction undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)
d.Set("health_check_rate", tunnel.HealthCheck.Rate)

Check failure on line 104 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / test

tunnel.HealthCheck.Rate undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)

Check failure on line 104 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Rate undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)

Check failure on line 104 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Rate undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)

Check failure on line 104 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

tunnel.HealthCheck.Rate undefined (type *cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)
d.Set("allow_null_cipher", tunnel.AllowNullCipher)

// Set Remote Identities
Expand Down Expand Up @@ -176,5 +178,45 @@ func IPsecTunnelFromResource(d *schema.ResourceData) cloudflare.MagicTransitIPse
tunnel.AllowNullCipher = allowNullCipher.(bool)
}

healthcheck := IPsecTunnelHealthcheckFromResource(d)
if healthcheck != nil {
tunnel.HealthCheck = healthcheck
}

return tunnel
}

func IPsecTunnelHealthcheckFromResource(d *schema.ResourceData) *cloudflare.MagicTransitTunnelHealthcheck {
healthcheck := cloudflare.MagicTransitTunnelHealthcheck{}

healthcheckEnabled, healthcheckEnabledOk := d.GetOk("health_check_enabled")
if healthcheckEnabledOk {
healthcheck.Enabled = healthcheckEnabled.(bool)
}

healthcheckTarget, healthcheckTargetOk := d.GetOk("health_check_target")
if healthcheckTargetOk {
healthcheck.Target = healthcheckTarget.(string)
}

healthcheckType, healthcheckTypeOk := d.GetOk("health_check_type")
if healthcheckTypeOk {
healthcheck.Type = healthcheckType.(string)
}

healthcheckDirection, healthcheckDirectionOk := d.GetOk("health_check_direction")
if healthcheckDirectionOk {
healthcheck.Direction = healthcheckDirection.(string)

Check failure on line 209 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / test

healthcheck.Direction undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)

Check failure on line 209 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

healthcheck.Direction undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)

Check failure on line 209 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

healthcheck.Direction undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Direction)
}

healthcheckRate, healthcheckRateOk := d.GetOk("health_check_rate")
if healthcheckRateOk {
healthcheck.Rate = healthcheckRate.(string)

Check failure on line 214 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / test

healthcheck.Rate undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)

Check failure on line 214 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

healthcheck.Rate undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)

Check failure on line 214 in internal/sdkv2provider/resource_cloudflare_ipsec_tunnel.go

View workflow job for this annotation

GitHub Actions / tfproviderlint (ubuntu-latest)

healthcheck.Rate undefined (type cloudflare.MagicTransitTunnelHealthcheck has no field or method Rate)
}

if healthcheckEnabledOk || healthcheckTargetOk || healthcheckTypeOk || healthcheckDirectionOk || healthcheckRateOk {
return &healthcheck
}

return nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func TestAccCloudflareIPsecTunnelExists(t *testing.T) {
resource.TestCheckResourceAttr(name, "health_check_enabled", "true"),
resource.TestCheckResourceAttr(name, "health_check_target", "203.0.113.1"),
resource.TestCheckResourceAttr(name, "health_check_type", "request"),
resource.TestCheckResourceAttr(name, "health_check_direction", "unidirectional"),
resource.TestCheckResourceAttr(name, "health_check_rate", "mid"),
resource.TestCheckResourceAttr(name, "psk", "asdf1234"),
resource.TestCheckResourceAttr(name, "allowNullCipher", "false"),
),
Expand Down Expand Up @@ -147,6 +149,8 @@ func testAccCheckCloudflareIPsecTunnelSimple(ID, description, accountID, psk str
health_check_enabled = true
health_check_target = "203.0.113.1"
health_check_type = "request"
health_check_direction = "unidirectional"
health_check_rate = "mid"
psk = "%[4]s"
allow_null_cipher = false
}`, ID, description, accountID, psk)
Expand Down
14 changes: 14 additions & 0 deletions internal/sdkv2provider/schema_cloudflare_ipsec_tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ func resourceCloudflareIPsecTunnelSchema() map[string]*schema.Schema {
ValidateFunc: validation.StringInSlice([]string{"request", "reply"}, false),
Description: fmt.Sprintf("Specifies the ICMP echo type for the health check (`request` or `reply`). %s Default: `reply`.", renderAvailableDocumentationValuesStringSlice([]string{"request", "reply"})),
},
"health_check_direction": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{"unidirectional", "bidirectional"}, false),
Description: fmt.Sprintf("Specifies the direction for the health check (`unidirectional` or `bidirectional`). %s Default: `unidirectional`.", renderAvailableDocumentationValuesStringSlice([]string{"unidirectional", "bidirectional"})),
},
"health_check_rate": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice([]string{"low", "mid", "high"}, false),
Description: fmt.Sprintf("Specifies the ICMP rate for the health check (`low`, `mid` or `high`). %s Default: `mid`.", renderAvailableDocumentationValuesStringSlice([]string{"low", "mid", "high"})),
},
"psk": {
Type: schema.TypeString,
Optional: true,
Expand Down

0 comments on commit faab84c

Please sign in to comment.