Remove unnecessary usages of envstr

Author: katherine-signal

cmd/internal/config/config.go

@@ -43,10 +43,10 @@ type Config struct {
 	KtQueryServiceConfig *ServiceConfig `yaml:"kt-query"`
 	KtTestServiceConfig  *ServiceConfig `yaml:"kt-test"`
 
-	LogOutputFile envstr `yaml:"log-output"`
-	MetricsAddr   envstr `yaml:"metrics-addr"`
-	DatadogAddr   envstr `yaml:"datadog-addr"`
-	HealthAddr    envstr `yaml:"health-addr"`
+	LogOutputFile string `yaml:"log-output"`
+	MetricsAddr   string `yaml:"metrics-addr"`
+	DatadogAddr   string `yaml:"datadog-addr"`
+	HealthAddr    string `yaml:"health-addr"`
 
 	APIConfig      *APIConfig      `yaml:"api"`
 	StreamConfig   *StreamConfig   `yaml:"stream"`
@@ -62,7 +62,7 @@ type CacheConfig struct {
 }
 
 type ServiceConfig struct {
-	ServerAddr envstr `yaml:"server-addr"`
+	ServerAddr string `yaml:"server-addr"`
 	// a map of headers to a list of authorized values. at least one header to value mapping must be present on client requests
 	AuthorizedHeaders map[string][]string `yaml:"authorized-headers"`
 	// a map of header values to auditor name. each key in this map should match a value in the AuthorizedHeaders map.
@@ -85,7 +85,7 @@ type APIConfig struct {
 	FakeUpdates *FakeUpdates `yaml:"fake"`
 
 	// A map of auditor name to its hex-encoded public signature key.
-	AuditorConfigs map[string]envstr `yaml:"auditors"`
+	AuditorConfigs map[string]string `yaml:"auditors"`
 	auditorConfigs map[string]ed25519.PublicKey
 
 	Distinguished time.Duration `yaml:"distinguished"`
@@ -308,7 +308,7 @@ func Read(filename string) (*Config, error) {
 
 	parsed.APIConfig.auditorConfigs = map[string]ed25519.PublicKey{}
 	for auditorName, publicKey := range parsed.APIConfig.AuditorConfigs {
-		pubKey, err := hex.DecodeString(publicKey.String())
+		pubKey, err := hex.DecodeString(publicKey)
 
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse auditor public key: %v for auditor %s", err, auditorName)
@@ -344,7 +344,7 @@ func Read(filename string) (*Config, error) {
 
 func (c *Config) SetLogOutput() error {
 	if c.LogOutputFile != "" {
-		f, err := os.OpenFile(c.LogOutputFile.String(), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
+		f, err := os.OpenFile(c.LogOutputFile, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
 		if err != nil {
 			return fmt.Errorf("Failed to open log file: %v", err)
 		}

cmd/kt-server/main.go

@@ -58,11 +58,11 @@ func main() {
 
 	var zeroLogLogger zerolog.Logger
 	var logWriter io.Writer
-	if len(config.LogOutputFile.String()) > 0 {
+	if len(config.LogOutputFile) > 0 {
 		logWriter = zerolog.MultiLevelWriter(
 			consoleWriter,
 			&lumberjack.Logger{
-				Filename:   config.LogOutputFile.String(),
+				Filename:   config.LogOutputFile,
 				MaxBackups: 10,
 				Compress:   true,
 			},
@@ -84,18 +84,18 @@ func main() {
 	healthCheck.SetServingStatus(readiness, healthpb.HealthCheckResponse_NOT_SERVING)
 
 	// Configure healthCheck service to listen on its dedicated port
-	lis, err := net.Listen("tcp", config.HealthAddr.String())
+	lis, err := net.Listen("tcp", config.HealthAddr)
 	if err != nil {
-		util.Log().Fatalf("failed to listen on health check port %v: %v", config.HealthAddr.String(), err)
+		util.Log().Fatalf("failed to listen on health check port %v: %v", config.HealthAddr, err)
 	}
 	util.Log().Infof("Starting health check server at: %v", config.HealthAddr)
 
 	// Start the health server.
 	go healthServer.Serve(lis)
 
 	// Start the metrics server.
-	exportMetrics(config.DatadogAddr.String())
-	go metricsServer(config.MetricsAddr.String())
+	exportMetrics(config.DatadogAddr)
+	go metricsServer(config.MetricsAddr)
 
 	// Start the inserter thread.
 	tx, err := config.DatabaseConfig.Connect()
@@ -246,5 +246,5 @@ func main() {
 }
 
 func createListener(serviceConfig *config.ServiceConfig) (net.Listener, error) {
-	return net.Listen("tcp", serviceConfig.ServerAddr.String())
+	return net.Listen("tcp", serviceConfig.ServerAddr)
 }