Skip to content

Commit f347d3a

Browse files
committed
feat: add more trace output
1 parent cc86f69 commit f347d3a

File tree

2 files changed

+33
-0
lines changed

2 files changed

+33
-0
lines changed

internal/ocm-cli/component_getter.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"context"
55
"fmt"
66
"strings"
7+
8+
"github.com/openmcp-project/bootstrapper/internal/log"
79
)
810

911
type ComponentGetter struct {
@@ -86,6 +88,9 @@ func (g *ComponentGetter) OCMConfig() string {
8688
}
8789

8890
func (g *ComponentGetter) GetReferencedComponentVersion(ctx context.Context, parentCV *ComponentVersion, refName string) (*ComponentVersion, error) {
91+
logger := log.GetLogger()
92+
logger.Tracef("Comp_Getter: Getting component reference %s in component version %s", refName, parentCV.Component.Name)
93+
8994
ref, err := parentCV.GetComponentReference(refName)
9095
if err != nil {
9196
return nil, fmt.Errorf("error getting component reference %s: %w", refName, err)
@@ -97,10 +102,14 @@ func (g *ComponentGetter) GetReferencedComponentVersion(ctx context.Context, par
97102
return nil, fmt.Errorf("error getting component version %s: %w", location, err)
98103
}
99104

105+
logger.Tracef("Comp_Getter: Found component reference %s in component version %s", refName, parentCV.Component.Name)
100106
return cv, nil
101107
}
102108

103109
func (g *ComponentGetter) GetReferencedComponentVersionRecursive(ctx context.Context, parentCV *ComponentVersion, refName string) (*ComponentVersion, error) {
110+
logger := log.GetLogger()
111+
logger.Tracef("Comp_Getter: Searching for component reference %s in component version %s", refName, parentCV.Component.Name)
112+
104113
// First, try to get the reference directly from the parent component version
105114
ref, err := g.GetReferencedComponentVersion(ctx, parentCV, refName)
106115
if err == nil {
@@ -123,6 +132,9 @@ func (g *ComponentGetter) GetReferencedComponentVersionRecursive(ctx context.Con
123132
}
124133

125134
func (g *ComponentGetter) GetComponentVersionForResourceRecursive(ctx context.Context, parentCV *ComponentVersion, resourceName string) (*ComponentVersion, error) {
135+
logger := log.GetLogger()
136+
logger.Tracef("Comp_Getter: Searching for resource %s in component version %s", resourceName, parentCV.Component.Name)
137+
126138
// Check if the resource exists in the current component version
127139
_, err := parentCV.GetResource(resourceName)
128140
if err == nil {
@@ -149,6 +161,9 @@ func (g *ComponentGetter) DownloadTemplatesResource(ctx context.Context, downloa
149161
}
150162

151163
func (g *ComponentGetter) DownloadDirectoryResourceByLocation(ctx context.Context, rootCV *ComponentVersion, location string, downloadDir string) error {
164+
logger := log.GetLogger()
165+
logger.Tracef("Comp_Getter: Downloading directory resource from location %s", location)
166+
152167
var err error
153168

154169
location = strings.TrimSpace(location)

internal/template/template.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
gotmpl "text/template"
88

99
"github.com/Masterminds/sprig/v3"
10+
"github.com/openmcp-project/bootstrapper/internal/log"
1011
"sigs.k8s.io/yaml"
1112

1213
ocmcli "github.com/openmcp-project/bootstrapper/internal/ocm-cli"
@@ -29,6 +30,8 @@ func fromYAML(input string) (any, error) {
2930
}
3031

3132
func getComponentVersionByReference(ctx context.Context, compGetter *ocmcli.ComponentGetter, args ...interface{}) *ocmcli.ComponentVersion {
33+
logger := log.GetLogger()
34+
3235
if compGetter == nil {
3336
panic("ComponentGetter must not be nil")
3437
}
@@ -45,8 +48,13 @@ func getComponentVersionByReference(ctx context.Context, compGetter *ocmcli.Comp
4548
parentCv = args[0].(*ocmcli.ComponentVersion)
4649
}
4750

51+
logger.Tracef("Template_Func: getComponentVersionByReference called with parent component version: %s and reference name: %s", parentCv.Component.Name, referenceName)
52+
4853
cv, err := compGetter.GetReferencedComponentVersionRecursive(ctx, parentCv, referenceName)
4954
if err != nil || cv == nil {
55+
if err != nil {
56+
logger.Errorf("Template_Func: getComponentVersionByReference error getting component version by reference %s from parent component version %s: %v", referenceName, parentCv.Component.Name, err)
57+
}
5058
return nil
5159
}
5260

@@ -73,12 +81,18 @@ func componentVersionAsMap(cv *ocmcli.ComponentVersion) map[string]interface{} {
7381
}
7482

7583
func getResourceFromComponentVersion(compGetter *ocmcli.ComponentGetter, cv *ocmcli.ComponentVersion, resourceName string) map[string]interface{} {
84+
logger := log.GetLogger()
85+
logger.Tracef("Template_Func: getResourceFromComponentVersion called with component version: %s and resource name: %s", cv.Component.Name, resourceName)
86+
7687
if compGetter == nil {
7788
panic("ComponentGetter must not be nil")
7889
}
7990

8091
res, err := cv.GetResource(resourceName)
8192
if err != nil || res == nil {
93+
if err != nil {
94+
logger.Errorf("Template_Func: getResourceFromComponentVersion error getting resource %s from component version %s: %v", resourceName, cv.Component.Name, err)
95+
}
8296
return nil
8397
}
8498

@@ -105,12 +119,16 @@ func getOCMRepository(compGetter *ocmcli.ComponentGetter) string {
105119
}
106120

107121
func listComponentVersions(ctx context.Context, compGetter *ocmcli.ComponentGetter, cv *ocmcli.ComponentVersion) []string {
122+
logger := log.GetLogger()
123+
logger.Tracef("Template_Func: listComponentVersions called with component version: %s", cv.Component.Name)
124+
108125
if compGetter == nil {
109126
panic("ComponentGetter must not be nil")
110127
}
111128

112129
versions, err := cv.ListComponentVersions(ctx, compGetter.OCMConfig())
113130
if err != nil {
131+
logger.Errorf("Template_Func: listComponentVersions error listing component versions for component %s: %v", cv.Component.Name, err)
114132
return nil
115133
}
116134

0 commit comments

Comments
 (0)