mirror of
https://github.com/anchore/syft.git
synced 2026-11-01 06:56:40 +01:00
chore(deps): update Go version (#4773)
Signed-off-by: anchore-oss-update-bot <anchore-oss-update-bot@users.noreply.github.com> Co-authored-by: anchore-oss-update-bot <anchore-oss-update-bot@users.noreply.github.com>
This commit is contained in:
co-authored by
anchore-oss-update-bot
parent
26e87c7cd3
commit
5b58ec96b7
@@ -15,9 +15,9 @@ import (
|
||||
|
||||
// AppConfigField represents an application-level configuration field for catalogers
|
||||
type AppConfigField struct {
|
||||
Key string // e.g., "golang.search-local-mod-cache-licenses"
|
||||
Description string // extracted from DescribeFields() method
|
||||
DefaultValue interface{} // extracted from Default*() functions
|
||||
Key string // e.g., "golang.search-local-mod-cache-licenses"
|
||||
Description string // extracted from DescribeFields() method
|
||||
DefaultValue any // extracted from Default*() functions
|
||||
}
|
||||
|
||||
// extractEcosystemConfigFieldsFromCatalog parses catalog.go and extracts the ecosystem-specific
|
||||
@@ -390,7 +390,7 @@ func extractDescriptionsFromDescribeFields(f *ast.File) map[string]string {
|
||||
}
|
||||
|
||||
// extractNestedAppConfigs handles nested config structs like golang.MainModuleVersion
|
||||
func extractNestedAppConfigs(f *ast.File, parentKey, parentFieldName string, fieldType ast.Expr, descriptions map[string]string, defaults map[string]interface{}) []AppConfigField {
|
||||
func extractNestedAppConfigs(f *ast.File, parentKey, parentFieldName string, fieldType ast.Expr, descriptions map[string]string, defaults map[string]any) []AppConfigField {
|
||||
var configs []AppConfigField
|
||||
|
||||
// find the nested struct type
|
||||
@@ -449,8 +449,8 @@ func extractNestedAppConfigs(f *ast.File, parentKey, parentFieldName string, fie
|
||||
description := descriptions[nestedPath]
|
||||
|
||||
// try to get default value from nested defaults
|
||||
var defaultValue interface{}
|
||||
if nestedDefaults, ok := defaults[parentFieldName].(map[string]interface{}); ok {
|
||||
var defaultValue any
|
||||
if nestedDefaults, ok := defaults[parentFieldName].(map[string]any); ok {
|
||||
defaultValue = nestedDefaults[fieldName]
|
||||
}
|
||||
|
||||
@@ -465,8 +465,8 @@ func extractNestedAppConfigs(f *ast.File, parentKey, parentFieldName string, fie
|
||||
}
|
||||
|
||||
// extractAppDefaultValues extracts default values from the default*Config function
|
||||
func extractAppDefaultValues(f *ast.File) map[string]interface{} {
|
||||
defaults := make(map[string]interface{})
|
||||
func extractAppDefaultValues(f *ast.File) map[string]any {
|
||||
defaults := make(map[string]any)
|
||||
|
||||
for _, decl := range f.Decls {
|
||||
funcDecl, ok := decl.(*ast.FuncDecl)
|
||||
@@ -518,7 +518,7 @@ func extractAppDefaultValues(f *ast.File) map[string]interface{} {
|
||||
}
|
||||
|
||||
// extractAppValue extracts a Go value from an AST expression
|
||||
func extractAppValue(expr ast.Expr) interface{} {
|
||||
func extractAppValue(expr ast.Expr) any {
|
||||
switch v := expr.(type) {
|
||||
case *ast.BasicLit:
|
||||
// string, int, bool literals
|
||||
@@ -543,7 +543,7 @@ func extractAppValue(expr ast.Expr) interface{} {
|
||||
}
|
||||
case *ast.CompositeLit:
|
||||
// nested struct literal
|
||||
nested := make(map[string]interface{})
|
||||
nested := make(map[string]any)
|
||||
for _, elt := range v.Elts {
|
||||
kvExpr, ok := elt.(*ast.KeyValueExpr)
|
||||
if !ok {
|
||||
|
||||
@@ -340,7 +340,7 @@ func TestExtractAppValue(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
src string
|
||||
want interface{}
|
||||
want any
|
||||
}{
|
||||
{
|
||||
name: "string literal",
|
||||
@@ -406,7 +406,7 @@ func TestExtractAppValue_NestedStruct(t *testing.T) {
|
||||
got := extractAppValue(compositeLit)
|
||||
|
||||
// verify it's a map with the expected values
|
||||
gotMap, ok := got.(map[string]interface{})
|
||||
gotMap, ok := got.(map[string]any)
|
||||
require.True(t, ok)
|
||||
require.Equal(t, "value", gotMap["Field1"])
|
||||
require.Equal(t, true, gotMap["Field2"])
|
||||
|
||||
@@ -567,8 +567,8 @@ func resolveImportedConstant(pkgName, constName string, ctx *parseContext) strin
|
||||
// resolveImportPath converts an import path to a file system path
|
||||
func resolveImportPath(importPath, repoRoot string) string {
|
||||
// for github.com/anchore/syft/... imports, convert to repo-relative path
|
||||
if strings.HasPrefix(importPath, "github.com/anchore/syft/") {
|
||||
relPath := strings.TrimPrefix(importPath, "github.com/anchore/syft/")
|
||||
if after, ok := strings.CutPrefix(importPath, "github.com/anchore/syft/"); ok {
|
||||
relPath := after
|
||||
return filepath.Join(repoRoot, relPath)
|
||||
}
|
||||
|
||||
|
||||
@@ -214,7 +214,7 @@ func mapCatalogerToEcosystem(cat capabilities.CatalogerEntry) string {
|
||||
}
|
||||
|
||||
// updateNodeTreeEcosystem updates an existing ecosystem YAML node tree
|
||||
func updateNodeTreeEcosystem(rootNode *yaml.Node, doc interface{}) error {
|
||||
func updateNodeTreeEcosystem(rootNode *yaml.Node, doc any) error {
|
||||
var newNode yaml.Node
|
||||
if err := newNode.Encode(doc); err != nil {
|
||||
return err
|
||||
@@ -242,7 +242,7 @@ func updateNodeTreeEcosystem(rootNode *yaml.Node, doc interface{}) error {
|
||||
}
|
||||
|
||||
// updateNodeTreeAppConfig updates appconfig YAML node tree
|
||||
func updateNodeTreeAppConfig(rootNode *yaml.Node, doc interface{}) error {
|
||||
func updateNodeTreeAppConfig(rootNode *yaml.Node, doc any) error {
|
||||
return updateNodeTreeEcosystem(rootNode, doc)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user