Skip to content

Commit e4a4b1a

Browse files
alexecalexec
committed
feat: longer status messages
1 parent 9bef0df commit e4a4b1a

13 files changed

Lines changed: 65 additions & 46 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## v0.0.16 (2021-05-19)
4+
5+
6+
### Contributors
7+
8+
9+
## v0.0.15 (2021-05-19)
10+
11+
* [9bef0df](https://github.com/argoproj/argo-workflows/commit/9bef0df2ec1eb398f63c9ba4b99be76b8b08aee8) feat: expose pod failure reason
12+
13+
### Contributors
14+
15+
* Alex Collins
16+
317
## v0.0.14 (2021-05-18)
418

519
* [2a23cb8](https://github.com/argoproj/argo-workflows/commit/2a23cb8abc4343272d4dd04f493d888694923114) fix: scale to 1 rather than 0 on start

‎api/v1alpha1/error.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package v1alpha1
33
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
44

55
type Error struct {
6-
// +kubebuilder:validation:MaxLength=32
6+
// +kubebuilder:validation:MaxLength=64
77
Message string `json:"message" protobuf:"bytes,1,opt,name=message"`
88
Time metav1.Time `json:"time" protobuf:"bytes,2,opt,name=time"`
99
}

‎api/v1alpha1/generated.proto‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1alpha1/message.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package v1alpha1
33
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
44

55
type Message struct {
6-
// +kubebuilder:validation:MaxLength=32
6+
// +kubebuilder:validation:MaxLength=64
77
Data string `json:"data" protobuf:"bytes,1,opt,name=data"`
88
Time metav1.Time `json:"time" protobuf:"bytes,2,opt,name=time"`
99
}

‎api/v1alpha1/source_statuses_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestSourceStatuses_Set(t *testing.T) {
1616
if assert.Len(t, ss, 1) {
1717
s := ss["bar"]
1818
if assert.NotNil(t, s.LastMessage) {
19-
assert.Equal(t, "xxxxxxxxxxxxxxx...xxxxxxxxxxxxxx", s.LastMessage.Data)
19+
assert.NotEmpty(t, s.LastMessage.Data)
2020
}
2121
if assert.Len(t, s.Metrics, 1) {
2222
assert.Equal(t, uint64(1), s.Metrics["1"].Total)
@@ -66,7 +66,7 @@ func TestSourceStatuses_IncErrors(t *testing.T) {
6666
err := errors.New(strings.Repeat("x", 33))
6767
ss.IncErrors("foo", 0, err)
6868
assert.Equal(t, uint64(1), ss["foo"].Metrics["0"].Errors)
69-
assert.Equal(t, "xxxxxxxxxxxxxxx...xxxxxxxxxxxxxx", ss["foo"].LastError.Message)
69+
assert.NotEmpty(t, ss["foo"].LastError.Message)
7070
assert.NotEmpty(t, ss["foo"].LastError.Time)
7171
ss.IncErrors("foo", 0, err)
7272
assert.Equal(t, uint64(2), ss["foo"].Metrics["0"].Errors)

‎api/v1alpha1/trunc.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package v1alpha1
22

33
func trunc(msg string) string {
4-
if len(msg) > 32 {
5-
return msg[0:15] + "..." + msg[len(msg)-14:]
4+
return truncN(msg, 64)
5+
}
6+
7+
func truncN(msg string, n int) string {
8+
x := n / 2
9+
if len(msg) > n {
10+
return msg[0:x-1] + "..." + msg[len(msg)-x+2:]
611
}
712
return msg
813
}

‎api/v1alpha1/trunc_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ import (
88
)
99

1010
func Test_trunc(t *testing.T) {
11-
t.Run("31", func(t *testing.T) {
12-
x := trunc(strings.Repeat("x", 31))
13-
assert.Len(t, x, 31)
14-
assert.Equal(t, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", x)
11+
t.Run("63", func(t *testing.T) {
12+
x := trunc(strings.Repeat("x", 63))
13+
assert.Len(t, x, 63)
14+
assert.Equal(t, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", x)
1515
})
16-
t.Run("32", func(t *testing.T) {
17-
x := trunc(strings.Repeat("x", 32))
18-
assert.Len(t, x, 32)
19-
assert.Equal(t, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", x)
16+
t.Run("64", func(t *testing.T) {
17+
x := trunc(strings.Repeat("x", 64))
18+
assert.Len(t, x, 64)
19+
assert.Equal(t, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", x)
2020
})
21-
t.Run("33", func(t *testing.T) {
22-
x := trunc(strings.Repeat("x", 33))
23-
assert.Len(t, x, 32)
24-
assert.Equal(t, "xxxxxxxxxxxxxxx...xxxxxxxxxxxxxx", x)
21+
t.Run("65", func(t *testing.T) {
22+
x := trunc(strings.Repeat("x", 65))
23+
assert.Len(t, x, 64)
24+
assert.Equal(t, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx...xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", x)
2525
})
2626
}

‎config/ci.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,7 @@ spec:
36153615
lastError:
36163616
properties:
36173617
message:
3618-
maxLength: 32
3618+
maxLength: 64
36193619
type: string
36203620
time:
36213621
format: date-time
@@ -3627,7 +3627,7 @@ spec:
36273627
lastMessage:
36283628
properties:
36293629
data:
3630-
maxLength: 32
3630+
maxLength: 64
36313631
type: string
36323632
time:
36333633
format: date-time
@@ -3655,7 +3655,7 @@ spec:
36553655
lastError:
36563656
properties:
36573657
message:
3658-
maxLength: 32
3658+
maxLength: 64
36593659
type: string
36603660
time:
36613661
format: date-time
@@ -3667,7 +3667,7 @@ spec:
36673667
lastMessage:
36683668
properties:
36693669
data:
3670-
maxLength: 32
3670+
maxLength: 64
36713671
type: string
36723672
time:
36733673
format: date-time

‎config/crd/bases/dataflow.argoproj.io_steps.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,7 +2662,7 @@ spec:
26622662
lastError:
26632663
properties:
26642664
message:
2665-
maxLength: 32
2665+
maxLength: 64
26662666
type: string
26672667
time:
26682668
format: date-time
@@ -2674,7 +2674,7 @@ spec:
26742674
lastMessage:
26752675
properties:
26762676
data:
2677-
maxLength: 32
2677+
maxLength: 64
26782678
type: string
26792679
time:
26802680
format: date-time
@@ -2702,7 +2702,7 @@ spec:
27022702
lastError:
27032703
properties:
27042704
message:
2705-
maxLength: 32
2705+
maxLength: 64
27062706
type: string
27072707
time:
27082708
format: date-time
@@ -2714,7 +2714,7 @@ spec:
27142714
lastMessage:
27152715
properties:
27162716
data:
2717-
maxLength: 32
2717+
maxLength: 64
27182718
type: string
27192719
time:
27202720
format: date-time

‎config/default.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3615,7 +3615,7 @@ spec:
36153615
lastError:
36163616
properties:
36173617
message:
3618-
maxLength: 32
3618+
maxLength: 64
36193619
type: string
36203620
time:
36213621
format: date-time
@@ -3627,7 +3627,7 @@ spec:
36273627
lastMessage:
36283628
properties:
36293629
data:
3630-
maxLength: 32
3630+
maxLength: 64
36313631
type: string
36323632
time:
36333633
format: date-time
@@ -3655,7 +3655,7 @@ spec:
36553655
lastError:
36563656
properties:
36573657
message:
3658-
maxLength: 32
3658+
maxLength: 64
36593659
type: string
36603660
time:
36613661
format: date-time
@@ -3667,7 +3667,7 @@ spec:
36673667
lastMessage:
36683668
properties:
36693669
data:
3670-
maxLength: 32
3670+
maxLength: 64
36713671
type: string
36723672
time:
36733673
format: date-time

0 commit comments

Comments
 (0)