Claude/resolve merge conflicts y5 f zg#19
Merged
jeffreyaven merged 3 commits intomainfrom Feb 27, 2026
Merged
Conversation
Resource-scoped exports:
- export_vars() now stores each exported variable under both its plain
name (e.g. `role_name`) and a resource-scoped name
(e.g. `aws_cross_account_role.role_name`)
- Plain names follow last-writer-wins; scoped names are immutable
- Template engine converts dotted context keys into nested Tera objects
so {{ resource.var }} property-access syntax works naturally
- Both render_template and render_with_filters support dotted keys
Manifest validation:
- New src/resource/validation.rs module with extensible rules-based
architecture -- add a rule by appending a function to the rules vec
- First rule: unique_resource_names -- rejects manifests with duplicate
resource names (critical since scoped exports rely on unique names)
- Validation runs in CommandRunner::new before any command proceeds
- Unit tests with in-memory manifests and YAML file-based tests
(positive and negative cases)
Documentation:
- New docs/exports.md covering unscoped/scoped references, aliased
exports, protected exports, and stack-level exports
https://claude.ai/code/session_01FikwxWpZdvhtNbECVWJiqK
Merge origin/claude/modularize-manifest-policy-akY5V into main branch state, resolving three-way conflicts: - src/resource/mod.rs: keep HEAD's clean version (no commented-out dead code) - src/core/utils.rs: keep HEAD's cleaner export_vars implementation with resource-scoped-first ordering and unified logging - src/resource/validation.rs: use modularize branch's more extensible RULES-array approach with HashMap-based duplicate tracking (reports index of first occurrence) and more comprehensive test coverage including YAML file-based integration tests Also brings in from modularize branch: - docs/exports.md: new exports documentation - src/commands/base.rs: validate_manifest call on startup - src/template/engine.rs: template engine improvements https://claude.ai/code/session_01CVjADJJNzKs6jQvf5RHyee
- Run cargo fmt to fix style issues in base.rs, utils.rs, globals.rs, common_args.rs, and display.rs - Fix test_duplicate_names_manifest_file_fails_validation: Manifest::load_from_stack_dir already calls validate_manifest internally, so a duplicate-name manifest fails at load time; assert on the load error instead of unwrapping it https://claude.ai/code/session_01CVjADJJNzKs6jQvf5RHyee
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
2 participants
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.
No description provided.