Merge branch 'main' into PC-13699-add-start-date-to-replay

nobl9 · Sep 19, 2024 · e0a5c91 · e0a5c91
2 parents 88cf1e5 + 0350ad4
commit e0a5c91
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.22
 
 require (
 	github.com/BurntSushi/toml v1.4.0
-	github.com/MicahParks/jwkset v0.5.19
+	github.com/MicahParks/jwkset v0.5.20
 	github.com/MicahParks/keyfunc/v3 v3.3.5
 	github.com/aws/aws-sdk-go v1.55.5
 	github.com/bmatcuk/doublestar/v4 v4.6.1

diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/MicahParks/jwkset v0.5.19 h1:XZCsgJv05DBCvxEHYEHlSafqiuVn5ESG0VRB331Fxhw=
-github.com/MicahParks/jwkset v0.5.19/go.mod h1:q8ptTGn/Z9c4MwbcfeCDssADeVQb3Pk7PnVxrvi+2QY=
+github.com/MicahParks/jwkset v0.5.20 h1:gTIKx9AofTqQJ0srd8AL7ty9NeadP5WUXSPOZadTpOI=
+github.com/MicahParks/jwkset v0.5.20/go.mod h1:q8ptTGn/Z9c4MwbcfeCDssADeVQb3Pk7PnVxrvi+2QY=
 github.com/MicahParks/keyfunc/v3 v3.3.5 h1:7ceAJLUAldnoueHDNzF8Bx06oVcQ5CfJnYwNt1U3YYo=
 github.com/MicahParks/keyfunc/v3 v3.3.5/go.mod h1:SdCCyMJn/bYqWDvARspC6nCT8Sk74MjuAY22C7dCST8=
 github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=

diff --git a/internal/manifest/v1alpha/examples/slo_composite.go b/internal/manifest/v1alpha/examples/slo_composite.go
@@ -74,7 +74,6 @@ 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
@@ -29,7 +29,6 @@
     budgetingMethod: Occurrences
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       composite:
@@ -96,7 +95,6 @@
     budgetingMethod: Occurrences
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       composite:
@@ -160,7 +158,6 @@
     budgetingMethod: Timeslices
     objectives:
     - displayName: User experience
-      value: 0.0
       name: user-experience
       target: 0.95
       timeSliceTarget: 0.9
@@ -228,7 +225,6 @@
     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
@@ -68,7 +68,7 @@ type Attachment struct {
 // ObjectiveBase base structure representing an objective.
 type ObjectiveBase struct {
 	DisplayName string   `json:"displayName"`
-	Value       *float64 `json:"value"`
+	Value       *float64 `json:"value,omitempty"`
 	Name        string   `json:"name"`
 	NameChanged bool     `json:"-"`
 }

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "cspell": "8.14.2",
+    "cspell": "8.14.4",
     "markdownlint-cli": "0.41.0",
     "yaml": "2.5.1"
   },

diff --git a/sdk/test_data/reader/expected/composite_v2_slo.tpl.json b/sdk/test_data/reader/expected/composite_v2_slo.tpl.json
@@ -12,7 +12,6 @@
     "objectives": [
       {
         "displayName": "composite-obj",
-        "value": null,
         "name": "composite-obj",
         "target": 0.99,
         "composite": {