use config.New

Author: calebdoxsey

internal/testutil/databroker.go

@@ -23,9 +23,7 @@ import (
 // NewInMemoryDataBroker creates a new in-memory databroker.
 func NewInMemoryDataBroker(tb testing.TB) databrokerpb.DataBrokerServiceClient {
 	key := bytes.Repeat([]byte{0x01}, 32)
-	cfg := &config.Config{
-		Options: config.NewDefaultOptions(),
-	}
+	cfg := config.New(config.NewDefaultOptions())
 	cfg.Options.SharedKey = base64.StdEncoding.EncodeToString(key)
 	srv := databroker.NewServer(noop.NewTracerProvider(), cfg)
 	srv.OnConfigChange(tb.Context(), cfg)

pomerium/ctrl/config_test.go

@@ -15,17 +15,17 @@ func TestConfigChangeDetect(t *testing.T) {
 	cfg := new(ctrl.InMemoryConfigSource)
 
 	ctx := context.Background()
-	def := *config.NewDefaultOptions()
+	def := config.New(config.NewDefaultOptions())
 	for _, tc := range []struct {
 		msg    string
 		expect bool
-		config.Options
+		cfg    *config.Config
 	}{
 		{"initial", true, def},
 		{"same initial", false, def},
 		{"same again", false, def},
-		{"changed", true, config.Options{}},
+		{"changed", true, config.New(config.NewDefaultOptions())},
 	} {
-		assert.Equal(t, tc.expect, cfg.SetConfig(ctx, &config.Config{Options: &tc.Options}), tc.msg)
+		assert.Equal(t, tc.expect, cfg.SetConfig(ctx, tc.cfg), tc.msg)
 	}
 }

pomerium/validate.go

@@ -38,7 +38,8 @@ func validate(ctx context.Context, cfg *pb.Config, id string) error {
 		return err
 	}
 
-	pCfg := &config.Config{Options: options, OutboundPort: "8002"}
+	pCfg := config.New(options)
+	pCfg.OutboundPort = "8002"
 
 	builder := envoyconfig.New("127.0.0.1:8000",
 		"127.0.0.1:8001",