refactor: reorganize commands directory for better code organization #958
Conversation
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
james00012
force-pushed
the
refactor/commands-directory-only
branch
2 times, most recently
from
dd7bf5c to
d809013
Compare
This commit refactors the commands directory by: - Extracting AWS command handlers to aws_commands.go - Extracting GCP command handlers to gcp_commands.go - Creating reusable flag helpers in flags.go - Creating shared helper functions in helpers.go - Adding new error types to errors.go for better error handling - Simplifying cli.go to use the new modular structure Minimal supporting change: - Added config.ApplyTimeFilters() helper method (10 lines) These changes improve code organization and maintainability without changing functionality. All telemetry event names remain as string literals to keep changes minimal and focused on commands directory structure.
james00012
force-pushed
the
refactor/commands-directory-only
branch
from
d809013 to
bdb53e1
Compare
Address code review feedback: - Add documentation noting that GCP --resource-type and --exclude-resource-type flags are currently ignored (will be implemented in future PR) - Add validation to ensure timeout parameter is positive - Prevents confusing behavior where users expect filtering but get none
denis256
reviewed
Nov 3, 2025
denis256
reviewed
Nov 3, 2025
denis256
reviewed
Nov 3, 2025
denis256
reviewed
Nov 3, 2025
|
|
||
| // CombineFlags combines multiple flag slices into one | ||
| func CombineFlags(flagSets ...[]cli.Flag) []cli.Flag { | ||
| var combined []cli.Flag |
Member
There was a problem hiding this comment.
Cibsuder to pre-allocate combined slice
Contributor
Author
There was a problem hiding this comment.
Good catch! In this case, CombineFlags is only called during CLI initialization (not in a hot path), and we're combining a small number of flag sets. The performance benefit of pre-allocation would be negligible here, while the two-pass approach adds complexity (e.g., calculating the length and preallocating). I think the simpler, more readable version is better suited for this use case. WDYT?
denis256
reviewed
Nov 3, 2025
denis256
previously approved these changes
Nov 3, 2025
- Add TrackCommandLifecycle helper to reduce telemetry boilerplate - Update all command handlers (awsNuke, awsDefaults, awsInspect, gcpNuke, gcpInspect) to use new helper - Consolidate parseLogLevel usage in awsDefaults for consistent error handling - Remove unused logging import from aws_commands.go This refactoring reduces code duplication and improves maintainability, making it easier to integrate with OpenTelemetry in the future.
denis256
approved these changes
Nov 5, 2025
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.
Summary
Refactors the monolithic
commands/cli.go(~800 lines) into focused, modular files for better code organization and maintainability.Changes
Commands Directory:
aws_commands.go(new) - AWS command handlersgcp_commands.go(new) - GCP command handlersflags.go(new) - Reusable flag definitionshelpers.go(new) - Shared utility functionscli.go(simplified) - CLI setup only (~100 lines)cli_test.go(updated) - Enhanced testserrors.go(updated) - New structured error typesSupporting:
config/config.go- AddedApplyTimeFilters()helper (10 lines)Notes
--resource-typeand--exclude-resource-typeflags are currently ignored (will be implemented in future PR)Stats: 10 files changed, 963 insertions(+), 755 deletions(-)