fix: clean up PR

Author: sbackend123

pkg/check/socmatrix/socmatrix.go

@@ -163,10 +163,6 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any
 		c.logger.Infof("socmatrix: scenarios 1-10 completed successfully across %d full nodes", len(fullNodeClients))
 	}
 
-	// -------------------------------------------------------------------------
-	// Precision scenarios 11-16 (former chunk-convergence) — same semantics.
-	// Continue-on-error aggregation matches former chunk-convergence Run().
-	// -------------------------------------------------------------------------
 	n1, n2, err := pickClosestPair(ctx, fullNodeClients)
 	if err != nil {
 		return err

pkg/config/bee.go

@@ -17,12 +17,15 @@ type Inheritable interface {
 // inheritance (_inherit). Export returns just the embedded Config, so neither
 // _inherit nor any other config-loading detail can leak into the rendered file.
 type BeeConfig struct {
-	Inherit              `yaml:",inline"`
+	*Inherit             `yaml:",inline"`
 	orchestration.Config `yaml:",inline"`
 }
 
 func (b BeeConfig) GetParentName() string {
-	return b.ParentName
+	if b.Inherit != nil {
+		return b.ParentName
+	}
+	return ""
 }
 
 // Export returns the Bee flag configuration to be rendered into the node's

pkg/config/cluster.go

@@ -9,7 +9,7 @@ import (
 // Cluster represents cluster configuration
 type Cluster struct {
 	// parent to inherit settings from
-	Inherit `yaml:",inline"`
+	*Inherit `yaml:",inline"`
 	// Cluster configuration
 	Name               *string                      `yaml:"name,omitempty"`
 	Namespace          *string                      `yaml:"namespace"`
@@ -24,7 +24,10 @@ type Cluster struct {
 }
 
 func (b Cluster) GetParentName() string {
-	return b.ParentName
+	if b.Inherit != nil {
+		return b.ParentName
+	}
+	return ""
 }
 
 // ClusterNodeGroup represents node group in the cluster
@@ -59,7 +62,7 @@ func (c *Cluster) Export() (o orchestration.ClusterOptions) {
 
 	for i := 0; i < localVal.NumField(); i++ {
 		localField := localVal.Field(i)
-		if localField.IsValid() && canIsNil(localField) && !localField.IsNil() {
+		if localField.IsValid() && !localField.IsNil() {
 			localFieldVal := localVal.Field(i).Elem()
 			localFieldName := localType.Field(i).Name
 

pkg/config/config.go

@@ -104,14 +104,13 @@ func mergeConfigs[T any](configs map[string]T) (map[string]T, error) {
 				// applied per flag instead of all-or-nothing.
 				if mf.Kind() == reflect.Struct {
 					for j := 0; j < mf.NumField(); j++ {
-						fj, pfj := mf.Field(j), pf.Field(j)
-						if canIsNil(fj) && fj.IsNil() && canIsNil(pfj) && !pfj.IsNil() {
-							fj.Set(pfj)
+						if mf.Field(j).IsNil() && !pf.Field(j).IsNil() {
+							mf.Field(j).Set(pf.Field(j))
 						}
 					}
 					continue
 				}
-				if canIsNil(mf) && mf.IsNil() && canIsNil(pf) && !pf.IsNil() {
+				if mf.IsNil() && !pf.IsNil() {
 					mf.Set(pf)
 				}
 			}
@@ -122,24 +121,15 @@ func mergeConfigs[T any](configs map[string]T) (map[string]T, error) {
 		return v, nil
 	}
 
-	for k := range configs {
-		if _, err := mergeParent(k); err != nil {
+	for name := range configs {
+		if _, err := mergeParent(name); err != nil {
 			return nil, err
 		}
 	}
 
 	return mergedConfigs, nil
 }
 
-func canIsNil(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Map, reflect.Pointer, reflect.UnsafePointer, reflect.Interface, reflect.Slice:
-		return true
-	default:
-		return false
-	}
-}
-
 // Read reads given YAML files and unmarshals them into Config
 func Read(log logging.Logger, yamlFiles []YamlFile) (*Config, error) {
 	c := Config{

pkg/config/nodegroup.go

@@ -9,7 +9,7 @@ import (
 // NodeGroup represents node group configuration
 type NodeGroup struct {
 	// parent to inherit settings from
-	Inherit `yaml:",inline"`
+	*Inherit `yaml:",inline"`
 	// node group configuration
 	Annotations               *map[string]string `yaml:"annotations"`
 	Image                     *string            `yaml:"image"`
@@ -33,7 +33,10 @@ type NodeGroup struct {
 }
 
 func (b NodeGroup) GetParentName() string {
-	return b.ParentName
+	if b.Inherit != nil {
+		return b.ParentName
+	}
+	return ""
 }
 
 // Export exports NodeGroup to orchestration.NodeGroupOptions
@@ -44,7 +47,7 @@ func (n *NodeGroup) Export() (o orchestration.NodeGroupOptions) {
 
 	for i := 0; i < localVal.NumField(); i++ {
 		localField := localVal.Field(i)
-		if localField.IsValid() && canIsNil(localField) && !localField.IsNil() {
+		if localField.IsValid() && !localField.IsNil() {
 			localFieldVal := localVal.Field(i).Elem()
 			localFieldName := localType.Field(i).Name