Skip to content

Commit c31bb7a

Browse files
authored
Merge pull request #5 from elvin03/codeql-fix
Add package list in merged template on debug mode in merge.go
2 parents ba4d65f + f0ebfb9 commit c31bb7a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

internal/config/merge.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ func MergeConfigurations(userTemplate, defaultTemplate *ImageTemplate) (*ImageTe
142142
// pretty, err := json.MarshalIndent(mergedTemplate, "", " ")
143143
// Build a redacted debug view of the merged template that avoids sensitive fields
144144
debugView := struct {
145-
ImageName string `json:"imageName"`
146-
SystemConfigName string `json:"systemConfigName"`
147-
Immutability bool `json:"immutability"`
148-
UserCount int `json:"userCount"`
145+
ImageName string `json:"imageName"`
146+
SystemConfigName string `json:"systemConfigName"`
147+
Immutability bool `json:"immutability"`
148+
Packages []string `json:"packages"`
149149
}{
150150
ImageName: mergedTemplate.Image.Name,
151151
SystemConfigName: mergedTemplate.SystemConfig.Name,
152152
Immutability: mergedTemplate.IsImmutabilityEnabled(),
153-
UserCount: len(mergedTemplate.GetUsers()),
153+
Packages: mergedTemplate.SystemConfig.Packages,
154154
}
155155

156156
pretty, err := json.MarshalIndent(debugView, "", " ")

0 commit comments

Comments
 (0)