upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

flatten custom messages response structure (#24601)

Browse source
This commit is contained in:
Marc Boudreau 2023-12-20 11:35:15 -05:00 committed by GitHub
parent 1d8d80e8de
commit b1d3f9618e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
vault/logical_system_custom_messages.go
View file

@ -475,17 +475,15 @@ func (b *SystemBackend) handleCreateCustomMessages(ctx context.Context, req *log
return &logical.Response{
Data: map[string]any{
"id": message.ID,
"data": map[string]any{
"authenticated": message.Authenticated,
"type": message.Type,
"message": message.Message,
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"link": message.Link,
"options": message.Options,
"active": message.Active(),
},
"id": message.ID,
"authenticated": message.Authenticated,
"type": message.Type,
"message": message.Message,
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"link": message.Link,
"options": message.Options,
"active": message.Active(),
},
}, nil
}
@ -513,18 +511,16 @@ func (b *SystemBackend) handleReadCustomMessage(ctx context.Context, req *logica
return &logical.Response{
Data: map[string]any{
"id": id,
"data": map[string]any{
"authenticated": message.Authenticated,
"type": message.Type,
"message": message.Message,
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"link": message.Link,
"options": message.Options,
"active": message.Active(),
"title": message.Title,
},
"id": id,
"authenticated": message.Authenticated,
"type": message.Type,
"message": message.Message,
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"link": message.Link,
"options": message.Options,
"active": message.Active(),
"title": message.Title,
},
}, nil
}
@ -634,14 +630,12 @@ func (b *SystemBackend) handleUpdateCustomMessage(ctx context.Context, req *logi
return &logical.Response{
Data: map[string]any{
"id": message.ID,
"data": map[string]any{
"active": message.Active(),
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"type": message.Type,
"authenticated": message.Authenticated,
},
"id": message.ID,
"active": message.Active(),
"start_time": message.StartTime.Format(time.RFC3339Nano),
"end_time": endTimeResponse,
"type": message.Type,
"authenticated": message.Authenticated,
},
}, nil
}

49
vault/logical_system_custom_messages_test.go
View file

@ -367,21 +367,20 @@ func TestHandleCreateCustomMessage(t *testing.T) {
}
}
} else {
assert.Contains(t, resp.Data, "data", testcase.name)
assert.Contains(t, resp.Data["data"], "active", testcase.name)
assert.Contains(t, resp.Data["data"], "authenticated", testcase.name)
assert.Contains(t, resp.Data["data"], "type", testcase.name)
assert.Contains(t, resp.Data["data"], "start_time", testcase.name)
assert.Contains(t, resp.Data["data"], "end_time", testcase.name)
assert.Contains(t, resp.Data, "active", testcase.name)
assert.Contains(t, resp.Data, "authenticated", testcase.name)
assert.Contains(t, resp.Data, "type", testcase.name)
assert.Contains(t, resp.Data, "start_time", testcase.name)
assert.Contains(t, resp.Data, "end_time", testcase.name)
assert.Contains(t, resp.Data, "id", testcase.name)
if _, ok := testcase.fieldRawUpdate["authenticated"]; !ok {
assert.True(t, resp.Data["data"].(map[string]any)["authenticated"].(bool), testcase.name)
assert.True(t, resp.Data["authenticated"].(bool), testcase.name)
}
if _, ok := testcase.fieldRawUpdate["type"]; !ok {
assert.Equal(t, resp.Data["data"].(map[string]any)["type"], uicustommessages.BannerMessageType, testcase.name)
assert.Equal(t, resp.Data["type"], uicustommessages.BannerMessageType, testcase.name)
}
if _, ok := testcase.fieldRawUpdate["end_time"]; !ok {
assert.Nil(t, resp.Data["data"].(map[string]any)["end_time"], testcase.name)
assert.Nil(t, resp.Data["end_time"], testcase.name)
}
}
}
@ -454,11 +453,10 @@ func TestHandleReadCustomMessage(t *testing.T) {
assert.NotNil(t, resp.Data)
assert.Contains(t, resp.Data, "id")
assert.Equal(t, resp.Data["id"], message.ID)
assert.Contains(t, resp.Data, "data")
assert.Contains(t, resp.Data["data"], "active")
assert.Equal(t, resp.Data["data"].(map[string]any)["active"], true)
assert.Contains(t, resp.Data["data"], "end_time")
assert.NotNil(t, resp.Data["data"].(map[string]any)["end_time"])
assert.Contains(t, resp.Data, "active")
assert.Equal(t, resp.Data["active"], true)
assert.Contains(t, resp.Data, "end_time")
assert.NotNil(t, resp.Data["end_time"])
// Change the message so that it doesn't have an end time.
message.EndTime = nil
@ -472,11 +470,10 @@ func TestHandleReadCustomMessage(t *testing.T) {
assert.NotNil(t, resp.Data)
assert.Contains(t, resp.Data, "id")
assert.Equal(t, resp.Data["id"], message.ID)
assert.Contains(t, resp.Data, "data")
assert.Contains(t, resp.Data["data"], "active")
assert.Equal(t, resp.Data["data"].(map[string]any)["active"], true)
assert.Contains(t, resp.Data["data"], "end_time")
assert.Nil(t, resp.Data["data"].(map[string]any)["end_time"])
assert.Contains(t, resp.Data, "active")
assert.Equal(t, resp.Data["active"], true)
assert.Contains(t, resp.Data, "end_time")
assert.Nil(t, resp.Data["end_time"])
// Check that there's an error when trying to read a non-existant custom
// message.
@ -520,7 +517,6 @@ func TestHandleReadCustomMessage(t *testing.T) {
assert.NotNil(t, resp)
assert.NotNil(t, resp.Data)
assert.NotContains(t, resp.Data, "id")
assert.NotContains(t, resp.Data, "data")
assert.Contains(t, resp.Data, "error")
assert.Contains(t, resp.Data["error"], "failed")
}
@ -620,8 +616,7 @@ func TestHandleUpdateCustomMessage(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, resp)
assert.NotNil(t, resp.Data)
assert.Contains(t, resp.Data, "data")
assert.Equal(t, startTime2, resp.Data["data"].(map[string]any)["start_time"].(string))
assert.Equal(t, startTime2, resp.Data["start_time"].(string))
// Update existing custom message with request containing only required
// parameters
@ -633,10 +628,9 @@ func TestHandleUpdateCustomMessage(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, resp)
assert.NotNil(t, resp.Data)
assert.Contains(t, resp.Data, "data")
assert.True(t, resp.Data["data"].(map[string]any)["authenticated"].(bool))
assert.Equal(t, uicustommessages.BannerMessageType, resp.Data["data"].(map[string]any)["type"])
assert.Nil(t, resp.Data["data"].(map[string]any)["end_time"])
assert.True(t, resp.Data["authenticated"].(bool))
assert.Equal(t, uicustommessages.BannerMessageType, resp.Data["type"])
assert.Nil(t, resp.Data["end_time"])
testcases := []struct {
name string
@ -758,8 +752,7 @@ func TestHandleUpdateCustomMessage(t *testing.T) {
}
if len(testcase.fieldRawDelete)+len(testcase.fieldRawUpdate) == 0 {
assert.Contains(t, resp.Data, "data", testcase.name)
assert.Contains(t, resp.Data["data"], "active", testcase.name)
assert.Contains(t, resp.Data, "active", testcase.name)
assert.Contains(t, resp.Data, "id", testcase.name)
}
}