Skip to content

Commit d06ab09

Browse files
committed
Restore support for non-composite data view ids
1 parent 2a89cdb commit d06ab09

File tree

2 files changed

+44
-3
lines changed

2 files changed

+44
-3
lines changed

internal/kibana/data_view/models.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,16 @@ func convertSourceFilter(item string, meta utils.ListMeta) kbapi.DataViewsSource
232232
}
233233

234234
func (model dataViewModel) getViewIDAndSpaceID() (viewID string, spaceID string) {
235+
viewID = model.ID.ValueString()
236+
spaceID = model.SpaceID.ValueString()
237+
235238
resourceID := model.ID.ValueString()
236-
composite, _ := clients.CompositeIdFromStr(resourceID)
237-
viewID = composite.ResourceId
238-
spaceID = composite.ClusterId
239+
maybeCompositeID, _ := clients.CompositeIdFromStr(resourceID)
240+
if maybeCompositeID != nil {
241+
viewID = maybeCompositeID.ResourceId
242+
spaceID = maybeCompositeID.ClusterId
243+
}
244+
239245
return
240246
}
241247

internal/kibana/data_view/models_test.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,3 +352,38 @@ func TestToAPIUpdateModel(t *testing.T) {
352352
})
353353
}
354354
}
355+
356+
func Test_dataViewModel_getViewIDAndSpaceID(t *testing.T) {
357+
tests := []struct {
358+
name string
359+
model dataViewModel
360+
expectedViewID string
361+
expectedSpaceID string
362+
}{
363+
{
364+
name: "gets the view and space id from the composite id if set",
365+
model: dataViewModel{
366+
ID: types.StringValue("space-id/view-id"),
367+
},
368+
expectedViewID: "view-id",
369+
expectedSpaceID: "space-id",
370+
},
371+
{
372+
name: "gets the view and space id from the data view if id is not a valid composite id",
373+
model: dataViewModel{
374+
ID: types.StringValue("view-id"),
375+
SpaceID: types.StringValue("space-id"),
376+
},
377+
expectedViewID: "view-id",
378+
expectedSpaceID: "space-id",
379+
},
380+
}
381+
382+
for _, tt := range tests {
383+
t.Run(tt.name, func(t *testing.T) {
384+
viewID, spaceID := tt.model.getViewIDAndSpaceID()
385+
require.Equal(t, tt.expectedViewID, viewID)
386+
require.Equal(t, tt.expectedSpaceID, spaceID)
387+
})
388+
}
389+
}

0 commit comments

Comments
 (0)