From f0114889f5431e137e3d9e26732ca4561e3f26ce Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Wed, 22 Jan 2025 11:02:29 +0100
Subject: [PATCH] Align NewConfig with AddFlags defaults

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
---
 server/embed/config.go      | 33 +++++++++++++++++++++------------
 server/embed/config_test.go | 14 +-------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/server/embed/config.go b/server/embed/config.go
index a66adf97c2b2..b4882d24b5f9 100644
--- a/server/embed/config.go
+++ b/server/embed/config.go
@@ -578,25 +578,31 @@ func NewConfig() *Config {
 		CORS:          map[string]struct{}{"*": {}},
 		HostWhitelist: map[string]struct{}{"*": {}},
 
-		AuthToken:    DefaultAuthToken,
-		BcryptCost:   uint(bcrypt.DefaultCost),
-		AuthTokenTTL: 300,
+		AuthToken:              DefaultAuthToken,
+		BcryptCost:             uint(bcrypt.DefaultCost),
+		AuthTokenTTL:           300,
+		SelfSignedCertValidity: 1,
+		TlsMinVersion:          string(tlsutil.TLSVersion12),
 
 		PreVote: true,
 
 		loggerMu:              new(sync.RWMutex),
 		logger:                nil,
 		Logger:                "zap",
+		LogFormat:             "json",
 		LogOutputs:            []string{DefaultLogOutput},
 		LogLevel:              logutil.DefaultLogLevel,
 		EnableLogRotation:     false,
 		LogRotationConfigJSON: DefaultLogRotationConfig,
 		EnableGRPCGateway:     true,
 
-		ExperimentalDowngradeCheckTime:      DefaultDowngradeCheckTime,
-		ExperimentalMemoryMlock:             false,
-		ExperimentalStopGRPCServiceOnDefrag: false,
-		ExperimentalMaxLearners:             membership.DefaultMaxLearners,
+		ExperimentalDowngradeCheckTime:            DefaultDowngradeCheckTime,
+		ExperimentalMemoryMlock:                   false,
+		ExperimentalStopGRPCServiceOnDefrag:       false,
+		ExperimentalMaxLearners:                   membership.DefaultMaxLearners,
+		ExperimentalTxnModeWriteWithSharedBuffer:  true,
+		ExperimentalDistributedTracingAddress:     "localhost:4317",
+		ExperimentalDistributedTracingServiceName: "etcd",
 
 		CompactHashCheckTime: DefaultCompactHashCheckTime,
 		// TODO: delete in v3.7
@@ -611,14 +617,17 @@ func NewConfig() *Config {
 				KeepAliveTime:    DefaultDiscoveryKeepAliveTime,
 				KeepAliveTimeout: DefaultDiscoveryKeepAliveTimeOut,
 
-				Secure: &clientv3.SecureConfig{},
-				Auth:   &clientv3.AuthConfig{},
+				Secure: &clientv3.SecureConfig{
+					InsecureTransport: true,
+				},
+				Auth: &clientv3.AuthConfig{},
 			},
 		},
 
-		AutoCompactionMode: DefaultAutoCompactionMode,
-		ServerFeatureGate:  features.NewDefaultServerFeatureGate(DefaultName, nil),
-		FlagsExplicitlySet: map[string]bool{},
+		AutoCompactionMode:      DefaultAutoCompactionMode,
+		AutoCompactionRetention: "0",
+		ServerFeatureGate:       features.NewDefaultServerFeatureGate(DefaultName, nil),
+		FlagsExplicitlySet:      map[string]bool{},
 	}
 	cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
 	return cfg
diff --git a/server/embed/config_test.go b/server/embed/config_test.go
index 757769b87223..7e12ede3023f 100644
--- a/server/embed/config_test.go
+++ b/server/embed/config_test.go
@@ -33,7 +33,6 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"go.etcd.io/etcd/client/pkg/v3/srv"
-	"go.etcd.io/etcd/client/pkg/v3/tlsutil"
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	"go.etcd.io/etcd/client/pkg/v3/types"
 	"go.etcd.io/etcd/pkg/v3/featuregate"
@@ -1051,19 +1050,8 @@ func TestMatchNewConfigAddFlags(t *testing.T) {
 	fs := flag.NewFlagSet("etcd", flag.ContinueOnError)
 	cfg.AddFlags(fs)
 	require.NoError(t, fs.Parse(nil))
-
-	newConfig := NewConfig()
-	// TODO: Remove the following assigments when both match.
-	newConfig.SelfSignedCertValidity = 1
-	newConfig.TlsMinVersion = string(tlsutil.TLSVersion12)
-	newConfig.DiscoveryCfg.Secure.InsecureTransport = true
-	newConfig.AutoCompactionRetention = "0"
-	newConfig.ExperimentalDistributedTracingAddress = "localhost:4317"
-	newConfig.ExperimentalDistributedTracingServiceName = "etcd"
-	newConfig.LogFormat = "json"
-	newConfig.ExperimentalTxnModeWriteWithSharedBuffer = true
 	// TODO: Reduce number of unexported fields set in config
-	if diff := cmp.Diff(newConfig, cfg, cmpopts.IgnoreUnexported(transport.TLSInfo{}, Config{}), cmp.Comparer(func(a, b featuregate.FeatureGate) bool {
+	if diff := cmp.Diff(NewConfig(), cfg, cmpopts.IgnoreUnexported(transport.TLSInfo{}, Config{}), cmp.Comparer(func(a, b featuregate.FeatureGate) bool {
 		return a.String() == b.String()
 	})); diff != "" {
 		t.Errorf("Diff: %s", diff)