fix: add generics for better devex

Author: rswanson

pkg/ethereum/execution/types.go

@@ -1,6 +1,7 @@
 package execution
 
 import (
+	"github.com/init4tech/signet-infra-components/pkg/utils"
 	appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/apps/v1"
 	corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v4/go/kubernetes/core/v1"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
@@ -44,6 +45,8 @@ type ExecutionClientArgs struct {
 	Bootnodes pulumi.StringArray `pulumi:"bootnodes,optional"`
 	// AdditionalArgs are additional command line arguments
 	AdditionalArgs pulumi.StringArray `pulumi:"additionalArgs,optional"`
+	// Environment variables
+	ExecutionClientEnv ExecutionClientEnv `pulumi:"executionClientEnv,optional"`
 }
 
 // ExecutionClientComponent represents an execution client deployment
@@ -67,3 +70,14 @@ type ExecutionClientComponent struct {
 	// StatefulSet is the stateful set
 	StatefulSet *appsv1.StatefulSet
 }
+
+// ExecutionClientEnv contains environment variables for the execution client
+type ExecutionClientEnv struct {
+	// Add any environment variables needed by the execution client
+	RustLog pulumi.StringInput `pulumi:"rustLog"`
+}
+
+// GetEnvMap implements the utils.EnvProvider interface
+func (e ExecutionClientEnv) GetEnvMap() pulumi.StringMap {
+	return utils.CreateEnvMap(e)
+}

pkg/quincey/quincey.go

@@ -140,7 +140,7 @@ func createDeployment(ctx *pulumi.Context, args *QuinceyComponentArgs, parent *Q
 func createConfigMap(ctx *pulumi.Context, args *QuinceyComponentArgs, parent *QuinceyComponent) (*corev1.ConfigMap, error) {
 	labels := utils.CreateResourceLabels(ComponentName, ServiceName, DefaultAppSelector, nil)
 
-	return utils.CreateConfigMap(ctx, ServiceName, args.Namespace, labels, args.Env)
+	return utils.CreateConfigMap(ctx, ServiceName, args.Namespace, labels, &args.Env)
 }
 
 // createContainer creates the container specification for the Quincey service

pkg/signet_node/signet_node.go

@@ -292,8 +292,8 @@ func NewSignetNode(ctx *pulumi.Context, args SignetNodeComponentArgs, opts ...pu
 	}
 
 	// Create ConfigMap for consensus environment variables
-	consensusEnv := map[string]pulumi.StringInput{
-		"EXAMPLE": pulumi.String("example"),
+	consensusEnv := ConsensusEnv{
+		Example: pulumi.String("example"),
 	}
 
 	consensusConfigMapName := "consensus-configmap-env-config"

pkg/signet_node/types.go

@@ -75,6 +75,16 @@ func (e SignetNodeEnv) GetEnvMap() pulumi.StringMap {
 	return utils.CreateEnvMap(e)
 }
 
+// ConsensusEnv contains environment variables for the consensus client
+type ConsensusEnv struct {
+	Example pulumi.StringInput `pulumi:"example"`
+}
+
+// GetEnvMap implements the utils.EnvProvider interface
+func (e ConsensusEnv) GetEnvMap() pulumi.StringMap {
+	return utils.CreateEnvMap(e)
+}
+
 // SignetNode interface defines methods that the SignetNodeComponent must implement
 type SignetNode interface {
 }

pkg/utils/env.go

@@ -19,12 +19,12 @@ type EnvProvider interface {
 
 // CreateConfigMap creates a Kubernetes ConfigMap from an environment variables struct
 // It automatically converts field names to environment variable format (UPPER_SNAKE_CASE)
-func CreateConfigMap(
+func CreateConfigMap[T EnvProvider](
 	ctx *pulumi.Context,
 	name string,
 	namespace pulumi.StringInput,
 	labels pulumi.StringMap,
-	env interface{},
+	env T,
 ) (*corev1.ConfigMap, error) {
 	// Create metadata for ConfigMap
 	metadata := &metav1.ObjectMetaArgs{
@@ -33,16 +33,8 @@ func CreateConfigMap(
 		Labels:    labels,
 	}
 
-	// Get environment variables as a map
-	data := pulumi.StringMap{}
-
-	// If the env object implements EnvProvider, use its GetEnvMap method
-	if provider, ok := env.(EnvProvider); ok {
-		data = provider.GetEnvMap()
-	} else {
-		// Otherwise use reflection to extract fields
-		data = CreateEnvMap(env)
-	}
+	// Get environment variables as a map using the EnvProvider interface
+	data := env.GetEnvMap()
 
 	// Create and return ConfigMap
 	return corev1.NewConfigMap(ctx, name, &corev1.ConfigMapArgs{
@@ -53,7 +45,7 @@ func CreateConfigMap(
 
 // CreateEnvMap converts a struct to a map of environment variables
 // Field names are converted from camelCase to UPPER_SNAKE_CASE
-func CreateEnvMap(env interface{}) pulumi.StringMap {
+func CreateEnvMap[T any](env T) pulumi.StringMap {
 	result := pulumi.StringMap{}
 	t := reflect.TypeOf(env)
 	v := reflect.ValueOf(env)