From 5aa05ba25d7c56c8edb8fda308d611f48ab79d81 Mon Sep 17 00:00:00 2001 From: Jakub Gruszecki Date: Fri, 20 Sep 2024 11:55:18 +0200 Subject: [PATCH] Revert "feat: PC-13893 Deprecate usage of objective's value field for Composite SLOs (#529)" This reverts commit 0350ad44fc725bb176a114e1613f927ef400e04c. --- internal/manifest/v1alpha/examples/slo_composite.go | 1 + manifest/v1alpha/slo/examples/composite-slo.yaml | 4 ++++ manifest/v1alpha/slo/slo.go | 2 +- sdk/test_data/reader/expected/composite_v2_slo.tpl.json | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/manifest/v1alpha/examples/slo_composite.go b/internal/manifest/v1alpha/examples/slo_composite.go index c9cda79f..13119005 100644 --- a/internal/manifest/v1alpha/examples/slo_composite.go +++ b/internal/manifest/v1alpha/examples/slo_composite.go @@ -74,6 +74,7 @@ func (s sloCompositeExample) SLO() v1alphaSLO.SLO { { ObjectiveBase: v1alphaSLO.ObjectiveBase{ DisplayName: "User experience", + Value: ptr(0.0), Name: "user-experience", }, BudgetTarget: ptr(0.95), diff --git a/manifest/v1alpha/slo/examples/composite-slo.yaml b/manifest/v1alpha/slo/examples/composite-slo.yaml index aada8be7..cd7b6d56 100644 --- a/manifest/v1alpha/slo/examples/composite-slo.yaml +++ b/manifest/v1alpha/slo/examples/composite-slo.yaml @@ -29,6 +29,7 @@ budgetingMethod: Occurrences objectives: - displayName: User experience + value: 0.0 name: user-experience target: 0.95 composite: @@ -95,6 +96,7 @@ budgetingMethod: Occurrences objectives: - displayName: User experience + value: 0.0 name: user-experience target: 0.95 composite: @@ -158,6 +160,7 @@ budgetingMethod: Timeslices objectives: - displayName: User experience + value: 0.0 name: user-experience target: 0.95 timeSliceTarget: 0.9 @@ -225,6 +228,7 @@ budgetingMethod: Timeslices objectives: - displayName: User experience + value: 0.0 name: user-experience target: 0.95 timeSliceTarget: 0.9 diff --git a/manifest/v1alpha/slo/slo.go b/manifest/v1alpha/slo/slo.go index 0c69d1c9..ce3384e7 100644 --- a/manifest/v1alpha/slo/slo.go +++ b/manifest/v1alpha/slo/slo.go @@ -68,7 +68,7 @@ type Attachment struct { // ObjectiveBase base structure representing an objective. type ObjectiveBase struct { DisplayName string `json:"displayName"` - Value *float64 `json:"value,omitempty"` + Value *float64 `json:"value"` Name string `json:"name"` NameChanged bool `json:"-"` } diff --git a/sdk/test_data/reader/expected/composite_v2_slo.tpl.json b/sdk/test_data/reader/expected/composite_v2_slo.tpl.json index 303f745e..fd7f7f86 100644 --- a/sdk/test_data/reader/expected/composite_v2_slo.tpl.json +++ b/sdk/test_data/reader/expected/composite_v2_slo.tpl.json @@ -12,6 +12,7 @@ "objectives": [ { "displayName": "composite-obj", + "value": null, "name": "composite-obj", "target": 0.99, "composite": {