Skip to content

Commit 4c0e9c5

Browse files
committed
Merge remote-tracking branch 'origin/main' into cdoxsey/provisioner
2 parents 57e0b6d + d5167d6 commit 4c0e9c5

6 files changed

Lines changed: 200 additions & 115 deletions

File tree

go.mod

Lines changed: 35 additions & 36 deletions
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.20260512221853-a18f6677d14e
21+
github.com/pomerium/pomerium v0.32.5-rc.1.0.20260514221756-859ed6e4c884
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
@@ -51,7 +51,7 @@ require (
5151
charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251217174709-64b15728bac9 // indirect
5252
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106192539-4b304240aab7 // indirect
5353
cloud.google.com/go v0.123.0 // indirect
54-
cloud.google.com/go/auth v0.18.2 // indirect
54+
cloud.google.com/go/auth v0.20.0 // indirect
5555
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
5656
cloud.google.com/go/compute/metadata v0.9.0 // indirect
5757
cloud.google.com/go/iam v1.5.3 // indirect
@@ -86,26 +86,25 @@ require (
8686
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
8787
github.com/armon/go-metrics v0.4.1 // indirect
8888
github.com/atotto/clipboard v0.1.4 // indirect
89-
github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
89+
github.com/aws/aws-sdk-go-v2 v1.41.7 // indirect
9090
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
91-
github.com/aws/aws-sdk-go-v2/config v1.32.13 // indirect
92-
github.com/aws/aws-sdk-go-v2/credentials v1.19.13 // indirect
93-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
91+
github.com/aws/aws-sdk-go-v2/config v1.32.17 // indirect
92+
github.com/aws/aws-sdk-go-v2/credentials v1.19.16 // indirect
93+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 // indirect
9494
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.12 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
97-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
98-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect
97+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 // indirect
10099
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 // indirect
102101
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
103102
github.com/aws/aws-sdk-go-v2/service/s3 v1.98.0 // indirect
104-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 // indirect
105-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.14 // indirect
106-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.18 // indirect
107-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 // indirect
108-
github.com/aws/smithy-go v1.24.2 // indirect
103+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 // indirect
104+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect
105+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect
106+
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect
107+
github.com/aws/smithy-go v1.25.1 // indirect
109108
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
110109
github.com/beorn7/perks v1.0.1 // indirect
111110
github.com/bits-and-blooms/bitset v1.24.4 // indirect
@@ -133,7 +132,7 @@ require (
133132
github.com/cockroachdb/redact v1.1.5 // indirect
134133
github.com/cockroachdb/swiss v0.0.0-20251224182025-b0f6560f979b // indirect
135134
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
136-
github.com/coreos/go-oidc/v3 v3.17.0 // indirect
135+
github.com/coreos/go-oidc/v3 v3.18.0 // indirect
137136
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
138137
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
139138
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
@@ -165,7 +164,7 @@ require (
165164
github.com/gobwas/glob v0.2.3 // indirect
166165
github.com/goccy/go-json v0.10.6 // indirect
167166
github.com/gogo/protobuf v1.3.2 // indirect
168-
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
167+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
169168
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
170169
github.com/golang/snappy v1.0.0 // indirect
171170
github.com/google/btree v1.1.3 // indirect
@@ -174,8 +173,8 @@ require (
174173
github.com/google/go-tpm v0.9.8 // indirect
175174
github.com/google/s2a-go v0.1.9 // indirect
176175
github.com/google/wire v0.7.0 // indirect
177-
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
178-
github.com/googleapis/gax-go/v2 v2.19.0 // indirect
176+
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
177+
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
179178
github.com/gorilla/mux v1.8.1 // indirect
180179
github.com/gorilla/securecookie v1.1.2 // indirect
181180
github.com/gosimple/unidecode v1.0.1 // indirect
@@ -197,7 +196,7 @@ require (
197196
github.com/josharian/intern v1.0.0 // indirect
198197
github.com/json-iterator/go v1.1.12 // indirect
199198
github.com/jxskiss/base62 v1.1.0 // indirect
200-
github.com/klauspost/compress v1.18.5 // indirect
199+
github.com/klauspost/compress v1.18.6 // indirect
201200
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
202201
github.com/kr/pretty v0.3.1 // indirect
203202
github.com/kr/text v0.2.0 // indirect
@@ -222,7 +221,7 @@ require (
222221
github.com/miekg/dns v1.1.72 // indirect
223222
github.com/minio/minlz v1.0.1-0.20250507153514-87eb42fe8882 // indirect
224223
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
225-
github.com/modelcontextprotocol/go-sdk v1.4.1 // indirect
224+
github.com/modelcontextprotocol/go-sdk v1.5.0 // indirect
226225
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
227226
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
228227
github.com/muesli/cancelreader v0.2.2 // indirect
@@ -239,8 +238,8 @@ require (
239238
github.com/pkg/errors v0.9.1 // indirect
240239
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
241240
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
242-
github.com/pomerium/datasource v0.18.2-0.20260508203031-4d90eb27a292 // indirect
243-
github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260331001551-046de5d7c5da // indirect
241+
github.com/pomerium/datasource v0.18.2-0.20260513141340-e0e123819aa8 // indirect
242+
github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260512225211-15289e9512f0 // indirect
244243
github.com/pomerium/protoutil v0.0.0-20260508203012-e09f8af90da5 // indirect
245244
github.com/pomerium/webauthn v0.0.0-20260508203114-e4bd6034c565 // indirect
246245
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
@@ -273,7 +272,7 @@ require (
273272
github.com/tklauser/numcpus v0.11.0 // indirect
274273
github.com/tniswong/go.rfcx v0.0.0-20181019234604-07783c52761f // indirect
275274
github.com/valyala/fastjson v1.6.10 // indirect
276-
github.com/vektah/gqlparser/v2 v2.5.32 // indirect
275+
github.com/vektah/gqlparser/v2 v2.5.33 // indirect
277276
github.com/weastur/hclog-zerolog v1.0.0 // indirect
278277
github.com/x448/float16 v0.8.4 // indirect
279278
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -286,18 +285,18 @@ require (
286285
go.opencensus.io v0.24.0 // indirect
287286
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
288287
go.opentelemetry.io/contrib/detectors/gcp v1.42.0 // indirect
289-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
288+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
290289
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
291-
go.opentelemetry.io/contrib/propagators/autoprop v0.67.0 // indirect
292-
go.opentelemetry.io/contrib/propagators/aws v1.42.0 // indirect
293-
go.opentelemetry.io/contrib/propagators/b3 v1.42.0 // indirect
294-
go.opentelemetry.io/contrib/propagators/jaeger v1.42.0 // indirect
295-
go.opentelemetry.io/contrib/propagators/ot v1.42.0 // indirect
290+
go.opentelemetry.io/contrib/propagators/autoprop v0.68.0 // indirect
291+
go.opentelemetry.io/contrib/propagators/aws v1.43.0 // indirect
292+
go.opentelemetry.io/contrib/propagators/b3 v1.43.0 // indirect
293+
go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
294+
go.opentelemetry.io/contrib/propagators/ot v1.43.0 // indirect
296295
go.opentelemetry.io/otel v1.43.0 // indirect
297296
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
298297
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
299298
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
300-
go.opentelemetry.io/otel/exporters/prometheus v0.64.0 // indirect
299+
go.opentelemetry.io/otel/exporters/prometheus v0.65.0 // indirect
301300
go.opentelemetry.io/otel/metric v1.43.0 // indirect
302301
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
303302
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
@@ -320,10 +319,10 @@ require (
320319
golang.org/x/tools v0.44.0 // indirect
321320
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
322321
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
323-
google.golang.org/api v0.273.1 // indirect
324-
google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5 // indirect
322+
google.golang.org/api v0.277.0 // indirect
323+
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
325324
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
326-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
325+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
327326
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
328327
gopkg.in/inf.v0 v0.9.1 // indirect
329328
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)