Skip to content

ROX-13031: DryRun Collection API #3766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keyallis merged 5 commits into from
Nov 14, 2022
Merged

ROX-13031: DryRun Collection API #3766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbd964b
ROX-13031: DryRun Collection API
keyallis Nov 8, 2022
1b77f38
fixes
keyallis Nov 10, 2022
c34d387
style check fix
keyallis Nov 10, 2022
6727d7a
remove util package, accidently included it
keyallis Nov 10, 2022
ca83332
address PR comments
keyallis Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions central/resourcecollection/service/service_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ var (
// "/v1.CollectionService/AutoCompleteCollection", TODO ROX-12616
"/v1.CollectionService/CreateCollection",
"/v1.CollectionService/DeleteCollection",
// "/v1.CollectionService/DryRunCollection", TODO ROX-13031
"/v1.CollectionService/UpdateCollection",
"/v1.CollectionService/DryRunCollection",
},
}))
)
Expand Down Expand Up @@ -81,9 +81,19 @@ func (s *serviceImpl) GetCollection(ctx context.Context, request *v1.GetCollecti
return nil, errors.Errorf("%s env var is not enabled", features.ObjectCollections.EnvVar())
}
if request.GetId() == "" {
return nil, errors.Wrap(errox.InvalidArgs, "Id field should be set when requesting a collection")
return nil, errors.Wrap(errox.InvalidArgs, "Id should be set when requesting a collection")
}
return s.getCollection(ctx, request.Id)

resp, err := s.getCollection(ctx, request.GetId())
if err != nil {
return nil, err
}

// if request.GetOptions().GetWithMatches() {
// TODO match deployments for response
// }

return resp, err
}

func (s *serviceImpl) getCollection(ctx context.Context, id string) (*v1.GetCollectionResponse, error) {
Expand Down Expand Up @@ -240,3 +250,31 @@ func (s *serviceImpl) ListCollections(ctx context.Context, request *v1.ListColle
Collections: collections,
}, nil
}

func (s *serviceImpl) DryRunCollection(ctx context.Context, request *v1.DryRunCollectionRequest) (*v1.DryRunCollectionResponse, error) {
if !features.ObjectCollections.Enabled() {
return nil, errors.Errorf("%s env var is not enabled", features.ObjectCollections.EnvVar())
}

collection, err := collectionRequestToCollection(ctx, request, request.GetId())
if err != nil {
return nil, err
}

if request.GetId() == "" {
err = s.datastore.DryRunAddCollection(ctx, collection)
} else {
err = s.datastore.DryRunUpdateCollection(ctx, collection)
}
if err != nil {
return nil, err
}

// if !request.GetOptions().GetSkipDeploymentMatching() {
// TODO match deployments for response
// }

return &v1.DryRunCollectionResponse{
Deployments: nil,
}, nil
}
Loading