Skip to content

Commit 7844139

Browse files
ci: update dependencies (#1426)
This PR updates dependencies not managed by dependabot. --------- Co-authored-by: GitHub Actions <apparitor@users.noreply.github.com> Co-authored-by: Caleb Doxsey <caleb@doxsey.net>
1 parent b305486 commit 7844139

5 files changed

Lines changed: 10 additions & 11 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/iancoleman/strcase v0.3.0
1919
github.com/martinlindhe/base36 v1.1.1
2020
github.com/open-policy-agent/opa v1.16.1
21-
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260526142609-3094c1c57aff
21+
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260527123055-046a073c9419
2222
github.com/pomerium/sdk-go v0.0.10-0.20260407162330-4596c91f544d
2323
github.com/rs/zerolog v1.35.1
2424
github.com/sergi/go-diff v1.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,8 @@ github.com/pomerium/datasource v0.18.2-0.20260522171636-b4b4ac7fe219 h1:h/q6ZWXm
779779
github.com/pomerium/datasource v0.18.2-0.20260522171636-b4b4ac7fe219/go.mod h1:AvH9IIKbQA9S6MTFHc5YL/xaJf/wLfVd8dWenK5B7TI=
780780
github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260519214603-7724aff26b06 h1:03u4+2HwelwofsKH2dGyeqD4Rm78xEQ00FNKKcSvfdY=
781781
github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260519214603-7724aff26b06/go.mod h1:7Svo/CaRt9vfJ22sEC+T/q/y2WNi/cZTlugNYUS7xwI=
782-
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260526142609-3094c1c57aff h1:ZgLvhUKF/h10hRCWhkkIpDOKU90ZMf04JzLfc8l1xF4=
783-
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260526142609-3094c1c57aff/go.mod h1:xAXINmOYo4VDacOdO/Ap61aKwt7TtaYZXMxpwhN65Nc=
782+
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260527123055-046a073c9419 h1:ADg9ZKCEL4cCycvQCUTVw3NVYBRc+08P9OpaRBKoIOc=
783+
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260527123055-046a073c9419/go.mod h1:xAXINmOYo4VDacOdO/Ap61aKwt7TtaYZXMxpwhN65Nc=
784784
github.com/pomerium/protoutil v0.0.0-20260508203012-e09f8af90da5 h1:qn/jJOvNR6xx9Wynx0VkHjZ/z3WCm5U+BTzQEMYWkuI=
785785
github.com/pomerium/protoutil v0.0.0-20260508203012-e09f8af90da5/go.mod h1:ERFmbEXYDOhFJjgzLJJ2AJkYKmm/naM7Isul3u5pGtI=
786786
github.com/pomerium/sdk-go v0.0.10-0.20260407162330-4596c91f544d h1:DdHPrdQNSjU3J1DsqWKcxh/pHlNkAgjtj32vzbcEXPo=

internal/testutil/databroker.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ import (
2323
// NewInMemoryDataBroker creates a new in-memory databroker.
2424
func NewInMemoryDataBroker(tb testing.TB) databrokerpb.DataBrokerServiceClient {
2525
key := bytes.Repeat([]byte{0x01}, 32)
26-
cfg := &config.Config{
27-
Options: config.NewDefaultOptions(),
28-
}
26+
cfg := config.New(config.NewDefaultOptions())
2927
cfg.Options.SharedKey = base64.StdEncoding.EncodeToString(key)
3028
srv := databroker.NewServer(noop.NewTracerProvider(), cfg)
3129
srv.OnConfigChange(tb.Context(), cfg)

pomerium/ctrl/config_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ func TestConfigChangeDetect(t *testing.T) {
1515
cfg := new(ctrl.InMemoryConfigSource)
1616

1717
ctx := context.Background()
18-
def := *config.NewDefaultOptions()
18+
def := config.New(config.NewDefaultOptions())
1919
for _, tc := range []struct {
2020
msg string
2121
expect bool
22-
config.Options
22+
cfg *config.Config
2323
}{
2424
{"initial", true, def},
2525
{"same initial", false, def},
2626
{"same again", false, def},
27-
{"changed", true, config.Options{}},
27+
{"changed", true, config.New(config.NewDefaultOptions())},
2828
} {
29-
assert.Equal(t, tc.expect, cfg.SetConfig(ctx, &config.Config{Options: &tc.Options}), tc.msg)
29+
assert.Equal(t, tc.expect, cfg.SetConfig(ctx, tc.cfg), tc.msg)
3030
}
3131
}

pomerium/validate.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ func validate(ctx context.Context, cfg *pb.Config, id string) error {
3838
return err
3939
}
4040

41-
pCfg := &config.Config{Options: options, OutboundPort: "8002"}
41+
pCfg := config.New(options)
42+
pCfg.OutboundPort = "8002"
4243

4344
builder := envoyconfig.New("127.0.0.1:8000",
4445
"127.0.0.1:8001",

0 commit comments

Comments
 (0)