Skip to content

Sync main into develop (merge commit)#82

Merged
yimsk merged 2 commits intodevelopfrom
sync-main-v2
Jan 2, 2026
Merged

Sync main into develop (merge commit)#82
yimsk merged 2 commits intodevelopfrom
sync-main-v2

Conversation

@yimsk
Copy link
Copy Markdown
Contributor

@yimsk yimsk commented Jan 2, 2026

Summary

Merge main into develop to sync v0.6.0 release history.

Important: This PR must be merged with "Create a merge commit" (NOT squash) to properly sync branch histories.

@yimsk
Release v0.6.0 (#77)
96d6538 
* Align naming conventions with AWS CLI (#71)

* Align registry names with AWS CLI conventions

Rename 7 services to match AWS CLI naming:
- computeoptimizer → compute-optimizer
- cognito → cognito-idp
- config → configservice
- costexplorer → ce
- eventbridge → events
- macie → macie2
- sfn → stepfunctions

Old names preserved as aliases for backward compatibility.

Closes #65

* Fix pseudo-ARN prefix to match registry service name (ce)

* Add comment explaining pseudo-ARN format for Cost Explorer

* Rename directories to align with AWS CLI conventions

- Service dirs: costexplorer→ce, eventbridge→events, sfn→stepfunctions,
  cognito→cognito-idp, config→configservice, macie→macie2,
  computeoptimizer→compute-optimizer, servicequotas→service-quotas,
  licensemanager→license-manager, networkfirewall→network-firewall
- Resource dirs: hyphenate compound names (e.g., loggroups→log-groups)
- Update imports and ARN mappings

Closes #65

* Rename bedrock dirs to kebab-case for AWS CLI consistency

* Fix DAO error strings and deduplicate client helpers

* Fix error strings and deduplicate client helpers

* Fix package names to match directory names (events, stepfunctions)

* Add develop branch to CI triggers

* feat: propagate ALL_PROXY to HTTP_PROXY/HTTPS_PROXY (#74)

* feat: support ALL_PROXY environment variable (#69)

* feat: propagate ALL_PROXY to HTTP_PROXY and configure NO_PROXY

Extend proxy support based on issue #69 feedback:
- Propagate ALL_PROXY to both HTTP_PROXY and HTTPS_PROXY
- Auto-configure NO_PROXY for AWS credential endpoints:
  - 169.254.169.254 (EC2 IMDS)
  - 169.254.170.2 (ECS Task Role)
  - 169.254.170.23 (EKS Pod Identity)
- Preserve existing NO_PROXY entries, only add missing endpoints

Refs #69, #67

* fix: default NO_PROXY to IMDS only and remove proxy value from logs

- NO_PROXY now only includes EC2 IMDS (169.254.169.254) by default
- ECS/EKS endpoints can be added via config (TODO #67)
- Remove proxy URL from log output to avoid credential exposure

* refactor: simplify splitNoProxy and use tagged switch in parseFlags

* refactor: separate NO_PROXY config from ALL_PROXY propagation

configureNoProxy() now runs independently when any proxy is set,
not tied to ALL_PROXY propagation. Cleaner separation of concerns.

* refactor: remove lowercase env var support for simplicity

* refactor: remove NO_PROXY auto-configuration

* refactor: skip proxy propagation for --help/--version and cleanup test

* test: add test case for lowercase all_proxy not supported

* feat: add alias completion in command mode (#76)

* feat: add alias completion in command mode (#70)

Include aliases in GetSuggestions() so :cost+Tab suggests cost-explorer.
Self-referential aliases (sfn→sfn) excluded from suggestions.

* refactor: use prefix+fuzzy for diff completion

* refactor: use CutPrefix and cache GetAliases

* refactor: extract match functions to shared module

- Move fuzzyMatch and matchNamesWithFallback to match.go
- Make :tag/:tags clear behavior explicit
- Sort suggestions alphabetically (services + aliases)

* refactor: cache GetAliasesForService and sort match results

* refactor: unify command parser pattern for sort and login

* test: add cache concurrency tests and improve comments

* refactor: use CutPrefix in ecs tasks render

* refactor: use CutSuffix in parseNumericValue

* fix: quote profile name in error message for clarity

* fix: lowercase pattern in fuzzyMatch for case insensitivity

* chore: remove .claude symlink

* chore: add .claude to gitignore

* fix: lowercase pattern in matchNamesWithFallback prefix check

* fix: return defensive copy from alias cache methods
@claude

This comment was marked as outdated.

Sign in to view
@claude
Copy link
Copy Markdown

claude Bot commented Jan 2, 2026

PR Review: Sync main into develop (merge commit)

Overview

This PR merges the v0.6.0 release from main back into develop to sync branch histories. The PR includes:

  • Release v0.6.0 (Release v0.6.0 #77) containing alias completion, proxy propagation, and naming alignment features
  • A merge commit that preserves develop's config.yaml features

Analysis

✅ Positive Findings

  1. Correct Merge Strategy: The PR correctly specifies that this must be merged as a "merge commit" rather than squash. This is critical for maintaining proper Git history when syncing release branches back to development branches.

  2. Clean Merge State: The PR shows:

    • 0 file additions/deletions (expected for a clean fast-forward merge)
    • Mergeable status: MERGEABLE
    • CI passing successfully
    • No conflicts detected

  3. Proper Branch Flow: This follows the correct gitflow pattern of merging main → develop after a release to ensure develop has the latest production code.

  4. Release Content: The v0.6.0 release (Release v0.6.0 #77) being merged contains well-structured features:

⚠️ Observations

  1. Merge State Status: The PR shows mergeStateStatus: UNSTABLE which typically indicates:

    • Some CI checks are still in progress (CodeQL and claude-review are running)
    • This is not blocking but should resolve before merge
    • Current CI check has passed successfully

  2. No File Changes: The diff shows 0 additions/0 deletions, which is expected for a clean sync where develop was already up to date with main's changes (likely from the previous merge commit mentioned in the description).

  3. Context from Description: The PR mentions it "keeps develop config.yaml features" - this suggests there was a previous merge that already reconciled differences. This PR appears to be completing that sync cleanly.

🔍 Recommendations

  1. Wait for CI Completion: Before merging, ensure:

    • CodeQL analysis (go) completes successfully
    • This claude-review check completes

  2. Verify Merge Method: When merging:

    • ✅ Use "Create a merge commit"
    • ❌ Do NOT use "Squash and merge"
    • ❌ Do NOT use "Rebase and merge"
    • This preserves the complete history from main in develop

  3. Post-Merge Verification: After merging, verify:

    • git log develop shows the v0.6.0 commits
    • develop's history includes all main's commits
    • No duplicate commits or diverged history

Conclusion

Recommendation: APPROVE (pending CI completion)

This is a straightforward and necessary branch sync PR. The approach is correct, the merge is clean, and no code changes are being introduced. The explicit instruction to use "merge commit" is crucial and appreciated.

Once the remaining CI checks complete successfully, this is safe to merge.

Review generated by Claude Code

@yimsk yimsk merged commit 84e5150 into develop Jan 2, 2026
5 checks passed
@yimsk yimsk deleted the sync-main-v2 branch January 2, 2026 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@yimsk