fixing missing attributes

Signed-off-by: Robert Sirchia <rsirchia@outlook.com>
pull/30603/head
Robert Sirchia 7 months ago
parent 1ad79a2bb7
commit c36bc25fb1
No known key found for this signature in database
GPG Key ID: C2D40F4D8196E874

@ -51,7 +51,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
slog.Warn("Warning: Condition path '%s' for chart %s returned non-bool value", c, r.Name) slog.Warn("Warning: Condition path '%s' for chart %s returned non-bool value", c, r.Name)
} else if _, ok := err.(ErrNoValue); !ok { } else if _, ok := err.(ErrNoValue); !ok {
// this is a real error // this is a real error
slog.Error("Warning: PathValue returned error %v", err) slog.Error("Warning: PathValue returned error %v", slog.Any("err", err))
} }
} }
} }
@ -271,7 +271,7 @@ func processImportValues(c *chart.Chart, merge bool) error {
}) })
vm, err := cvals.Table(r.Name + "." + child) vm, err := cvals.Table(r.Name + "." + child)
if err != nil { if err != nil {
slog.Error("Warning: ImportValues missing table: %v", err) slog.Error("Warning: ImportValues missing table: %v", slog.Any("err", err))
continue continue
} }
if merge { if merge {

@ -203,7 +203,7 @@ func (e Engine) initFunMap(t *template.Template) {
if val == nil { if val == nil {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // Don't fail on missing required values when linting
slog.Warn("[INFO] Missing required value: %s", warn) slog.Warn("[INFO] Missing required value: %s", "LintMode", warn)
return "", nil return "", nil
} }
return val, errors.New(warnWrap(warn)) return val, errors.New(warnWrap(warn))
@ -211,7 +211,7 @@ func (e Engine) initFunMap(t *template.Template) {
if val == "" { if val == "" {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // Don't fail on missing required values when linting
slog.Warn("[INFO] Missing required value: %s", warn) slog.Warn("[INFO] Missing required value: %s", "LintMode", warn)
return "", nil return "", nil
} }
return val, errors.New(warnWrap(warn)) return val, errors.New(warnWrap(warn))
@ -224,7 +224,7 @@ func (e Engine) initFunMap(t *template.Template) {
funcMap["fail"] = func(msg string) (string, error) { funcMap["fail"] = func(msg string) (string, error) {
if e.LintMode { if e.LintMode {
// Don't fail when linting // Don't fail when linting
slog.Info("[INFO] Fail: %s", msg) slog.Info("[INFO] Fail: %s", "LintMode", msg)
return "", nil return "", nil
} }
return "", errors.New(warnWrap(msg)) return "", errors.New(warnWrap(msg))

@ -111,7 +111,7 @@ func getDynamicClientOnKind(apiversion string, kind string, config *rest.Config)
} }
intf, err := dynamic.NewForConfig(config) intf, err := dynamic.NewForConfig(config)
if err != nil { if err != nil {
slog.Error("[ERROR] unable to get dynamic client %s", err) slog.Error("[ERROR] unable to get dynamic client %s", slog.Any("err", err))
return nil, false, err return nil, false, err
} }
res := intf.Resource(gvr) res := intf.Resource(gvr)
@ -122,7 +122,7 @@ func getAPIResourceForGVK(gvk schema.GroupVersionKind, config *rest.Config) (met
res := metav1.APIResource{} res := metav1.APIResource{}
discoveryClient, err := discovery.NewDiscoveryClientForConfig(config) discoveryClient, err := discovery.NewDiscoveryClientForConfig(config)
if err != nil { if err != nil {
slog.Error("[ERROR] unable to create discovery client %s", err) slog.Error("[ERROR] unable to create discovery client %s", slog.Any("err", err))
return res, err return res, err
} }
resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String()) resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String())

@ -102,7 +102,7 @@ func (r *Rules) Ignore(path string, fi os.FileInfo) bool {
} }
for _, p := range r.patterns { for _, p := range r.patterns {
if p.match == nil { if p.match == nil {
slog.Info("ignore: no matcher supplied for %q", p.raw) slog.Info("ignore: no matcher supplied for %q", "patterns", p.raw)
return false return false
} }

@ -95,7 +95,7 @@ func (i *VCSInstaller) Install() error {
// Update updates a remote repository // Update updates a remote repository
func (i *VCSInstaller) Update() error { func (i *VCSInstaller) Update() error {
slog.Debug("updating %s", i.Repo.Remote()) slog.Debug("updating %s", "repo", i.Repo.Remote())
if i.Repo.IsDirty() { if i.Repo.IsDirty() {
return errors.New("plugin repo was modified") return errors.New("plugin repo was modified")
} }
@ -129,7 +129,7 @@ func (i *VCSInstaller) solveVersion(repo vcs.Repo) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
slog.Debug("found refs: %s", refs) slog.Debug("found refs: %s", "refs", refs)
// Convert and filter the list to semver.Version instances // Convert and filter the list to semver.Version instances
semvers := getSemVers(refs) semvers := getSemVers(refs)
@ -140,7 +140,7 @@ func (i *VCSInstaller) solveVersion(repo vcs.Repo) (string, error) {
if constraint.Check(v) { if constraint.Check(v) {
// If the constraint passes get the original reference // If the constraint passes get the original reference
ver := v.Original() ver := v.Original()
slog.Debug("setting to %s", ver) slog.Debug("setting to %s", "versions", ver)
return ver, nil return ver, nil
} }
} }
@ -150,7 +150,7 @@ func (i *VCSInstaller) solveVersion(repo vcs.Repo) (string, error) {
// setVersion attempts to checkout the version // setVersion attempts to checkout the version
func (i *VCSInstaller) setVersion(repo vcs.Repo, ref string) error { func (i *VCSInstaller) setVersion(repo vcs.Repo, ref string) error {
slog.Debug("setting version to %q", i.Version) slog.Debug("setting version to %q", "versions", i.Version)
return repo.UpdateVersion(ref) return repo.UpdateVersion(ref)
} }
@ -160,7 +160,7 @@ func (i *VCSInstaller) sync(repo vcs.Repo) error {
slog.Debug("cloning %s to %s", repo.Remote(), repo.LocalPath()) slog.Debug("cloning %s to %s", repo.Remote(), repo.LocalPath())
return repo.Get() return repo.Get()
} }
slog.Debug("updating %s", repo.Remote()) slog.Debug("updating %s", "remote", repo.Remote())
return repo.Update() return repo.Update()
} }

@ -196,7 +196,7 @@ func (file *manifestFile) sort(result *result) error {
} }
if isUnknownHook { if isUnknownHook {
slog.Info("info: skipping unknown hook: %q", hookTypes) slog.Info("info: skipping unknown hook: %q", "hookTypes", hookTypes)
continue continue
} }

@ -343,7 +343,7 @@ func ResolveReferenceURL(baseURL, refURL string) (string, error) {
func (e *Entry) String() string { func (e *Entry) String() string {
buf, err := json.Marshal(e) buf, err := json.Marshal(e)
if err != nil { if err != nil {
slog.Error("failed to marshal entry: %s", err) slog.Error("failed to marshal entry: %s", slog.Any("err", err))
panic(err) panic(err)
} }
return string(buf) return string(buf)

Loading…
Cancel
Save