aherman
/
boundary
mirror of https://github.com/hashicorp/boundary
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: reapply-storage-policy

Browse Source
pull/4239/head
Damian Debkowski 2 years ago committed by Louis Ruch
parent 621b535dde
commit 2dda19aafe
12 changed files with 104 additions and 10 deletions
Show Stats Download Patch File Download Diff File

1
internal/daemon/controller/handlers/session_recordings/session_recording_service.go
Unescape View File

@ -25,6 +25,7 @@ var (
action.Read,
action.Download,
action.Delete,
action.ReApplyStoragePolicy,
)
// CollectionActions contains the set of actions that can be performed on

4
internal/daemon/controller/rate_limiter_test.go
Unescape View File

@ -63,7 +63,7 @@ func Test_newRateLimiterConfig(t *testing.T) {
ratelimit.DefaultLimiterMaxQuotas(),
false,
&rateLimiterConfig{
maxSize: 314157,
maxSize: 316158,
configs: nil,
disabled: false,
limits: defaultLimits,
@ -642,7 +642,7 @@ func Test_rateLimiterConfig_writeSysEvent(t *testing.T) {
wantResourceLimits := v.(map[string]interface{})
gotResourceLimits := gotv.(map[string]interface{})
require.Equal(t, len(gotResourceLimits), len(wantResourceLimits))
require.Equal(t, len(wantResourceLimits), len(gotResourceLimits))
for k, v := range wantResourceLimits {
gotv, ok := gotResourceLimits[k]

28
internal/daemon/controller/testdata/Test_rateLimiterConfig_writeSysEvent/defaults.json vendored
Unescape View File

@ -2791,6 +2791,32 @@
]
},
"session-recording": {
"reapply-storage-policy": [
{
"action": "reapply-storage-policy",
"limit": 30000,
"per": "total",
"period": "30s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 3000,
"per": "auth-token",
"period": "30s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 30000,
"per": "ip-address",
"period": "30s",
"resource": "session-recording",
"unlimited": false
}
],
"download": [
{
"action": "download",
@ -3971,7 +3997,7 @@
]
}
},
"max_size": 314157,
"max_size": 316158,
"msg": "controller api rate limiter"
},
"op": "controller.(rateLimiterConfig).writeSysEvent",

26
internal/daemon/controller/testdata/Test_rateLimiterConfig_writeSysEvent/max_size.json vendored
Unescape View File

@ -2791,6 +2791,32 @@
]
},
"session-recording": {
"reapply-storage-policy": [
{
"action": "reapply-storage-policy",
"limit": 30000,
"per": "total",
"period": "30s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 3000,
"per": "auth-token",
"period": "30s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 30000,
"per": "ip-address",
"period": "30s",
"resource": "session-recording",
"unlimited": false
}
],
"download": [
{
"action": "download",

28
internal/daemon/controller/testdata/Test_rateLimiterConfig_writeSysEvent/override.json vendored
Unescape View File

@ -2791,6 +2791,32 @@
]
},
"session-recording": {
"reapply-storage-policy": [
{
"action": "reapply-storage-policy",
"limit": 100,
"per": "total",
"period": "1m0s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 100,
"per": "auth-token",
"period": "1m0s",
"resource": "session-recording",
"unlimited": false
},
{
"action": "reapply-storage-policy",
"limit": 100,
"per": "ip-address",
"period": "1m0s",
"resource": "session-recording",
"unlimited": false
}
],
"download": [
{
"action": "download",
@ -3971,7 +3997,7 @@
]
}
},
"max_size": 314157,
"max_size": 316158,
"msg": "controller api rate limiter"
},
"op": "controller.(rateLimiterConfig).writeSysEvent",

2
internal/gen/controller.swagger.json
Unescape View File

@ -3361,7 +3361,7 @@
}
},
"/v1/session-recordings/{id}:reapply-storage-policy": {
"get": {
"post": {
"summary": "ReApplyStoragePolicy will recalculate the resultant set of policy and apply the result to the given session recording.",
"operationId": "SessionRecordingService_ReApplyStoragePolicy",
"responses": {

2
internal/gen/controller/api/services/session_recording_service.pb.go
Unescape View File

@ -739,7 +739,7 @@ var file_controller_api_services_v1_session_recording_service_proto_rawDesc = []
0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67,
0x69, 0x76, 0x65, 0x6e, 0x20, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x72, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3a, 0x62, 0x04, 0x69,
0x74, 0x65, 0x6d, 0x12, 0x32, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
0x74, 0x65, 0x6d, 0x22, 0x32, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
0x2d, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d,
0x3a, 0x72, 0x65, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x2d, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65,
0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0xd4, 0x01, 0x0a, 0x16, 0x44, 0x65, 0x6c, 0x65,

4
internal/gen/controller/api/services/session_recording_service.pb.gw.go
Unescape View File

@ -331,7 +331,7 @@ func RegisterSessionRecordingServiceHandlerServer(ctx context.Context, mux *runt
return
})
mux.Handle("GET", pattern_SessionRecordingService_ReApplyStoragePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
mux.Handle("POST", pattern_SessionRecordingService_ReApplyStoragePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
var stream runtime.ServerTransportStream
@ -488,7 +488,7 @@ func RegisterSessionRecordingServiceHandlerClient(ctx context.Context, mux *runt
})
mux.Handle("GET", pattern_SessionRecordingService_ReApplyStoragePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
mux.Handle("POST", pattern_SessionRecordingService_ReApplyStoragePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)

8
internal/gen/controller/api/services/session_recording_service_grpc.pb.go
Unescape View File

@ -48,6 +48,10 @@ type SessionRecordingServiceClient interface {
// A Channel recording ID is required to look up a Channel recording.
// The only supported mime type is "application/x-asciicast".
Download(ctx context.Context, in *DownloadRequest, opts ...grpc.CallOption) (SessionRecordingService_DownloadClient, error)
// ReApplyStoragePolicy calculates the resultant set of policy for a given session recording
// and updates the retain until and delete after values. The provided request
// must include the Session recording ID for the Session recording to be updated. If that ID
// is missing, malformed or reference a non existing resource, an error is returned.
ReApplyStoragePolicy(ctx context.Context, in *ReApplyStoragePolicyRequest, opts ...grpc.CallOption) (*ReApplyStoragePolicyResponse, error)
// DeleteSessionRecording removes a Session Recording from Boundary. If the Session Recording id
// is malformed or not provided an error is returned.
@ -148,6 +152,10 @@ type SessionRecordingServiceServer interface {
// A Channel recording ID is required to look up a Channel recording.
// The only supported mime type is "application/x-asciicast".
Download(*DownloadRequest, SessionRecordingService_DownloadServer) error
// ReApplyStoragePolicy calculates the resultant set of policy for a given session recording
// and updates the retain until and delete after values. The provided request
// must include the Session recording ID for the Session recording to be updated. If that ID
// is missing, malformed or reference a non existing resource, an error is returned.
ReApplyStoragePolicy(context.Context, *ReApplyStoragePolicyRequest) (*ReApplyStoragePolicyResponse, error)
// DeleteSessionRecording removes a Session Recording from Boundary. If the Session Recording id
// is malformed or not provided an error is returned.

2
internal/perms/acl_test.go
Unescape View File

@ -932,7 +932,7 @@ func Test_AnonRestrictions(t *testing.T) {
if i == resource.Controller || i == resource.Worker {
continue
}
for j := action.Type(1); j <= action.DetachStoragePolicy; j++ {
for j := action.Type(1); j <= action.ReApplyStoragePolicy; j++ {
id := "foobar"
prefixes := globals.ResourcePrefixesFromType(resource.Type(i))
if len(prefixes) > 0 {

6
internal/proto/controller/api/services/v1/session_recording_service.proto
Unescape View File

@ -42,9 +42,13 @@ service SessionRecordingService {
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {summary: "Download returns the contents of the specified resource in the specified mime type. Supports both Session ID and Session recording ID for looking up a Session recording. Supports both Connection ID and Connection recording ID to look up a Connection recording. A Channel recording ID is required to look up a Channel recording. The only supported mime type is \"application/x-asciicast\"."};
}
// ReApplyStoragePolicy calculates the resultant set of policy for a given session recording
// and updates the retain until and delete after values. The provided request
// must include the Session recording ID for the Session recording to be updated. If that ID
// is missing, malformed or reference a non existing resource, an error is returned.
rpc ReApplyStoragePolicy(ReApplyStoragePolicyRequest) returns (ReApplyStoragePolicyResponse) {
option (google.api.http) = {
get: "/v1/session-recordings/{id}:reapply-storage-policy"
post: "/v1/session-recordings/{id}:reapply-storage-policy"
response_body: "item"
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {summary: "ReApplyStoragePolicy will recalculate the resultant set of policy and apply the result to the given session recording."};

3
internal/types/action/action.go
Unescape View File

@ -70,6 +70,7 @@ const (
Download Type = 56
AttachStoragePolicy Type = 57
DetachStoragePolicy Type = 58
ReApplyStoragePolicy Type = 59
// When adding new actions, be sure to update:
//
@ -136,6 +137,7 @@ var Map = map[string]Type{
Download.String(): Download,
AttachStoragePolicy.String(): AttachStoragePolicy,
DetachStoragePolicy.String(): DetachStoragePolicy,
ReApplyStoragePolicy.String(): ReApplyStoragePolicy,
}
var DeprecatedMap = map[string]Type{
@ -208,6 +210,7 @@ func (a Type) String() string {
"download",
"attach-storage-policy",
"detach-storage-policy",
"reapply-storage-policy",
}[a]
}

Write Preview
Loading…
Cancel
Save