jprdonnelly/steampipe
1
0
Fork 0
mirror of https://github.com/turbot/steampipe.git synced 2026-04-14 07:00:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Raises warning when pseudo resources are ignored because of named hcl resources. Closes #1328. Closes #1480

Browse Source
This commit is contained in:
Binaek Sarkar
2023-09-19 15:09:18 +05:30
committed by GitHub
parent 749d95925a
commit b7df52c059
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/steampipeconfig/parse/mod.go
View File

@@ -132,8 +132,14 @@ func ParseMod(fileData map[string][]byte, pseudoResources []modconfig.MappableRe
}
}
// collect warnings as we parse
var res = &error_helpers.ErrorAndWarnings{}
// add pseudo resources to the mod
addPseudoResourcesToMod(pseudoResources, hclResources, mod)
errorsAndWarnings := addPseudoResourcesToMod(pseudoResources, hclResources, mod)
// merge the warnings generated while adding pseudoresources
res.Merge(errorsAndWarnings)
// add the parsed content to the run context
parseCtx.SetDecodeContent(content, fileData)
@@ -145,9 +151,6 @@ func ParseMod(fileData map[string][]byte, pseudoResources []modconfig.MappableRe
return nil, error_helpers.NewErrorsAndWarning(plugin.DiagsToError("Failed to add mod to run context", diags))
}
// collect warnings as we parse
var res = &error_helpers.ErrorAndWarnings{}
// we may need to decode more than once as we gather dependencies as we go
// continue decoding as long as the number of unresolved blocks decreases
prevUnresolvedBlocks := 0

14
pkg/steampipeconfig/parse/parser.go
View File

@@ -13,8 +13,8 @@ import (
"github.com/hashicorp/hcl/v2/json"
"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
"github.com/turbot/steampipe/pkg/constants"
"github.com/turbot/steampipe/pkg/error_helpers"
"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
"github.com/turbot/steampipe/pkg/utils"
"sigs.k8s.io/yaml"
)
@@ -127,13 +127,14 @@ func parseYamlFile(filename string) (*hcl.File, hcl.Diagnostics) {
return json.Parse(jsonData, filename)
}
func addPseudoResourcesToMod(pseudoResources []modconfig.MappableResource, hclResources map[string]bool, mod *modconfig.Mod) {
var duplicates []string
func addPseudoResourcesToMod(pseudoResources []modconfig.MappableResource, hclResources map[string]bool, mod *modconfig.Mod) *error_helpers.ErrorAndWarnings {
res := error_helpers.EmptyErrorsAndWarning()
for _, r := range pseudoResources {
// is there a hcl resource with the same name as this pseudo resource - it takes precedence
name := r.GetUnqualifiedName()
if _, ok := hclResources[name]; ok {
duplicates = append(duplicates, r.GetDeclRange().Filename)
res.AddWarning(fmt.Sprintf("%s ignored as hcl resources of same name is already defined", r.GetDeclRange().Filename))
log.Printf("[TRACE] %s ignored as hcl resources of same name is already defined", r.GetDeclRange().Filename)
continue
}
// add pseudo resource to mod
@@ -141,10 +142,7 @@ func addPseudoResourcesToMod(pseudoResources []modconfig.MappableResource, hclRe
// add to map of existing resources
hclResources[name] = true
}
numDupes := len(duplicates)
if numDupes > 0 {
log.Printf("[TRACE] %d %s not converted into resources as hcl resources of same name are defined: %v", numDupes, utils.Pluralize("file", numDupes), duplicates)
}
return res
}
// get names of all resources defined in hcl which may also be created as pseudo resources