apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-04 07:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow to pass metadata with process config, non-cluster only

Browse Source
This commit is contained in:
Ingo Oppermann
2023-06-01 21:24:33 +02:00
parent d652fd213b
commit f59a63320c
7 changed files with 228 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http/handler/api/cluster.go
View File

@@ -404,7 +404,7 @@ func (h *ClusterHandler) AddProcess(c echo.Context) error {
return api.Err(http.StatusBadRequest, "At least one input and one output need to be defined")
}
config := process.Marshal()
config, _ := process.Marshal()
if err := h.cluster.AddProcess("", config); err != nil {
return api.Err(http.StatusBadRequest, "Invalid process config", "%s", err.Error())
@@ -468,7 +468,7 @@ func (h *ClusterHandler) UpdateProcess(c echo.Context) error {
}
}
config := process.Marshal()
config, _ := process.Marshal()
if err := h.cluster.UpdateProcess("", id, config); err != nil {
if err == restream.ErrUnknownProcess {

12
http/handler/api/restream.go
View File

@@ -76,7 +76,7 @@ func (h *RestreamHandler) Add(c echo.Context) error {
return api.Err(http.StatusBadRequest, "At least one input and one output need to be defined")
}
config := process.Marshal()
config, metadata := process.Marshal()
if err := h.restream.AddProcess(config); err != nil {
return api.Err(http.StatusBadRequest, "Invalid process config", "%s", err.Error())
@@ -87,6 +87,10 @@ func (h *RestreamHandler) Add(c echo.Context) error {
Domain: config.Domain,
}
for key, data := range metadata {
h.restream.SetProcessMetadata(tid, key, data)
}
p, _ := h.getProcess(tid, "config")
return c.JSON(http.StatusOK, p.Config)
@@ -297,7 +301,7 @@ func (h *RestreamHandler) Update(c echo.Context) error {
}
}
config := process.Marshal()
config, metadata := process.Marshal()
tid = restream.TaskID{
ID: id,
@@ -317,6 +321,10 @@ func (h *RestreamHandler) Update(c echo.Context) error {
Domain: config.Domain,
}
for key, data := range metadata {
h.restream.SetProcessMetadata(tid, key, data)
}
p, _ := h.getProcess(tid, "config")
return c.JSON(http.StatusOK, p.Config)

169
http/handler/api/restream_test.go
View File

@@ -129,6 +129,39 @@ func TestAddProcess(t *testing.T) {
mock.Validate(t, &api.ProcessConfig{}, response.Data)
}
func TestAddProcessWithMetadata(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)
data := bytes.Buffer{}
_, err = data.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
process := api.ProcessConfig{}
err = json.Unmarshal(data.Bytes(), &process)
require.NoError(t, err)
process.Metadata = map[string]interface{}{
"foo": "bar",
}
encoded, err := json.Marshal(&process)
require.NoError(t, err)
data.Reset()
_, err = data.Write(encoded)
require.NoError(t, err)
response := mock.Request(t, http.StatusOK, router, "POST", "/", &data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
response = mock.Request(t, http.StatusOK, router, "GET", "/"+process.ID+"/metadata", nil)
require.Equal(t, map[string]interface{}{
"foo": "bar",
}, response.Data)
}
func TestUpdateProcessInvalid(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)
@@ -171,28 +204,73 @@ func TestUpdateReplaceProcess(t *testing.T) {
mock.Validate(t, &api.ProcessConfig{}, response.Data)
update := bytes.Buffer{}
_, err = update.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
data = mock.Read(t, "./fixtures/addProcess.json")
proc := api.ProcessConfig{}
err = json.Unmarshal(update.Bytes(), &proc)
require.NoError(t, err)
encoded, err := json.Marshal(&proc)
require.NoError(t, err)
update.Reset()
_, err = update.Write(encoded)
require.NoError(t, err)
response = mock.Request(t, http.StatusOK, router, "PUT", "/test", &update)
response = mock.Request(t, http.StatusOK, router, "PUT", "/test", data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
mock.Request(t, http.StatusOK, router, "GET", "/test", nil)
}
func TestUpdateReplaceProcessWithMetadata(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)
data := bytes.Buffer{}
_, err = data.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
process := api.ProcessConfig{}
err = json.Unmarshal(data.Bytes(), &process)
require.NoError(t, err)
process.Metadata = map[string]interface{}{
"foo": "bar",
}
encoded, err := json.Marshal(&process)
require.NoError(t, err)
data.Reset()
_, err = data.Write(encoded)
require.NoError(t, err)
response := mock.Request(t, http.StatusOK, router, "POST", "/", &data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
data.Reset()
_, err = data.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
process = api.ProcessConfig{}
err = json.Unmarshal(data.Bytes(), &process)
require.NoError(t, err)
process.Metadata = map[string]interface{}{
"foo": "baz",
}
encoded, err = json.Marshal(&process)
require.NoError(t, err)
data.Reset()
_, err = data.Write(encoded)
require.NoError(t, err)
response = mock.Request(t, http.StatusOK, router, "PUT", "/test", &data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
mock.Request(t, http.StatusOK, router, "GET", "/test", nil)
response = mock.Request(t, http.StatusOK, router, "GET", "/"+process.ID+"/metadata", nil)
require.Equal(t, map[string]interface{}{
"foo": "baz",
}, response.Data)
}
func TestUpdateNewProcess(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)
@@ -228,6 +306,67 @@ func TestUpdateNewProcess(t *testing.T) {
mock.Request(t, http.StatusOK, router, "GET", "/test2", nil)
}
func TestUpdateNewProcessWithMetadata(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)
data := bytes.Buffer{}
_, err = data.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
process := api.ProcessConfig{}
err = json.Unmarshal(data.Bytes(), &process)
require.NoError(t, err)
process.Metadata = map[string]interface{}{
"foo": "bar",
}
encoded, err := json.Marshal(&process)
require.NoError(t, err)
data.Reset()
_, err = data.Write(encoded)
require.NoError(t, err)
response := mock.Request(t, http.StatusOK, router, "POST", "/", &data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
data.Reset()
_, err = data.ReadFrom(mock.Read(t, "./fixtures/addProcess.json"))
require.NoError(t, err)
process = api.ProcessConfig{}
err = json.Unmarshal(data.Bytes(), &process)
require.NoError(t, err)
process.ID = "test2"
process.Metadata = map[string]interface{}{
"bar": "foo",
}
encoded, err = json.Marshal(&process)
require.NoError(t, err)
data.Reset()
_, err = data.Write(encoded)
require.NoError(t, err)
response = mock.Request(t, http.StatusOK, router, "PUT", "/test", &data)
mock.Validate(t, &api.ProcessConfig{}, response.Data)
mock.Request(t, http.StatusNotFound, router, "GET", "/test", nil)
mock.Request(t, http.StatusOK, router, "GET", "/test2", nil)
response = mock.Request(t, http.StatusOK, router, "GET", "/"+process.ID+"/metadata", nil)
require.Equal(t, map[string]interface{}{
"foo": "bar",
"bar": "foo",
}, response.Data)
}
func TestUpdateNonExistentProcess(t *testing.T) {
router, err := getDummyRestreamRouter()
require.NoError(t, err)

4
http/handler/api/widget_test.go
View File

@@ -50,7 +50,9 @@ func TestWidget(t *testing.T) {
err = json.Unmarshal(data, &process)
require.NoError(t, err)
err = rs.AddProcess(process.Marshal())
config, _ := process.Marshal()
err = rs.AddProcess(config)
require.NoError(t, err)
response := mock.Request(t, http.StatusOK, router, "GET", "/"+process.ID, nil)