feat: sort the variables in the same order from input variables.tf file. #2591
Conversation
qz267
requested review from
bharathkkb,
g-awmalik and
apeabody
as code owners
|
@qz267 LGTM! Can we add a test scenario for this! |
| if hclDiags.HasErrors() { | ||
| Log.Info("Failed to parse HCL: ", "diags: ", hclDiags) | ||
| } | ||
| variableContent, _, hclDiags := variableFile.Body.PartialContent(variableSchema) |
There was a problem hiding this comment.
Would there be problem here if there was an error in variables.tf file parsing?
There was a problem hiding this comment.
How about calling log.Error() instead? Or do you have any suggestions?
There was a problem hiding this comment.
My recommendation would be to propagate the error from this function (change signature to (map[string]int, error) and only sort if no error, otherwise log and continue so we degrade gracefully. IRL if this throws an error, we would not reach here as it will likely be caught earlier in tfconfig.LoadModule.
| if hclDiags.HasErrors() { | ||
| Log.Info("Failed to parse HCL: ", "diags: ", hclDiags) | ||
| } | ||
| variableContent, _, hclDiags := variableFile.Body.PartialContent(variableSchema) |
There was a problem hiding this comment.
My recommendation would be to propagate the error from this function (change signature to (map[string]int, error) and only sort if no error, otherwise log and continue so we degrade gracefully. IRL if this throws an error, we would not reach here as it will likely be caught earlier in tfconfig.LoadModule.
cli/bpmetadata/tfconfig.go
Outdated
| variableOrderKeys[block.Labels[0]] = i | ||
|
|
||
| } | ||
| Log.Info("Found variables in order: ", "variableOrderKeys: ", variableOrderKeys) |
There was a problem hiding this comment.
Let's remove this, I had it just for debugging in the internal poc
| configPath string | ||
| expectOrders map[string]int | ||
| }{ | ||
| { |
There was a problem hiding this comment.
Could we add a few more cases with no outputs and invalid output block declaration?
bharathkkb
changed the title
…y names when failed to get the original customer sort order
|
#2591 (comment) |
Use hclparse to read order of variables from variables.tf. Sort the metadata.yaml with variables in this obtained order.