Testing to figure out stack log issues (#554)

michaeljguarino · web-flow · commit e7077c1f00b8 · 2025-10-15T18:30:34.000-04:00
recent release is suppressing all log output from stack runs, trying to debug here
diff --git a/pkg/controller/service/reconciler_status.go b/pkg/controller/service/reconciler_status.go
@@ -16,6 +16,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
+const (
+	ignoreSha = "__ignore__"
+)
+
 func (s *ServiceReconciler) UpdateErrorStatus(ctx context.Context, id string, err error) {
 	if err := s.UpdateErrors(id, errorAttributes("sync", err)); err != nil {
 		log.FromContext(ctx).Error(err, "Failed to update service status, ignoring for now")
@@ -59,21 +63,23 @@ func (s *ServiceReconciler) UpdateStatus(ctx context.Context, id, revisionID str
 	// hash the components and errors to determine if there has been a meaningful change
 	// we need to report to the server
 	objToHash := struct {
-		Components []*console.ComponentAttributes    `json:"components"`
-		Errs       []*console.ServiceErrorAttributes `json:"errs"`
-		RevisionID string                            `json:"revisionId"`
-		Sha        *string                           `json:"sha,omitempty"`
+		Components []*console.ComponentAttributes     `json:"components"`
+		Errs       []*console.ServiceErrorAttributes  `json:"errs"`
+		RevisionID string                             `json:"revisionId"`
+		Sha        *string                            `json:"sha,omitempty"`
+		Metadata   *console.ServiceMetadataAttributes `json:"metadata,omitempty"`
 	}{
 		Components: components,
 		Errs:       errs,
 		RevisionID: revisionID,
 		Sha:        sha,
+		Metadata:   metadata,
 	}
 
 	hashedSha, err := utils.HashObject(objToHash)
 	if err != nil {
 		log.Log.Error(err, "Failed to hash service components")
-		hashedSha = "__ignore__"
+		hashedSha = ignoreSha
 	}
 
 	logger := log.FromContext(ctx).V(int(plrlog.LogLevelDefault))
@@ -85,7 +91,7 @@ func (s *ServiceReconciler) UpdateStatus(ctx context.Context, id, revisionID str
 		return nil
 	}
 
-	if hashedSha != "__ignore__" {
+	if hashedSha != ignoreSha {
 		shaCache.Add(id, hashedSha)
 	}
 
diff --git a/pkg/harness/controller/controller.go b/pkg/harness/controller/controller.go
@@ -107,6 +107,7 @@ func (in *stackRunController) toExecutable(ctx context.Context, step *gqlclient.
 	modifier := in.tool.Modifier(step.Stage)
 	args := step.Args
 	env := in.stackRun.Env()
+
 	consoleWriter := sink.NewConsoleWriter(
 		ctx,
 		in.consoleClient,
diff --git a/pkg/harness/exec/exec.go b/pkg/harness/exec/exec.go
@@ -24,6 +24,7 @@ func (in *executable) Run(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	defer in.close(in.outputSinks)
 
 	klog.V(log.LogLevelExtended).InfoS("executing", "command", in.Command())
 	if err = cmd.Run(); err != nil {
@@ -51,7 +52,12 @@ func (in *executable) Start(ctx context.Context) (WaitFn, error) {
 		return nil, err
 	}
 
-	return cmd.Wait, in.runLifecycleFunction(v1.LifecyclePostStart)
+	waiter := func() error {
+		defer in.close(in.outputSinks)
+		return cmd.Wait()
+	}
+
+	return waiter, in.runLifecycleFunction(v1.LifecyclePostStart)
 }
 
 func (in *executable) RunWithOutput(ctx context.Context) ([]byte, error) {
@@ -91,7 +97,6 @@ func (in *executable) prepare(ctx context.Context) (*exec.Cmd, error) {
 	ctx = signals.NewCancelableContext(ctx, signals.NewTimeoutSignal(in.timeout))
 	cmd := exec.CommandContext(ctx, in.command, in.args...)
 	w := in.writer()
-	defer in.close(in.outputSinks)
 
 	// Configure additional writers so that we can simultaneously write output
 	// to multiple destinations
diff --git a/pkg/harness/tool/v1/modifier.go b/pkg/harness/tool/v1/modifier.go
@@ -11,7 +11,7 @@ func (in *DefaultModifier) Args(args []string) []string {
 
 // WriteCloser implements [PassthroughModifier] interface.
 func (in *DefaultModifier) WriteCloser() []io.WriteCloser {
-	return nil
+	return make([]io.WriteCloser, 0)
 }
 
 // Env implements [EnvModifier] interface.
diff --git a/pkg/metadata/extractor.go b/pkg/metadata/extractor.go
@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/klog/v2"
 )
 
 func ExtractImagesFromResource(resource *unstructured.Unstructured) []string {
@@ -13,39 +12,24 @@ func ExtractImagesFromResource(resource *unstructured.Unstructured) []string {
 	}
 
 	kind := strings.ToLower(resource.GetKind())
-	ns, name := resource.GetNamespace(), resource.GetName()
 	var out []string
 
 	switch kind {
 	case "deployment", "statefulset", "daemonset", "replicaset":
-		if found, imgs, err := extractImagesFromPath(resource, "spec", "template", "spec", "containers"); err != nil {
-			klog.Warningf("failed to extract containers from %s %s/%s: %v", resource.GetKind(), ns, name, err)
-			return nil
-		} else if !found {
-			return nil
-		} else {
+		if found, imgs, err := extractImagesFromPath(resource, "spec", "template", "spec", "containers"); err == nil && found {
 			out = append(out, imgs...)
 		}
 
-		if _, imgs, err := extractImagesFromPath(resource, "spec", "template", "spec", "initContainers"); err != nil {
-			klog.Infof("Error extracting init containers from %s %s/%s: %v", resource.GetKind(), ns, name, err)
-		} else {
+		if found, imgs, err := extractImagesFromPath(resource, "spec", "template", "spec", "initContainers"); err == nil && found {
 			out = append(out, imgs...)
 		}
 
 	case "pod":
-		if found, imgs, err := extractImagesFromPath(resource, "spec", "containers"); err != nil {
-			klog.Warningf("failed to extract containers from pod %s/%s: %v", ns, name, err)
-			return nil
-		} else if !found {
-			return nil
-		} else {
+		if found, imgs, err := extractImagesFromPath(resource, "spec", "containers"); err == nil && found {
 			out = append(out, imgs...)
 		}
 
-		if _, imgs, err := extractImagesFromPath(resource, "spec", "initContainers"); err != nil {
-			klog.Infof("Error extracting init containers from Pod %s/%s: %v", ns, name, err)
-		} else {
+		if found, imgs, err := extractImagesFromPath(resource, "spec", "initContainers"); err == nil && found {
 			out = append(out, imgs...)
 		}
 	}
@@ -116,11 +100,7 @@ func (f *fqdnSet) result() []string {
 }
 
 func extractIngressFQDNs(u *unstructured.Unstructured, add func(string)) {
-	ns, name := u.GetNamespace(), u.GetName()
-
-	if rules, found, err := unstructured.NestedSlice(u.Object, "spec", "rules"); err != nil {
-		logExtractErr("Ingress", ns, name, "rules", err)
-	} else if found {
+	if rules, found, err := unstructured.NestedSlice(u.Object, "spec", "rules"); err == nil && found {
 		for _, r := range rules {
 			if m, ok := r.(map[string]interface{}); ok {
 				if host, ok := m["host"].(string); ok {
@@ -130,9 +110,7 @@ func extractIngressFQDNs(u *unstructured.Unstructured, add func(string)) {
 		}
 	}
 
-	if tls, found, err := unstructured.NestedSlice(u.Object, "spec", "tls"); err != nil {
-		logExtractErr("Ingress", ns, name, "tls", err)
-	} else if found {
+	if tls, found, err := unstructured.NestedSlice(u.Object, "spec", "tls"); err == nil && found {
 		for _, t := range tls {
 			m, ok := t.(map[string]interface{})
 			if !ok {
@@ -150,11 +128,7 @@ func extractIngressFQDNs(u *unstructured.Unstructured, add func(string)) {
 }
 
 func extractHTTPRouteFQDNs(u *unstructured.Unstructured, add func(string)) {
-	ns, name, kind := u.GetNamespace(), u.GetName(), u.GetKind()
-
-	if hn, found, err := unstructured.NestedSlice(u.Object, "spec", "hostnames"); err != nil {
-		logExtractErr(kind, ns, name, "hostnames", err)
-	} else if found {
+	if hn, found, err := unstructured.NestedSlice(u.Object, "spec", "hostnames"); err == nil && found {
 		for _, h := range hn {
 			if s, ok := h.(string); ok {
 				add(s)
@@ -164,11 +138,7 @@ func extractHTTPRouteFQDNs(u *unstructured.Unstructured, add func(string)) {
 }
 
 func extractGatewayFQDNs(u *unstructured.Unstructured, add func(string)) {
-	ns, name := u.GetNamespace(), u.GetName()
-
-	if listeners, found, err := unstructured.NestedSlice(u.Object, "spec", "listeners"); err != nil {
-		logExtractErr("Gateway", ns, name, "listeners", err)
-	} else if found {
+	if listeners, found, err := unstructured.NestedSlice(u.Object, "spec", "listeners"); err == nil && found {
 		for _, l := range listeners {
 			if m, ok := l.(map[string]interface{}); ok {
 				if s, ok := m["hostname"].(string); ok {
@@ -178,7 +148,3 @@ func extractGatewayFQDNs(u *unstructured.Unstructured, add func(string)) {
 		}
 	}
 }
-
-func logExtractErr(kind, ns, name, field string, err error) {
-	klog.Infof("Error extracting %s from %s %s/%s: %v", field, kind, ns, name, err)
-}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ func (in *DefaultModifier) Args(args []string) []string {`
`11`	`11`
`12`	`12`	`// WriteCloser implements [PassthroughModifier] interface.`
`13`	`13`	`func (in *DefaultModifier) WriteCloser() []io.WriteCloser {`
`14`		`- return nil`
	`14`	`+ return make([]io.WriteCloser, 0)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`// Env implements [EnvModifier] interface.`