fix: Allow nested Terraform resources #1093
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
This fixes the dependency tree by adding recursion. It now finds indirect connections and associates it with an agent. An example is attached which surfaced this issue.
Codecov Report
@@ Coverage Diff @@
## main #1093 +/- ##
==========================================
- Coverage 66.53% 66.48% -0.05%
==========================================
Files 255 255
Lines 15671 15675 +4
Branches 152 152
==========================================
- Hits 10426 10421 -5
- Misses 4180 4184 +4
- Partials 1065 1070 +5
Continue to review full report at Codecov.
|
3111ac9 to
4aa794f
Compare
johnstcn
reviewed
Apr 20, 2022
| Invoke-WebRequest -Uri ${ACCESS_URL}bin/coder-windows-amd64.exe -OutFile $env:TEMP\sshd.exe | ||
| Set-MpPreference -DisableRealtimeMonitoring $true -ExclusionPath $env:TEMP\sshd.exe | ||
| $env:CODER_AUTH = "${AUTH_TYPE}" | ||
| $env:CODER_URL = "${ACCESS_URL}" | ||
| Start-Process -FilePath $env:TEMP\sshd.exe -ArgumentList "agent" -PassThru | ||
| `, | ||
| Start-Process -FilePath $env:TEMP\sshd.exe -ArgumentList "agent" -PassThru`, |
johnstcn
reviewed
Apr 20, 2022
| for _, dep := range resourceNode { | ||
| var has bool | ||
| agent, has := agents[dep] | ||
| if !has { |
johnstcn
reviewed
Apr 20, 2022
| } | ||
| direct[label] = dependencies | ||
| label, exists := dependencyNode.Attrs["label"] | ||
| if !exists { |
johnstcn
reviewed
Apr 20, 2022
| // findAgents recursively searches through resource dependencies | ||
| // to find associated agents. Nested is required for indirect | ||
| // dependency matching. | ||
| func findAgents(resourceDependencies map[string][]string, agents map[string]*proto.Agent, resourceKey string) []*proto.Agent { |
There was a problem hiding this comment.
Would it make sense to have an upper bound on recursion depth "just in case"?
There was a problem hiding this comment.
We limit payload file size, so I don't think it'd be possible to bomb it beyond 10mb.
johnstcn
approved these changes
Apr 20, 2022
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.
This fixes the dependency tree by adding recursion. It
now finds indirect connections and associates it with
an agent.
An example is attached which surfaced this issue.