CSS-5266 - Tweak length check to require at least 1 region and controller #1034
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
babakks
approved these changes
Aug 24, 2023
internal/jimm/cloud.go
Outdated
| // Ensure we always have at least 1 region for the cloud with at least 1 controller | ||
| // managing that region. | ||
| if len(c.Regions) < 1 || len(c.Regions[0].Controllers) < 1 { | ||
| zapctx.Error(ctx, "cloud regions check", zap.Int("regions", len(c.Regions))) |
There was a problem hiding this comment.
The error message is not clear enough.
There was a problem hiding this comment.
This is more of a debug line actually, if I change it to Debug should I then leave it or make it more explanatory?
There was a problem hiding this comment.
Although a clear message is good anyway, but if it's just for future debugging, leave it as is. Also, I'm not sure if changing the level to debug is going to help, because we may lose it due to the applied log-level config.
internal/jimm/cloud.go
Outdated
| if len(c.Regions) < 1 || len(c.Regions[0].Controllers) < 1 { | ||
| zapctx.Error(ctx, "cloud regions check", zap.Int("regions", len(c.Regions))) | ||
| if len(c.Regions) > 0 { | ||
| zapctx.Error(ctx, "region controllers check", zap.Int("controllers", len(c.Regions[0].Controllers))) |
ale8k
reviewed
Aug 24, 2023
| return errors.E(op, "cloud administration not available for %s", ct.Id()) | ||
| // Ensure we always have at least 1 region for the cloud with at least 1 controller | ||
| // managing that region. | ||
| if len(c.Regions) < 1 || len(c.Regions[0].Controllers) < 1 { |
There was a problem hiding this comment.
It was != 1, but that includes cases with > 1 elements which shouldn't result in an error.
ale8k
approved these changes
Aug 24, 2023
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.
Description
Fix the length check in
doCloudAdminto allow granting access to clouds that have more than 1 region and more than 1 controller for said region.Addresses the main issue from CSS-5266
Engineering checklist
Check only items that apply