Refactor: Replace YamlHelper utility with YamlScalarAccessor trait #154
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
sjungling
force-pushed
the
refactor/gha-yml-traits
branch
from
f0f9f53 to
0a891a8
Compare
Migrated all security recipes from static YamlHelper utility methods to the YamlScalarAccessor trait pattern. This improves code organization and follows OpenRewrite best practices for LST manipulation. Changes: - Created YamlScalarAccessor trait with 6 default methods - Migrated 7 recipes to implement the trait - Deleted deprecated YamlHelper utility class - All tests pass
sjungling
force-pushed
the
refactor/gha-yml-traits
branch
from
0a891a8 to
47ff257
Compare
Renamed org.openrewrite.github.traits to org.openrewrite.github.util to better reflect that YamlScalarAccessor is a utility interface/mixin rather than an OpenRewrite trait (which should extend Trait<T>). Changes: - Moved package from traits/ to util/ - Updated all imports in recipe files - Updated package-info documentation - All tests pass
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+23
to
+25
| import org.openrewrite.yaml.YamlIsoVisitor; | ||
| import org.openrewrite.yaml.tree.Yaml; | ||
|
|
There was a problem hiding this comment.
Suggested change
| import org.openrewrite.yaml.YamlIsoVisitor; | |
| import org.openrewrite.yaml.tree.Yaml; | |
| import org.openrewrite.yaml.YamlIsoVisitor; |
Comment on lines
+62
to
+64
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(steps).hasSize(2); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| assertThat(steps).hasSize(2); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("actions/checkout"); | |
| assertThat(steps.getFirst().getActionVersion()).isEqualTo("v3"); |
Comment on lines
+90
to
+91
| .collect(Collectors.toList()); | ||
|
|
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("actions/setup-java"); |
| spec -> spec.afterRecipe(results -> { | ||
| ActionStep.Matcher matcher = new ActionStep.Matcher(); | ||
| List<ActionStep> steps = matcher.lower(results) | ||
| .collect(Collectors.toList()); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| .toList(); |
Comment on lines
+137
to
+141
| .collect(Collectors.toList()); | ||
|
|
||
| // Test semantic version | ||
| assertThat(steps.get(0).getActionName()).isEqualTo("actions/checkout"); | ||
| assertThat(steps.get(0).getActionVersion()).isEqualTo("v3"); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| // Test semantic version | |
| assertThat(steps.get(0).getActionName()).isEqualTo("actions/checkout"); | |
| assertThat(steps.get(0).getActionVersion()).isEqualTo("v3"); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("actions/checkout"); | |
| assertThat(steps.getFirst().getActionVersion()).isEqualTo("v3"); | |
| assertThat(steps.getFirst().getActionOwner()).isEqualTo("actions"); | |
| assertThat(steps.getFirst().isVersionPinned()).isFalse(); |
Comment on lines
+195
to
+198
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(steps).hasSize(1); | ||
| assertThat(steps.get(0).getActionName()).isEqualTo("actions/checkout"); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| assertThat(steps).hasSize(1); | |
| assertThat(steps.get(0).getActionName()).isEqualTo("actions/checkout"); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("actions/checkout"); | |
| assertThat(steps.getFirst().getActionVersion()).isNull(); | |
| assertThat(steps.getFirst().isVersionPinned()).isFalse(); |
Comment on lines
+221
to
+222
| .collect(Collectors.toList()); | ||
|
|
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("actions/checkout"); |
| spec -> spec.afterRecipe(results -> { | ||
| ActionStep.Matcher matcher = new ActionStep.Matcher(); | ||
| List<ActionStep> steps = matcher.lower(results) | ||
| .collect(Collectors.toList()); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| .toList(); |
Comment on lines
+279
to
+282
| .collect(Collectors.toList()); | ||
|
|
||
| // Both should match - local actions are still action steps | ||
| assertThat(steps).hasSize(2); |
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| // Both should match - local actions are still action steps | |
| assertThat(steps).hasSize(2); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionRef()).isEqualTo("./local-action"); | |
| assertThat(steps.getFirst().getActionName()).isEqualTo("./local-action"); | |
| assertThat(steps.getFirst().getActionOwner()).isNull(); // No owner for local actions |
Comment on lines
+305
to
+306
| .collect(Collectors.toList()); | ||
|
|
There was a problem hiding this comment.
Suggested change
| .collect(Collectors.toList()); | |
| .toList(); | |
| assertThat(steps.getFirst().getActionRef()).isEqualTo("docker://alpine:3.8"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Migrated all security recipes from static YamlHelper utility methods to
the YamlScalarAccessor trait pattern. This improves code organization and
follows OpenRewrite best practices for LST manipulation.
Changes: