Skip to content

[ROX-13030] : Add delete collection API endpoint and service implementation #3648

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
charmik-redhat merged 4 commits into from
Nov 7, 2022
Merged

[ROX-13030] : Add delete collection API endpoint and service implementation #3648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce32a20
Add delete service
charmik-redhat Nov 1, 2022
6693812
Refactor and add tests
charmik-redhat Nov 1, 2022
b89588f
Address PR comments
charmik-redhat Nov 1, 2022
3617aba
Change comment
charmik-redhat Nov 4, 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
24 changes: 18 additions & 6 deletions central/resourcecollection/service/service_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var (
user.With(permissions.Modify(resources.WorkflowAdministration)): {
// "/v1.CollectionService/AutoCompleteCollection", TODO ROX-12616
"/v1.CollectionService/CreateCollection",
// "/v1.CollectionService/DeleteCollection", TODO ROX-13030
"/v1.CollectionService/DeleteCollection",
// "/v1.CollectionService/DryRunCollection", TODO ROX-13031
// "/v1.CollectionService/UpdateCollection", TODO ROX-13032
},
Expand Down Expand Up @@ -101,13 +101,27 @@ func (s *serviceImpl) getCollection(ctx context.Context, id string) (*v1.GetColl
}, nil
}

// DeleteCollection deletes the collection with the given ID
func (s *serviceImpl) DeleteCollection(ctx context.Context, request *v1.ResourceByID) (*v1.Empty, error) {
if !features.ObjectCollections.Enabled() {
return nil, errors.New("Support for resource collections is not enabled")
}
if request.GetId() == "" {
return nil, errors.Wrap(errox.InvalidArgs, "Non empty collection id must be specified to delete a collection")
}
if err := s.datastore.DeleteCollection(ctx, request.GetId()); err != nil {
return nil, err
}
return &v1.Empty{}, nil
}

// CreateCollection creates a new collection from the given request
func (s *serviceImpl) CreateCollection(ctx context.Context, request *v1.CreateCollectionRequest) (*v1.CreateCollectionResponse, error) {
if !features.ObjectCollections.Enabled() {
return nil, errors.New("Resource collections is not enabled")
return nil, errors.New("Support for resource collections is not enabled")
}

collection, err := collectionRequestToCollection(ctx, request, true, nil)
collection, err := collectionRequestToCollection(ctx, request, true)
if err != nil {
return nil, err
}
Expand All @@ -120,7 +134,7 @@ func (s *serviceImpl) CreateCollection(ctx context.Context, request *v1.CreateCo
return &v1.CreateCollectionResponse{Collection: collection}, nil
}

func collectionRequestToCollection(ctx context.Context, request collectionRequest, isCreate bool, getID func() string) (*storage.ResourceCollection, error) {
func collectionRequestToCollection(ctx context.Context, request collectionRequest, isCreate bool) (*storage.ResourceCollection, error) {
if request.GetName() == "" {
return nil, errors.Wrap(errox.InvalidArgs, "Collection name should not be empty")
}
Expand All @@ -147,8 +161,6 @@ func collectionRequestToCollection(ctx context.Context, request collectionReques
if isCreate {
collection.CreatedBy = slimUser
collection.CreatedAt = timeNow
} else if getID != nil {
collection.Id = getID()
}

if len(request.GetEmbeddedCollectionIds()) > 0 {
Expand Down
25 changes: 23 additions & 2 deletions central/resourcecollection/service/service_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,31 @@ func (suite *CollectionServiceTestSuite) TestCreateCollection() {
suite.Equal(request.GetDescription(), resp.GetCollection().GetDescription())
suite.Equal(request.GetResourceSelectors(), resp.GetCollection().GetResourceSelectors())
suite.NotNil(resp.GetCollection().GetEmbeddedCollections())
suite.Equal(request.GetEmbeddedCollectionIds(), suite.embeddedCollectionToIds(resp.GetCollection().GetEmbeddedCollections()))
suite.Equal(request.GetEmbeddedCollectionIds(), suite.embeddedCollectionsToIds(resp.GetCollection().GetEmbeddedCollections()))
suite.NotNil(resp.GetCollection().GetCreatedBy())
suite.NotNil(resp.GetCollection().GetUpdatedBy())
suite.NotNil(resp.GetCollection().GetCreatedAt())
suite.NotNil(resp.GetCollection().GetLastUpdated())
}

func (suite *CollectionServiceTestSuite) embeddedCollectionToIds(embeddedCollections []*storage.ResourceCollection_EmbeddedResourceCollection) []string {
func (suite *CollectionServiceTestSuite) TestDeleteCollection() {
if !features.ObjectCollections.Enabled() {
suite.T().Skip("skipping because env var is not set")
}
allAccessCtx := sac.WithAllAccess(context.Background())

// test error when ID is empty
_, err := suite.collectionService.DeleteCollection(allAccessCtx, &v1.ResourceByID{})
suite.Error(err)

// test successful deletion
idRequest := &v1.ResourceByID{Id: "a"}
suite.dataStore.EXPECT().DeleteCollection(allAccessCtx, idRequest.GetId()).Times(1).Return(nil)
_, err = suite.collectionService.DeleteCollection(allAccessCtx, idRequest)
suite.NoError(err)
}

func (suite *CollectionServiceTestSuite) embeddedCollectionsToIds(embeddedCollections []*storage.ResourceCollection_EmbeddedResourceCollection) []string {
if len(embeddedCollections) == 0 {
return nil
}
Expand Down
113 changes: 76 additions & 37 deletions generated/api/v1/resource_collection_service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading