From 16d412aa6798f6802628332b88db5183ce3feff4 Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Tue, 10 Dec 2024 11:25:49 +0100
Subject: [PATCH] Keep libs/dyn unchanged; annotate with //nolint:errcheck

---
 libs/dyn/convert/from_typed.go |  6 ++----
 libs/dyn/convert/normalize.go  | 12 +++---------
 libs/dyn/jsonloader/json.go    |  3 +--
 libs/dyn/mapping.go            |  6 ++----
 libs/dyn/merge/merge.go        |  8 ++------
 libs/dyn/visit_set.go          |  4 +---
 6 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/libs/dyn/convert/from_typed.go b/libs/dyn/convert/from_typed.go
index 905c5a442..ed1b85a36 100644
--- a/libs/dyn/convert/from_typed.go
+++ b/libs/dyn/convert/from_typed.go
@@ -126,8 +126,7 @@ func fromTypedStruct(src reflect.Value, ref dyn.Value, options ...fromTypedOptio
 
 		// Either if the key was set in the reference or the field is not zero-valued, we include it.
 		if ok || nv.Kind() != dyn.KindNil {
-			// QQQ log error?
-			_ = out.Set(refk, nv)
+			out.Set(refk, nv) // nolint:errcheck
 		}
 	}
 
@@ -185,8 +184,7 @@ func fromTypedMap(src reflect.Value, ref dyn.Value) (dyn.Value, error) {
 
 		// Every entry is represented, even if it is a nil.
 		// Otherwise, a map with zero-valued structs would yield a nil as well.
-		// QQQ log error?
-		_ = out.Set(refk, nv)
+		out.Set(refk, nv) //nolint:errcheck
 	}
 
 	return dyn.V(out), nil
diff --git a/libs/dyn/convert/normalize.go b/libs/dyn/convert/normalize.go
index 58cd13dfd..31cd8b6e3 100644
--- a/libs/dyn/convert/normalize.go
+++ b/libs/dyn/convert/normalize.go
@@ -116,9 +116,7 @@ func (n normalizeOptions) normalizeStruct(typ reflect.Type, src dyn.Value, seen
 				}
 			}
 
-			if err := out.Set(pk, nv); err != nil {
-				return dyn.InvalidValue, diag.FromErr(err)
-			}
+			out.Set(pk, nv) //nolint:errcheck
 		}
 
 		// Return the normalized value if missing fields are not included.
@@ -164,9 +162,7 @@ func (n normalizeOptions) normalizeStruct(typ reflect.Type, src dyn.Value, seen
 				continue
 			}
 			if v.IsValid() {
-				if err := out.Set(dyn.V(k), v); err != nil {
-					return dyn.InvalidValue, diag.FromErr(err)
-				}
+				out.Set(dyn.V(k), v) // nolint:errcheck
 			}
 		}
 
@@ -205,9 +201,7 @@ func (n normalizeOptions) normalizeMap(typ reflect.Type, src dyn.Value, seen []r
 				}
 			}
 
-			if err := out.Set(pk, nv); err != nil {
-				return dyn.InvalidValue, diag.FromErr(err)
-			}
+			out.Set(pk, nv) //nolint:errcheck
 		}
 
 		return dyn.NewValue(out, src.Locations()), diags
diff --git a/libs/dyn/jsonloader/json.go b/libs/dyn/jsonloader/json.go
index 3036596be..3f2dc859f 100644
--- a/libs/dyn/jsonloader/json.go
+++ b/libs/dyn/jsonloader/json.go
@@ -70,8 +70,7 @@ func decodeValue(decoder *json.Decoder, o *Offset) (dyn.Value, error) {
 					return invalidValueWithLocation(decoder, o), err
 				}
 
-				// QQQ log this?
-				_ = obj.Set(keyVal, val)
+				obj.Set(keyVal, val) //nolint:errcheck
 			}
 			// Consume the closing '}'
 			if _, err := decoder.Token(); err != nil {
diff --git a/libs/dyn/mapping.go b/libs/dyn/mapping.go
index c93be9b6a..f5dbd18e6 100644
--- a/libs/dyn/mapping.go
+++ b/libs/dyn/mapping.go
@@ -41,8 +41,7 @@ func newMappingWithSize(size int) Mapping {
 func newMappingFromGoMap(vin map[string]Value) Mapping {
 	m := newMappingWithSize(len(vin))
 	for k, v := range vin {
-		// QQQ log error or panic?
-		_ = m.Set(V(k), v)
+		m.Set(V(k), v) //nolint:errcheck
 	}
 	return m
 }
@@ -145,7 +144,6 @@ func (m Mapping) Clone() Mapping {
 // Merge merges the key-value pairs from another Mapping into the current Mapping.
 func (m *Mapping) Merge(n Mapping) {
 	for _, p := range n.pairs {
-		// QQQ log error or panic?
-		_ = m.Set(p.Key, p.Value)
+		m.Set(p.Key, p.Value) //nolint:errcheck
 	}
 }
diff --git a/libs/dyn/merge/merge.go b/libs/dyn/merge/merge.go
index b96d493a1..a83bbc152 100644
--- a/libs/dyn/merge/merge.go
+++ b/libs/dyn/merge/merge.go
@@ -88,14 +88,10 @@ func mergeMap(a, b dyn.Value) (dyn.Value, error) {
 			if err != nil {
 				return dyn.InvalidValue, err
 			}
-			if err := out.Set(pk, merged); err != nil {
-				return dyn.InvalidValue, err
-			}
+			out.Set(pk, merged) //nolint:errcheck
 		} else {
 			// Otherwise, just set the value.
-			if err := out.Set(pk, pv); err != nil {
-				return dyn.InvalidValue, err
-			}
+			out.Set(pk, pv) //nolint:errcheck
 		}
 	}
 
diff --git a/libs/dyn/visit_set.go b/libs/dyn/visit_set.go
index d5a687a02..9991d311f 100644
--- a/libs/dyn/visit_set.go
+++ b/libs/dyn/visit_set.go
@@ -41,9 +41,7 @@ func SetByPath(v Value, p Path, nv Value) (Value, error) {
 
 				// Return an updated map value.
 				m = m.Clone()
-				if err := m.Set(V(component.key), nv); err != nil {
-					return InvalidValue, err
-				}
+				m.Set(V(component.key), nv) //nolint:errcheck
 				return Value{
 					v: m,
 					k: KindMap,