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

azurerm_container_app - Support for additional settings in liveness_probe, startup_probe and readiness_probe #26573

Closed
wants to merge 3 commits into from
Closed

azurerm_container_app - Support for additional settings in liveness_probe, startup_probe and readiness_probe #26573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f0f3c0
Support for additional settings in container apps for liveness_probe,…
SpartakusMd Jul 8, 2024
fb8692c
add flatten / expand logic
SpartakusMd Jul 8, 2024
ce30625
fix field name
SpartakusMd Jul 8, 2024
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
4 changes: 4 additions & 0 deletions internal/services/containerapps/container_app_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2176,6 +2176,7 @@ resource "azurerm_container_app" "test" {
transport = "HTTP"
port = 5000
path = "/uptime"
initial_delay = 5
timeout = 2
failure_count_threshold = 1
success_count_threshold = 1
Expand All @@ -2199,13 +2200,16 @@ resource "azurerm_container_app" "test" {
initial_delay = 5
timeout = 2
failure_count_threshold = 3
success_count_threshold = 1
}

startup_probe {
transport = "TCP"
port = 5000
initial_delay = 5
timeout = 5
failure_count_threshold = 1
success_count_threshold = 1
}

volume_mounts {
Expand Down
110 changes: 89 additions & 21 deletions internal/services/containerapps/helpers/container_apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,7 @@ type ContainerAppReadinessProbe struct {
Port int64 `tfschema:"port"`
Path string `tfschema:"path"`
Headers []HttpHeader `tfschema:"header"`
InitialDelay int64 `tfschema:"initial_delay"`
Interval int64 `tfschema:"interval_seconds"`
Timeout int64 `tfschema:"timeout"`
FailureThreshold int64 `tfschema:"failure_count_threshold"`
Expand Down Expand Up @@ -1799,6 +1800,14 @@ func ContainerAppReadinessProbeSchema() *pluginsdk.Schema {
},
},

"initial_delay": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 0,
ValidateFunc: validation.IntBetween(0, 60),
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `0` seconds.",
},

"interval_seconds": {
Type: pluginsdk.TypeInt,
Optional: true,
Expand All @@ -1819,8 +1828,8 @@ func ContainerAppReadinessProbeSchema() *pluginsdk.Schema {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 3,
ValidateFunc: validation.IntBetween(1, 10),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
ValidateFunc: validation.IntBetween(1, 30),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Expand Down Expand Up @@ -1885,6 +1894,12 @@ func ContainerAppReadinessProbeSchemaComputed() *pluginsdk.Schema {
},
},

"initial_delay": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `0` seconds.",
},

"interval_seconds": {
Type: pluginsdk.TypeInt,
Computed: true,
Expand All @@ -1900,7 +1915,7 @@ func ContainerAppReadinessProbeSchemaComputed() *pluginsdk.Schema {
"failure_count_threshold": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Expand All @@ -1916,11 +1931,12 @@ func ContainerAppReadinessProbeSchemaComputed() *pluginsdk.Schema {
func expandContainerAppReadinessProbe(input ContainerAppReadinessProbe) containerapps.ContainerAppProbe {
probeType := containerapps.TypeReadiness
result := containerapps.ContainerAppProbe{
Type: &probeType,
PeriodSeconds: pointer.To(input.Interval),
TimeoutSeconds: pointer.To(input.Timeout),
FailureThreshold: pointer.To(input.FailureThreshold),
SuccessThreshold: pointer.To(input.SuccessThreshold),
Type: &probeType,
InitialDelaySeconds: pointer.To(input.InitialDelay),
PeriodSeconds: pointer.To(input.Interval),
TimeoutSeconds: pointer.To(input.Timeout),
FailureThreshold: pointer.To(input.FailureThreshold),
SuccessThreshold: pointer.To(input.SuccessThreshold),
}

switch p := strings.ToUpper(input.Transport); p {
Expand Down Expand Up @@ -1957,6 +1973,7 @@ func expandContainerAppReadinessProbe(input ContainerAppReadinessProbe) containe
func flattenContainerAppReadinessProbe(input containerapps.ContainerAppProbe) []ContainerAppReadinessProbe {
result := make([]ContainerAppReadinessProbe, 0)
probe := ContainerAppReadinessProbe{
InitialDelay: pointer.From(input.InitialDelaySeconds),
Interval: pointer.From(input.PeriodSeconds),
Timeout: pointer.From(input.TimeoutSeconds),
FailureThreshold: pointer.From(input.FailureThreshold),
Expand Down Expand Up @@ -2004,6 +2021,7 @@ type ContainerAppLivenessProbe struct {
Interval int64 `tfschema:"interval_seconds"`
Timeout int64 `tfschema:"timeout"`
FailureThreshold int64 `tfschema:"failure_count_threshold"`
SuccessThreshold int64 `tfschema:"success_count_threshold"`
TerminationGracePeriod int64 `tfschema:"termination_grace_period_seconds"`
}

Expand Down Expand Up @@ -2070,8 +2088,8 @@ func ContainerAppLivenessProbeSchema() *pluginsdk.Schema {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 1,
ValidateFunc: validation.IntBetween(1, 60),
Description: "The time in seconds to wait after the container has started before the probe is started.",
ValidateFunc: validation.IntBetween(0, 60),
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `1` seconds.",
},

"interval_seconds": {
Expand All @@ -2094,8 +2112,16 @@ func ContainerAppLivenessProbeSchema() *pluginsdk.Schema {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 3,
ValidateFunc: validation.IntBetween(1, 10),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
ValidateFunc: validation.IntBetween(1, 30),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 1,
ValidateFunc: validation.IntBetween(1, 1),
Description: "The minimum consecutive successes for the probe to be considered healthy after having failed. Defaults to `1`. Must be `1` for liveness and startup Probes. Minimum value is `1`.",
},

"termination_grace_period_seconds": {
Expand Down Expand Up @@ -2161,7 +2187,7 @@ func ContainerAppLivenessProbeSchemaComputed() *pluginsdk.Schema {
"initial_delay": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The time in seconds to wait after the container has started before the probe is started.",
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `1` seconds.",
},

"interval_seconds": {
Expand All @@ -2179,7 +2205,13 @@ func ContainerAppLivenessProbeSchemaComputed() *pluginsdk.Schema {
"failure_count_threshold": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The minimum consecutive successes for the probe to be considered healthy after having failed. Defaults to `1`. Must be `1` for liveness and startup Probes. Minimum value is `1`.",
},

"termination_grace_period_seconds": {
Expand All @@ -2200,6 +2232,7 @@ func expandContainerAppLivenessProbe(input ContainerAppLivenessProbe) containera
PeriodSeconds: pointer.To(input.Interval),
TimeoutSeconds: pointer.To(input.Timeout),
FailureThreshold: pointer.To(input.FailureThreshold),
SuccessThreshold: pointer.To(input.SuccessThreshold),
}

switch p := strings.ToUpper(input.Transport); p {
Expand Down Expand Up @@ -2240,6 +2273,7 @@ func flattenContainerAppLivenessProbe(input containerapps.ContainerAppProbe) []C
Interval: pointer.From(input.PeriodSeconds),
Timeout: pointer.From(input.TimeoutSeconds),
FailureThreshold: pointer.From(input.FailureThreshold),
SuccessThreshold: pointer.From(input.SuccessThreshold),
TerminationGracePeriod: pointer.From(input.TerminationGracePeriodSeconds),
}
if httpGet := input.HTTPGet; httpGet != nil {
Expand Down Expand Up @@ -2279,9 +2313,11 @@ type ContainerAppStartupProbe struct {
Port int64 `tfschema:"port"`
Path string `tfschema:"path"`
Headers []HttpHeader `tfschema:"header"`
InitialDelay int64 `tfschema:"initial_delay"`
Interval int64 `tfschema:"interval_seconds"`
Timeout int64 `tfschema:"timeout"`
FailureThreshold int64 `tfschema:"failure_count_threshold"`
SuccessThreshold int64 `tfschema:"success_count_threshold"`
TerminationGracePeriod int64 `tfschema:"termination_grace_period_seconds"`
}

Expand Down Expand Up @@ -2344,6 +2380,14 @@ func ContainerAppStartupProbeSchema() *pluginsdk.Schema {
},
},

"initial_delay": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 0,
ValidateFunc: validation.IntBetween(0, 60),
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `0` seconds.",
},

"interval_seconds": {
Type: pluginsdk.TypeInt,
Optional: true,
Expand All @@ -2364,8 +2408,16 @@ func ContainerAppStartupProbeSchema() *pluginsdk.Schema {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 3,
ValidateFunc: validation.IntBetween(1, 10),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
ValidateFunc: validation.IntBetween(1, 30),
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: 1,
ValidateFunc: validation.IntBetween(1, 1),
Description: "The minimum consecutive successes for the probe to be considered healthy after having failed. Defaults to 1. Must be 1 for liveness and startup Probes. Minimum value is 1.",
},

"termination_grace_period_seconds": {
Expand Down Expand Up @@ -2424,6 +2476,12 @@ func ContainerAppStartupProbeSchemaComputed() *pluginsdk.Schema {
},
},

"initial_delay": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The number of seconds elapsed after the container has started before liveness or readiness probes are initiated. Possible values are between `0` and `60`. Defaults to `0` seconds.",
},

"interval_seconds": {
Type: pluginsdk.TypeInt,
Computed: true,
Expand All @@ -2439,7 +2497,13 @@ func ContainerAppStartupProbeSchemaComputed() *pluginsdk.Schema {
"failure_count_threshold": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `10`. Defaults to `3`.",
Description: "The number of consecutive failures required to consider this probe as failed. Possible values are between `1` and `30`. Defaults to `3`.",
},

"success_count_threshold": {
Type: pluginsdk.TypeInt,
Computed: true,
Description: "The minimum consecutive successes for the probe to be considered healthy after having failed. Defaults to 1. Must be 1 for liveness and startup Probes. Minimum value is 1.",
},

"termination_grace_period_seconds": {
Expand All @@ -2455,10 +2519,12 @@ func ContainerAppStartupProbeSchemaComputed() *pluginsdk.Schema {
func expandContainerAppStartupProbe(input ContainerAppStartupProbe) containerapps.ContainerAppProbe {
probeType := containerapps.TypeStartup
result := containerapps.ContainerAppProbe{
Type: &probeType,
PeriodSeconds: pointer.To(input.Interval),
TimeoutSeconds: pointer.To(input.Timeout),
FailureThreshold: pointer.To(input.FailureThreshold),
Type: &probeType,
InitialDelaySeconds: pointer.To(input.InitialDelay),
PeriodSeconds: pointer.To(input.Interval),
TimeoutSeconds: pointer.To(input.Timeout),
FailureThreshold: pointer.To(input.FailureThreshold),
SuccessThreshold: pointer.To(input.SuccessThreshold),
}

switch p := strings.ToUpper(input.Transport); p {
Expand Down Expand Up @@ -2495,9 +2561,11 @@ func expandContainerAppStartupProbe(input ContainerAppStartupProbe) containerapp
func flattenContainerAppStartupProbe(input containerapps.ContainerAppProbe) []ContainerAppStartupProbe {
result := make([]ContainerAppStartupProbe, 0)
probe := ContainerAppStartupProbe{
InitialDelay: pointer.From(input.InitialDelaySeconds),
Interval: pointer.From(input.PeriodSeconds),
Timeout: pointer.From(input.TimeoutSeconds),
FailureThreshold: pointer.From(input.FailureThreshold),
SuccessThreshold: pointer.From(input.SuccessThreshold),
TerminationGracePeriod: pointer.From(input.TerminationGracePeriodSeconds),
}

Expand Down
Loading