Skip to content

Commit f5b2b68

Browse files
author
Michael Silva
committed
Merge branch 'main' of https://github.com/unkeyed/unkey into query-logs-component
2 parents eab20c9 + f8c5e83 commit f5b2b68

File tree

253 files changed

+13344
-3865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+13344
-3865
lines changed

.github/workflows/job_test_go_api_local.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ on:
33
workflow_call:
44

55
jobs:
6-
test_agent_local:
6+
tests:
7+
name: Test
78
runs-on: ubuntu-latest
89
timeout-minutes: 60
910
steps:
@@ -20,3 +21,6 @@ jobs:
2021
- name: Test
2122
run: task test
2223
working-directory: go
24+
env:
25+
SIMULATON_TEST: true
26+
INTEGRATION_TEST: true

apps/agent/pkg/gossip/cluster.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,6 @@ func (c *cluster) randomPeers(n int, withoutNodeIds ...string) ([]*gossipv1.Memb
275275
peerIds = append(peerIds, id)
276276
}
277277

278-
if len(peerIds) == 0 || len(peerIds) < c.config.GossipFactor {
279-
c.logger.Warn().Int("gossipFactor", c.config.GossipFactor).Int("peers", len(peerIds)).Msg("not enough peers to gossip with")
280-
return nil, fault.New("not enough peers to gossip with")
281-
}
282-
283278
peers := []*gossipv1.Member{}
284279
for len(peers) < n {
285280
peer := c.members[peerIds[rand.Intn(len(peerIds))]]

apps/agent/pkg/gossip/membership_test.go

Lines changed: 0 additions & 256 deletions
This file was deleted.

apps/api/src/routes/v1_ratelimits_setOverride.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const route = createRoute({
3535
"Identifier of your user, this can be their userId, an email, an ip or anything else. Wildcards ( * ) can be used to match multiple identifiers, More info can be found at https://www.unkey.com/docs/ratelimiting/overrides#wildcard-rules",
3636
example: "user_123",
3737
}),
38-
limit: z.number().int().positive().openapi({
38+
limit: z.number().int().nonnegative().openapi({
3939
description: "How many requests may pass in a given window.",
4040
example: 10,
4141
}),

apps/chproxy/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
FROM golang:1.23-alpine AS builder
2-
1+
FROM golang:1.24-alpine AS builder
32

43
WORKDIR /go/src/github.com/unkeyed/unkey/apps/chproxy
54
COPY go.mod ./
6-
# COPY go.sum ./
7-
# RUN go mod download
85

96
COPY . .
10-
RUN go build -o bin/chproxy ./main.go
11-
7+
RUN go build -o bin/chproxy
128

13-
FROM golang:1.23-alpine
9+
FROM golang:1.24-alpine
1410
RUN apk add --update curl
1511

1612
WORKDIR /usr/local/bin
1713
COPY --from=builder /go/src/github.com/unkeyed/unkey/apps/chproxy/bin/chproxy .
1814

19-
CMD [ "/usr/local/bin/chproxy"]
15+
CMD ["/usr/local/bin/chproxy"]

0 commit comments

Comments
 (0)