Add env expansion for cluster and api sections in collector mode

pkg/collector/api/server/apiserver.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/openconfig/gnmic/pkg/api/utils"
+	"github.com/openconfig/gnmic/pkg/collector/env"
 	cluster_manager "github.com/openconfig/gnmic/pkg/collector/managers/cluster"
 	inputs_manager "github.com/openconfig/gnmic/pkg/collector/managers/inputs"
 	outputs_manager "github.com/openconfig/gnmic/pkg/collector/managers/outputs"
@@ -87,8 +88,9 @@ func (s *Server) Start(locker lockers.Locker, wg *sync.WaitGroup) error {
 			return nil
 		}
 		apiCfg = apiCfgImpl
+		env.ExpandAPIEnv(apiCfg)
 		// create listener
-		listener, err = createListener(apiCfgImpl)
+		listener, err = createListener(apiCfg)
 		if err != nil {
 			s.logger.Error("failed to create listener", "error", err)
 			return err

pkg/collector/env/env.go

@@ -0,0 +1,81 @@
+package env
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/openconfig/gnmic/pkg/config"
+)
+
+func ExpandClusterEnv(clusteringConfig *config.Clustering) {
+	clusteringConfig.ClusterName = os.ExpandEnv(clusteringConfig.ClusterName)
+	clusteringConfig.InstanceName = os.ExpandEnv(clusteringConfig.InstanceName)
+	clusteringConfig.ServiceAddress = os.ExpandEnv(clusteringConfig.ServiceAddress)
+	for i := range clusteringConfig.Tags {
+		clusteringConfig.Tags[i] = os.ExpandEnv(clusteringConfig.Tags[i])
+	}
+	if clusteringConfig.TLS != nil {
+		clusteringConfig.TLS.CaFile = os.ExpandEnv(clusteringConfig.TLS.CaFile)
+		clusteringConfig.TLS.CertFile = os.ExpandEnv(clusteringConfig.TLS.CertFile)
+		clusteringConfig.TLS.KeyFile = os.ExpandEnv(clusteringConfig.TLS.KeyFile)
+	}
+	if clusteringConfig.Locker != nil {
+		expandLockerEnv(clusteringConfig.Locker)
+	}
+}
+
+func ExpandAPIEnv(apiConfig *config.APIServer) {
+	apiConfig.Address = os.ExpandEnv(apiConfig.Address)
+	if apiConfig.TLS != nil {
+		apiConfig.TLS.CaFile = os.ExpandEnv(apiConfig.TLS.CaFile)
+		apiConfig.TLS.CertFile = os.ExpandEnv(apiConfig.TLS.CertFile)
+		apiConfig.TLS.KeyFile = os.ExpandEnv(apiConfig.TLS.KeyFile)
+		apiConfig.TLS.ClientAuth = os.ExpandEnv(apiConfig.TLS.ClientAuth)
+	}
+	apiConfig.EnableMetrics = os.ExpandEnv(strings.ToLower(strconv.FormatBool(apiConfig.EnableMetrics))) == "true"
+	apiConfig.EnableProfiling = os.ExpandEnv(strings.ToLower(strconv.FormatBool(apiConfig.EnableProfiling))) == "true"
+	apiConfig.Debug = os.ExpandEnv(strings.ToLower(strconv.FormatBool(apiConfig.Debug))) == "true"
+	apiConfig.HealthzDisableLogging = os.ExpandEnv(strings.ToLower(strconv.FormatBool(apiConfig.HealthzDisableLogging))) == "true"
+}
+
+func expandLockerEnv(locker map[string]any) {
+	expandMapEnv(locker)
+}
+
+func expandMapEnv(m map[string]any) {
+	for f := range m {
+		switch v := m[f].(type) {
+		case string:
+			m[f] = os.ExpandEnv(v)
+		case map[string]any:
+			expandMapEnv(v)
+			m[f] = v
+		case []any:
+			for i, item := range v {
+				switch item := item.(type) {
+				case string:
+					v[i] = os.ExpandEnv(item)
+				case map[string]any:
+					expandMapEnv(item)
+				case []any:
+					expandSliceEnv(item)
+				}
+			}
+			m[f] = v
+		}
+	}
+}
+
+func expandSliceEnv(s []any) {
+	for i, item := range s {
+		switch item := item.(type) {
+		case string:
+			s[i] = os.ExpandEnv(item)
+		case map[string]any:
+			expandMapEnv(item)
+		case []any:
+			expandSliceEnv(item)
+		}
+	}
+}