rmcguire/go-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance context management for custom types

Browse Source
This commit is contained in:
Ryan McGuire
2025-12-24 10:47:28 -05:00
parent 70e99eef0e
commit 98650211ac
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/app/setup_custom.go
View File

@@ -17,7 +17,7 @@ import (
// that overloads *config.AppConfig. Will perform normal env
// substitutions for AppConfig, but env overrides for custom type
// are up to the caller.
func MustLoadConfigInto[T any](ctx context.Context, into T) (context.Context, T) {
func MustLoadConfigInto[T interface{ *config.AppConfig }](ctx context.Context, into T) (context.Context, T) {
// Step 1: Check our custom type for required *config.AppConfig
if err := HasAppConfig(into); err != nil {
panic(err)
@@ -50,13 +50,14 @@ func MustLoadConfigInto[T any](ctx context.Context, into T) (context.Context, T)
}
// Step 6: Update context, return custom type
ctx = config.AddToContextFor(ctx, into)
return ctx, into
}
func setAppConfig[T any](target T, appConfig *config.AppConfig) error {
// Ensure target is a pointer to a struct
v := reflect.ValueOf(target)
if v.Kind() != reflect.Ptr || v.IsNil() {
if v.Kind() != reflect.Pointer || v.IsNil() {
return errors.New("target must be a non-nil pointer to a struct")
}
@@ -68,7 +69,7 @@ func setAppConfig[T any](target T, appConfig *config.AppConfig) error {
// Replace *config.AppConfig
for i := range v.NumField() {
field := v.Field(i)
if field.Type() == reflect.TypeOf((*config.AppConfig)(nil)) {
if field.Type() == reflect.TypeFor[*config.AppConfig]() {
if !field.CanSet() {
return fmt.Errorf("field %q cannot be set", v.Type().Field(i).Name)
}
@@ -82,7 +83,7 @@ func setAppConfig[T any](target T, appConfig *config.AppConfig) error {
func HasAppConfig[T any](target T) error {
v := reflect.ValueOf(target)
if v.Kind() != reflect.Ptr || v.IsNil() {
if v.Kind() != reflect.Pointer || v.IsNil() {
return errors.New("target must be a non-nil pointer to a struct")
}
v = v.Elem()
@@ -94,7 +95,7 @@ func HasAppConfig[T any](target T) error {
hasAppConfig := false
for i := range v.NumField() {
field := v.Type().Field(i)
if field.Type == reflect.TypeOf((*config.AppConfig)(nil)) {
if field.Type == reflect.TypeFor[*config.AppConfig]() {
hasAppConfig = true
break
}