feat: include coder_parameters from external modules #8195
Merged
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
johnstcn
approved these changes
Jun 26, 2023
provisioner/terraform/resources.go
Outdated
Comment on lines
741
to
744
| for _, o := range ordered { | ||
| if resource.Name == o.Name { | ||
| goto next | ||
| } |
There was a problem hiding this comment.
I don't have anything in particular against the goto here, but continue outerLoop is likely to raise fewer eyebrows.
There was a problem hiding this comment.
I hear you. I replaced goto with a simple boolean check.
mafredri
approved these changes
Jun 26, 2023
provisioner/terraform/resources.go
Outdated
Comment on lines
757
to
760
| withExternal := make([]*tfjson.StateResource, 0, len(ordered)+len(external)) | ||
| withExternal = append(withExternal, external...) | ||
| withExternal = append(withExternal, ordered...) | ||
| ordered = withExternal |
There was a problem hiding this comment.
This could be simplified:
Suggested change
| withExternal := make([]*tfjson.StateResource, 0, len(ordered)+len(external)) | |
| withExternal = append(withExternal, external...) | |
| withExternal = append(withExternal, ordered...) | |
| ordered = withExternal | |
| ordered = append(external, ordered...) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #8090
This PR modifies the
ConvertResourceslogic to includecoder_parameters from external modules. It also refactors the routine to preventnilresources.