Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3651289
cleanup deprecated environment insert
Flo4604 Jul 7, 2025
86074ef
remove permission service
Flo4604 Jul 7, 2025
a1ab4a9
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 7, 2025
bf12c6a
remove permission service
Flo4604 Jul 7, 2025
d92e300
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 7, 2025
3628b8e
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 8, 2025
8c41ed6
changeup key verification
Flo4604 Jul 8, 2025
5da68ce
changeup key verification
Flo4604 Jul 8, 2025
cc8b4f2
cleanup
Flo4604 Jul 9, 2025
009b0fa
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 9, 2025
a1ae8eb
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 9, 2025
f637933
adjust after merge conflict
Flo4604 Jul 9, 2025
a6ea0ba
adjust validator
Flo4604 Jul 9, 2025
2bf34dc
add cache invalidation and options to use vault s3 storage
Flo4604 Jul 10, 2025
af635c7
add vault specific error codes
Flo4604 Jul 10, 2025
c9db814
add vault specific error codes
Flo4604 Jul 10, 2025
e028492
add some seed functions and more 200 tests
Flo4604 Jul 10, 2025
56ffa02
cleanup some tests
Flo4604 Jul 10, 2025
61b180a
break half the tests and fix em again
Flo4604 Jul 10, 2025
50b5777
make tests work
Flo4604 Jul 10, 2025
d3b2a6b
make tests work
Flo4604 Jul 11, 2025
4243e31
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 11, 2025
1d0dea3
fix caching for ratelimit namespaces
Flo4604 Jul 11, 2025
69091db
bit of formatting
Flo4604 Jul 11, 2025
a0f87cc
only use s3 for vault
Flo4604 Jul 11, 2025
b3cd5c8
index change
Flo4604 Jul 11, 2025
0774efa
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 11, 2025
20e53a3
add metrics?
Flo4604 Jul 11, 2025
6e0bfff
adjust s3 vault config
Flo4604 Jul 11, 2025
b583ab9
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 12, 2025
c6cf81a
adjust for comments
Flo4604 Jul 12, 2025
7223afe
Merge branch 'main' into feat/v2/keys.verifyKey
Flo4604 Jul 14, 2025
989be25
adjust for comments
Flo4604 Jul 14, 2025
d63a362
adjust for comments
Flo4604 Jul 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/api/src/pkg/keys/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ export class KeyService {
});
}

console.warn("ABC");
let remaining: number | undefined = undefined;
if (data.key.remaining !== null) {
const t0 = performance.now();
Expand Down
11 changes: 10 additions & 1 deletion go/apps/api/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@ import (
"github.com/unkeyed/unkey/go/pkg/tls"
)

type Config struct {
type S3Config struct {
URL string
Bucket string
AccessKeyID string
SecretAccessKey string
}

type Config struct {
// InstanceID is the unique identifier for this instance of the API server
InstanceID string

// Platform identifies the cloud platform where the node is running (e.g., aws, gcp, hetzner)
Platform string

Expand Down Expand Up @@ -54,7 +61,9 @@ type Config struct {
// TLSConfig provides HTTPS support when set
TLSConfig *tls.Config

// Vault Configuration
VaultMasterKeys []string
VaultS3 *S3Config
}

func (c Config) Validate() error {
Expand Down
1 change: 1 addition & 0 deletions go/apps/api/integration/harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ func (h *Harness) RunAPI(config ApiConfig) *ApiCluster {
PrometheusPort: 0,
TLSConfig: nil,
VaultMasterKeys: []string{"Ch9rZWtfMmdqMFBJdVhac1NSa0ZhNE5mOWlLSnBHenFPENTt7an5MRogENt9Si6wms4pQ2XIvqNSIgNpaBenJmXgcInhu6Nfv2U="}, // Test key from docker-compose
VaultS3: nil,
}

// Start API server in goroutine
Expand Down
212 changes: 194 additions & 18 deletions go/apps/api/openapi/gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading