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

Jump to bottom

Fix stats alerts, add all service aggregate alerts #831

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Fix stats alerts, add all service aggregate alerts #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions fastly/resource_fastly_alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,11 @@ func resourceFastlyAlertCreate(_ context.Context, d *schema.ResourceData, meta a
input.Description = gofastly.ToPointer(v.(string))
}

input.Dimensions = map[string][]string{}
if v, ok := d.GetOk("dimensions"); ok {
for _, r := range v.([]any) {
if m, ok := r.(map[string]any); ok {
input.Dimensions = buildDimensions(m)
input.Dimensions = buildDimensions(input.Dimensions, m)
}
}
}
Expand Down Expand Up @@ -226,10 +227,11 @@ func resourceFastlyAlertUpdate(ctx context.Context, d *schema.ResourceData, meta
input.Description = gofastly.ToPointer(v.(string))
}

input.Dimensions = map[string][]string{}
if v, ok := d.GetOk("dimensions"); ok {
for _, r := range v.([]any) {
if m, ok := r.(map[string]any); ok {
input.Dimensions = buildDimensions(m)
input.Dimensions = buildDimensions(input.Dimensions, m)
}
}
}
Expand Down Expand Up @@ -281,12 +283,11 @@ func flattenDimensions(remoteState map[string][]string) []map[string]any {
return []map[string]any{data}
}

func buildDimensions(v map[string]any) map[string][]string {
dimensions := map[string][]string{}
func buildDimensions(data map[string][]string, v map[string]any) map[string][]string {
for dimension, values := range v {
dimensions[dimension] = buildStringSlice(values.(*schema.Set))
data[dimension] = buildStringSlice(values.(*schema.Set))
}
return dimensions
return data
}

func buildEvaluationStrategy(v map[string]any) map[string]any {
Expand Down
167 changes: 166 additions & 1 deletion fastly/resource_fastly_alert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,124 @@ func TestAccFastlyAlert_basic(t *testing.T) {
})
}

func TestAccFastlyAlert_basic_stats(t *testing.T) {
var service gofastly.ServiceDetail
serviceName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
domainName := fmt.Sprintf("fastly-test.tf-%s.com", acctest.RandString(10))
createAlert := gofastly.AlertDefinition{
Description: "Terraform test",
Dimensions: map[string][]string{},
EvaluationStrategy: map[string]any{
"type": "above_threshold",
"period": "5m",
"threshold": float64(10),
},
Metric: "status_5xx",
Name: fmt.Sprintf("Terraform test alert %s", acctest.RandString(10)),
Source: "stats",
}
updateAlert := gofastly.AlertDefinition{
Description: "Terraform test with new description",
Dimensions: map[string][]string{},
EvaluationStrategy: map[string]any{
"type": "below_threshold",
"period": "15m",
"threshold": float64(100),
},
Metric: "status_4xx",
Name: fmt.Sprintf("Terraform test alert %s", acctest.RandString(10)),
Source: "stats",
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},
ProviderFactories: testAccProviders,
CheckDestroy: testAccCheckAlertDestroy,
Steps: []resource.TestStep{
{
Config: testAccAlertStatsConfig(serviceName, domainName, createAlert),
Check: resource.ComposeTestCheckFunc(
testAccCheckServiceExists("fastly_service_vcl.tf_bar", &service),
testAccCheckFastlyAlertsRemoteState(&service, serviceName, createAlert),
),
},
{
Config: testAccAlertStatsConfig(serviceName, domainName, updateAlert),
Check: resource.ComposeTestCheckFunc(
testAccCheckServiceExists("fastly_service_vcl.tf_bar", &service),
testAccCheckFastlyAlertsRemoteState(&service, serviceName, updateAlert),
),
},
{
ResourceName: "fastly_alert.tf_bar",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccFastlyAlert_basic_stats_aggregate(t *testing.T) {
service := gofastly.ServiceDetail{
Name: gofastly.ToPointer(""),
ServiceID: gofastly.ToPointer(""),
}

createAlert := gofastly.AlertDefinition{
Description: "Terraform test",
Dimensions: map[string][]string{},
EvaluationStrategy: map[string]any{
"type": "above_threshold",
"period": "5m",
"threshold": float64(10),
},
Metric: "status_5xx",
Name: fmt.Sprintf("Terraform test alert %s", acctest.RandString(10)),
Source: "stats",
}
updateAlert := gofastly.AlertDefinition{
Description: "Terraform test with new description",
Dimensions: map[string][]string{},
EvaluationStrategy: map[string]any{
"type": "below_threshold",
"period": "15m",
"threshold": float64(100),
},
Metric: "status_4xx",
Name: fmt.Sprintf("Terraform test alert %s", acctest.RandString(10)),
Source: "stats",
}

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},
ProviderFactories: testAccProviders,
CheckDestroy: testAccCheckAlertDestroy,
Steps: []resource.TestStep{
{
Config: testAccAlertAggregateStatsConfig(createAlert),
Check: resource.ComposeTestCheckFunc(
testAccCheckFastlyAlertsRemoteState(&service, "", createAlert),
),
},
{
Config: testAccAlertAggregateStatsConfig(updateAlert),
Check: resource.ComposeTestCheckFunc(
testAccCheckFastlyAlertsRemoteState(&service, "", updateAlert),
),
},
{
ResourceName: "fastly_alert.tf_bar",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccCheckFastlyAlertsRemoteState(service *gofastly.ServiceDetail, serviceName string, expected gofastly.AlertDefinition) resource.TestCheckFunc {
return func(_ *terraform.State) error {
if gofastly.ToValue(service.Name) != serviceName {
Expand Down Expand Up @@ -102,7 +220,6 @@ func testAccCheckFastlyAlertsRemoteState(service *gofastly.ServiceDetail, servic
if cursor == "" {
break
}

}

var got *gofastly.AlertDefinition
Expand Down Expand Up @@ -194,3 +311,51 @@ resource "fastly_alert" "foo" {
}
}`, serviceName, domainName, alert.Name, alert.Description, alert.Source, alert.Metric, alert.Source, strings.Join(alert.Dimensions[alert.Source], "\", \""), alert.EvaluationStrategy["type"], alert.EvaluationStrategy["period"], alert.EvaluationStrategy["threshold"])
}

func testAccAlertStatsConfig(serviceName, domainName string, alert gofastly.AlertDefinition) string {
return fmt.Sprintf(`
resource "fastly_service_vcl" "tf_bar" {
name = "%s"

domain {
name = "%s"
}

product_enablement {
domain_inspector = false
}

force_destroy = true
}

resource "fastly_alert" "tf_bar" {
name = "%s"
description = "%s"
service_id = fastly_service_vcl.tf_bar.id
source = "%s"
metric = "%s"

evaluation_strategy {
type = "%s"
period = "%s"
threshold = %v
}
}`, serviceName, domainName, alert.Name, alert.Description, alert.Source, alert.Metric, alert.EvaluationStrategy["type"], alert.EvaluationStrategy["period"], alert.EvaluationStrategy["threshold"])
}

func testAccAlertAggregateStatsConfig(alert gofastly.AlertDefinition) string {
return fmt.Sprintf(`
resource "fastly_alert" "tf_bar" {
name = "%s"
description = "%s"
service_id = ""
source = "%s"
metric = "%s"

evaluation_strategy {
type = "%s"
period = "%s"
threshold = %v
}
}`, alert.Name, alert.Description, alert.Source, alert.Metric, alert.EvaluationStrategy["type"], alert.EvaluationStrategy["period"], alert.EvaluationStrategy["threshold"])
}
Loading