Skip to content

Commit 768f1bd

Browse files
authored
fix: et v1beta3 does not have broker set by default (#8079)
* fix: et v1beta3 does not have broker set by default Signed-off-by: Calum Murray <[email protected]> * fix(text): unit tests no longer expect default broker Signed-off-by: Calum Murray <[email protected]> * cleanup: test name reflects new behaviour of allowing nil references Signed-off-by: Calum Murray <[email protected]> --------- Signed-off-by: Calum Murray <[email protected]>
1 parent 8e7c775 commit 768f1bd

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

pkg/apis/eventing/v1beta1/eventtype_defaults.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ func (et *EventType) SetDefaults(ctx context.Context) {
2828
}
2929

3030
func (ets *EventTypeSpec) SetDefaults(ctx context.Context) {
31-
if ets.Reference == nil && ets.Broker == "" {
32-
ets.Broker = "default"
33-
}
3431
if ets.Reference != nil {
3532
ets.Reference.SetDefaults(ctx)
3633
}

pkg/apis/eventing/v1beta1/eventtype_defaults_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ func TestEventTypeDefaults(t *testing.T) {
3535
"nil spec": {
3636
initial: EventType{},
3737
expected: EventType{
38-
Spec: EventTypeSpec{
39-
Broker: "default",
40-
},
38+
Spec: EventTypeSpec{},
4139
},
4240
},
43-
"broker empty": {
41+
"default broker reference": {
4442
initial: EventType{
4543
Spec: EventTypeSpec{
4644
Type: "test-type",
@@ -53,7 +51,6 @@ func TestEventTypeDefaults(t *testing.T) {
5351
Spec: EventTypeSpec{
5452
Type: "test-type",
5553
Source: testSource,
56-
Broker: "default",
5754
Schema: testSchema,
5855
},
5956
},
@@ -70,7 +67,6 @@ func TestEventTypeDefaults(t *testing.T) {
7067
Spec: EventTypeSpec{
7168
Type: "test-type",
7269
Source: testSource,
73-
Broker: "default",
7470
Schema: testSchema,
7571
},
7672
},

0 commit comments

Comments
 (0)