Revert "Use hook to set map key after setter"

collector.go

@@ -15,7 +15,6 @@ type secretField struct {
 
 type collector struct {
 	fields []*secretField
-	hooks  []func()
 	err    error
 }
 
@@ -51,14 +50,10 @@ func (g *collector) collectSecretFields(v reflect.Value, path string) {
 				ptr := reflect.New(item.Type())
 				ptr.Elem().Set(item)
 
-				g.hooks = append(g.hooks, func() {
-					v.SetMapIndex(key, ptr.Elem())
-				})
-
 				g.collectSecretFields(ptr, fmt.Sprintf("%v[%v]", path, key))
 
 				// Set the modified struct back into the map
-
+				v.SetMapIndex(key, ptr.Elem())
 			} else {
 				g.collectSecretFields(item, fmt.Sprintf("%v[%v]", path, key))
 			}

hydrate.go

@@ -74,13 +74,5 @@ func hydrateConfig(ctx context.Context, provider secretsProvider, v reflect.Valu
 		})
 	}
 
-	if err := g.Wait(); err != nil {
-		return fmt.Errorf("failed to hydrate config: %w", err)
-	}
-
-	for _, hook := range c.hooks {
-		hook()
-	}
-
-	return nil
+	return g.Wait()
 }

hydrate_test.go

@@ -14,13 +14,6 @@ type config struct {
 	Analytics  analytics
 	Pass       string
 	JWTSecrets []string
-	Services   map[string]service
-}
-
-type service struct {
-	URL  string
-	Auth string
-	Pass string
 }
 
 type db struct {
@@ -59,7 +52,6 @@ func TestReplacePlaceholdersWithSecrets(t *testing.T) {
 				"pass":              "secret",
 				"jwtSecretV1":       "some-old-secret",
 				"jwtSecretV2":       "changeme-now",
-				"auth":              "auth-secret",
 			},
 			conf: &config{
 				Pass: "$SECRET:pass",
@@ -74,13 +66,6 @@ func TestReplacePlaceholdersWithSecrets(t *testing.T) {
 					AuthToken: "$SECRET:analyticsPassword",
 				},
 				JWTSecrets: []string{"$SECRET:jwtSecretV2", "$SECRET:jwtSecretV1"},
-				Services: map[string]service{
-					"a": {
-						URL:  "http://localhost:8000",
-						Auth: "$SECRET:auth",
-						Pass: "$SECRET:jwtSecretV2",
-					},
-				},
 			},
 			wantErr: false,
 			wantConf: &config{
@@ -99,13 +84,6 @@ func TestReplacePlaceholdersWithSecrets(t *testing.T) {
 					"changeme-now",
 					"some-old-secret",
 				},
-				Services: map[string]service{
-					"a": {
-						URL:  "http://localhost:8000",
-						Auth: "auth-secret",
-						Pass: "changeme-now",
-					},
-				},
 			},
 		},
 		{