feat(ske): Check service enablement only in error case#1457
Open
Fyusel wants to merge 1 commit into
Open
Conversation
STACKITCLI-287 Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>
Merging this branch will not change overall coverage
Coverage by fileChanged files (no unit tests)
Please note that the "Total", "Covered", and "Missed" counts above refer to code statements instead of lines of code. The value in brackets refers to the test coverage of that file in the old version of the code. |
| Service: "ske", | ||
| } | ||
| } | ||
| return err |
Contributor
There was a problem hiding this comment.
it's a bit late, but wouldn't this hide the original error from line 99 (ClusterExists) when service is enabled and the call to ProjectEnabled would return a nil error?
So sth. like
exists, err := skeUtils.ClusterExists(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.ClusterName)
// err is now sth. like 'server is down'
if err != nil {
// Check if the project is enabled
enabled, err := serviceEnablementUtils.ProjectEnabled(ctx, serviceEnablementApiClient, model.ProjectId, model.Region)
// let's assume call succeeds, enabled=true and err=nil now
if err != nil {
return fmt.Errorf("check if project is enabled failed: %w", err)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "ske",
}
}
return err
// we return nil here instead of 'server is down'
This file contains hidden or 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
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.
STACKITCLI-287
Description
Checklist
make fmtmake generate-docs(will be checked by CI)make test(will be checked by CI)make lint(will be checked by CI)