API Refactor: implement bundle.BatchDeleteFederatedBundle #1607
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarcosDY
requested review from
amartinezfayo,
APTy,
azdagron,
evan2645 and
mcpherrinm
as code owners
azdagron
reviewed
Jun 3, 2020
pkg/server/api/bundle/v1/service.go
Outdated
| return nil, status.Errorf(codes.Unimplemented, "method BatchDeleteFederatedBundle not implemented") | ||
| log := rpccontext.Logger(ctx) | ||
|
|
||
| if len(req.TrustDomains) == 0 { |
There was a problem hiding this comment.
I think we should probably just return an empty response here?
pkg/server/api/bundle/v1/service.go
Outdated
Comment on lines
218
to
219
| log.Error("Invalid request: no possible to delete server bundle") | ||
| return status.Error(codes.InvalidArgument, "no possible to delete server bundle") |
There was a problem hiding this comment.
Suggested change
| log.Error("Invalid request: no possible to delete server bundle") | |
| return status.Error(codes.InvalidArgument, "no possible to delete server bundle") | |
| log.Error("Invalid request: removing the bundle for the server trust domain is not allowed") | |
| return status.Error(codes.InvalidArgument, "removing the bundle for the server trust domain is not allowed") |
| _, err = s.ds.DeleteBundle(ctx, &datastore.DeleteBundleRequest{ | ||
| TrustDomainId: td.String(), | ||
| // TODO: what mode must we use here? | ||
| Mode: datastore.DeleteBundleRequest_RESTRICT, |
There was a problem hiding this comment.
Hmm. This seems like the safest option for now. I'll have to think on this.
pkg/server/api/bundle/v1/service.go
Outdated
Comment on lines
228
to
229
| log.WithError(err).Error("Failed to delete Federated Bundle") | ||
| return status.Errorf(codes.Internal, "failed to delete Federated Bundle: %v", err) |
There was a problem hiding this comment.
Suggested change
| log.WithError(err).Error("Failed to delete Federated Bundle") | |
| return status.Errorf(codes.Internal, "failed to delete Federated Bundle: %v", err) | |
| log.WithError(err).Error("Failed to delete federated bundle") | |
| return status.Errorf(codes.Internal, "failed to delete federated bundle: %v", err) |
MarcosDY
force-pushed
the
api-refactor-batch-delete-fbundle
branch
from
a3f291d
to
40050f6
Compare
azdagron
reviewed
Jun 3, 2020
| @@ -511,8 +511,11 @@ func TestAppendBundle(t *testing.T) { | |||
| t.Run(tt.name, func(t *testing.T) { | |||
| test.logHook.Reset() | |||
| test.setBundle(t, sb) | |||
| // Make sure no error is set to next call | |||
There was a problem hiding this comment.
Maybe a better thing to do is to initialize a new test for each test case instead of trying to clean up/reset state on the existing test.
Signed-off-by: Marcos Yacob <marcos@scytale.io>
MarcosDY
force-pushed
the
api-refactor-batch-delete-fbundle
branch
from
c388348
to
5712583
Compare
azdagron
approved these changes
Jun 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements bundle.BatchDeleteFederatedBundle
Which issue this PR fixes
fixes #1556