Skip to content

Commit d49fb89

Browse files
authored
feat: add more trace output (#81)
* feat: add more trace output * format
1 parent e86a366 commit d49fb89

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import (
99
"github.com/Masterminds/sprig/v3"
1010
"sigs.k8s.io/yaml"
1111

12+
"github.com/openmcp-project/bootstrapper/internal/log"
13+
1214
ocmcli "github.com/openmcp-project/bootstrapper/internal/ocm-cli"
1315
"github.com/openmcp-project/bootstrapper/internal/util"
1416
)
@@ -29,6 +31,8 @@ func fromYAML(input string) (any, error) {
2931
}
3032

3133
func getComponentVersionByReference(ctx context.Context, compGetter *ocmcli.ComponentGetter, args ...interface{}) *ocmcli.ComponentVersion {
34+
logger := log.GetLogger()
35+
3236
if compGetter == nil {
3337
panic("ComponentGetter must not be nil")
3438
}
@@ -45,8 +49,13 @@ func getComponentVersionByReference(ctx context.Context, compGetter *ocmcli.Comp
4549
parentCv = args[0].(*ocmcli.ComponentVersion)
4650
}
4751

52+
logger.Tracef("Template_Func: getComponentVersionByReference called with parent component version: %s and reference name: %s", parentCv.Component.Name, referenceName)
53+
4854
cv, err := compGetter.GetReferencedComponentVersionRecursive(ctx, parentCv, referenceName)
4955
if err != nil || cv == nil {
56+
if err != nil {
57+
logger.Errorf("Template_Func: getComponentVersionByReference error getting component version by reference %s from parent component version %s: %v", referenceName, parentCv.Component.Name, err)
58+
}
5059
return nil
5160
}
5261

@@ -73,12 +82,18 @@ func componentVersionAsMap(cv *ocmcli.ComponentVersion) map[string]interface{} {
7382
}
7483

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

8092
res, err := cv.GetResource(resourceName)
8193
if err != nil || res == nil {
94+
if err != nil {
95+
logger.Errorf("Template_Func: getResourceFromComponentVersion error getting resource %s from component version %s: %v", resourceName, cv.Component.Name, err)
96+
}
8297
return nil
8398
}
8499

@@ -105,12 +120,16 @@ func getOCMRepository(compGetter *ocmcli.ComponentGetter) string {
105120
}
106121

107122
func listComponentVersions(ctx context.Context, compGetter *ocmcli.ComponentGetter, cv *ocmcli.ComponentVersion) []string {
123+
logger := log.GetLogger()
124+
logger.Tracef("Template_Func: listComponentVersions called with component version: %s", cv.Component.Name)
125+
108126
if compGetter == nil {
109127
panic("ComponentGetter must not be nil")
110128
}
111129

112130
versions, err := cv.ListComponentVersions(ctx, compGetter.OCMConfig())
113131
if err != nil {
132+
logger.Errorf("Template_Func: listComponentVersions error listing component versions for component %s: %v", cv.Component.Name, err)
114133
return nil
115134
}
116135

0 commit comments

Comments
 (0)