fix: updating ratelimits for identities

unkeyed · Sep 5, 2024 · fb1fb20 · fb1fb20
1 parent 972f46b
commit fb1fb20
Show file tree

Hide file tree

Showing 29 changed files with 310 additions and 109 deletions.
diff --git a/apps/agent/integration/cluster/docker/ratelimits_test.go b/apps/agent/integration/cluster/docker/ratelimits_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 
 	"github.com/unkeyed/unkey/apps/agent/pkg/uid"
 

diff --git a/apps/agent/pkg/api/errors/internal_server_error.go b/apps/agent/pkg/api/errors/internal_server_error.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/Southclaws/fault/fmsg"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/ctxutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 // HandleError takes in any unforseen error and returns a BaseError to be sent to the client

diff --git a/apps/agent/pkg/api/errors/validation_error.go b/apps/agent/pkg/api/errors/validation_error.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/Southclaws/fault/fmsg"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/ctxutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func HandleValidationError(ctx context.Context, err error) openapi.ValidationError {

diff --git a/apps/agent/pkg/api/register_routes.go b/apps/agent/pkg/api/register_routes.go
@@ -3,6 +3,7 @@ package api
 import (
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
 	notFound "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/not_found"
+	openapi "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/openapi"
 	v1Liveness "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_liveness"
 	v1RatelimitCommitLease "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_ratelimit_commitLease"
 	v1RatelimitMultiRatelimit "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_ratelimit_multiRatelimit"
@@ -27,6 +28,7 @@ func (s *Server) RegisterRoutes() {
 	staticBearerAuth := newBearerAuthMiddleware(s.authToken)
 
 	v1Liveness.New(svc).Register(s.mux)
+	openapi.New(svc).Register(s.mux)
 
 	v1RatelimitCommitLease.New(svc).
 		WithMiddleware(staticBearerAuth).

diff --git a/apps/agent/pkg/api/routes/not_found/handler.go b/apps/agent/pkg/api/routes/not_found/handler.go
@@ -3,9 +3,9 @@ package notFound
 import (
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/ctxutil"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 // This is a hack, because / matches everything, so we need to make sure this is the last route

diff --git a/apps/agent/pkg/api/routes/openapi/handler.go b/apps/agent/pkg/api/routes/openapi/handler.go
@@ -0,0 +1,21 @@
+package openapi
+
+import (
+	"net/http"
+
+	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
+)
+
+func New(svc routes.Services) *routes.Route {
+
+	return routes.NewRoute("GET", "/openapi.json",
+		func(w http.ResponseWriter, r *http.Request) {
+
+			w.WriteHeader(200)
+			w.Header().Set("Content-Type", "application/json")
+			w.Write(openapi.Spec)
+
+		},
+	)
+}
diff --git a/apps/agent/pkg/api/routes/sender.go b/apps/agent/pkg/api/routes/sender.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/ctxutil"
 	"github.com/unkeyed/unkey/apps/agent/pkg/logging"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 type Sender interface {

diff --git a/apps/agent/pkg/api/routes/v1_liveness/handler.go b/apps/agent/pkg/api/routes/v1_liveness/handler.go
@@ -3,8 +3,8 @@ package v1Liveness
 import (
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func New(svc routes.Services) *routes.Route {

diff --git a/apps/agent/pkg/api/routes/v1_liveness/handler_test.go b/apps/agent/pkg/api/routes/v1_liveness/handler_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	v1Liveness "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_liveness"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/testutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func TestLiveness(t *testing.T) {

diff --git a/apps/agent/pkg/api/routes/v1_ratelimit_commitLease/handler.go b/apps/agent/pkg/api/routes/v1_ratelimit_commitLease/handler.go
@@ -6,10 +6,10 @@ import (
 	"github.com/Southclaws/fault"
 	"github.com/Southclaws/fault/fmsg"
 	"github.com/btcsuite/btcutil/base58"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	ratelimitv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/ratelimit/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/apps/agent/pkg/api/routes/v1_ratelimit_commitLease/handler_test.go b/apps/agent/pkg/api/routes/v1_ratelimit_commitLease/handler_test.go
@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	v1RatelimitCommitLease "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_ratelimit_commitLease"
 	v1RatelimitRatelimit "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/testutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/uid"
 	"github.com/unkeyed/unkey/apps/agent/pkg/util"
 )

diff --git a/apps/agent/pkg/api/routes/v1_ratelimit_multiRatelimit/handler.go b/apps/agent/pkg/api/routes/v1_ratelimit_multiRatelimit/handler.go
@@ -3,10 +3,10 @@ package v1RatelimitMultiRatelimit
 import (
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	ratelimitv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/ratelimit/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func New(svc routes.Services) *routes.Route {

diff --git a/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit/handler.go b/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit/handler.go
@@ -4,10 +4,10 @@ import (
 	"net/http"
 
 	"github.com/btcsuite/btcutil/base58"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	ratelimitv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/ratelimit/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/util"
 	"google.golang.org/protobuf/proto"
 )

diff --git a/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit/handler_test.go b/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit/handler_test.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	v1RatelimitRatelimit "github.com/unkeyed/unkey/apps/agent/pkg/api/routes/v1_ratelimit_ratelimit"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/testutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/uid"
 )
 

diff --git a/apps/agent/pkg/api/routes/v1_vault_decrypt/handler.go b/apps/agent/pkg/api/routes/v1_vault_decrypt/handler.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/Southclaws/fault"
 	"github.com/Southclaws/fault/fmsg"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	vaultv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/vault/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func New(svc routes.Services) *routes.Route {

diff --git a/apps/agent/pkg/api/routes/v1_vault_encrypt/handler.go b/apps/agent/pkg/api/routes/v1_vault_encrypt/handler.go
@@ -3,10 +3,10 @@ package v1VaultEncrypt
 import (
 	"net/http"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	vaultv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/vault/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 func New(svc routes.Services) *routes.Route {

diff --git a/apps/agent/pkg/api/routes/v1_vault_encrypt_bulk/handler.go b/apps/agent/pkg/api/routes/v1_vault_encrypt_bulk/handler.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/Southclaws/fault"
 	"github.com/Southclaws/fault/fmsg"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	vaultv1 "github.com/unkeyed/unkey/apps/agent/gen/proto/vault/v1"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/errors"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/routes"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 type Request = openapi.V1EncryptBulkRequestBody

diff --git a/apps/agent/pkg/api/server.go b/apps/agent/pkg/api/server.go
@@ -83,7 +83,7 @@ func New(config Config) (*Server, error) {
 	// 	// validationMiddleware,
 	// )
 	// s.app.Use(tracingMiddleware)
-	v, err := validation.New("./pkg/openapi/openapi.json")
+	v, err := validation.New()
 	if err != nil {
 		return nil, err
 	}

diff --git a/apps/agent/pkg/api/testutil/harness.go b/apps/agent/pkg/api/testutil/harness.go
@@ -81,7 +81,7 @@ func (h *Harness) Register(route *routes.Route) {
 
 func (h *Harness) SetupRoute(constructor func(svc routes.Services) *routes.Route) *routes.Route {
 
-	validator, err := validation.New("./pkg/openapi/openapi.json")
+	validator, err := validation.New()
 	require.NoError(h.t, err)
 	route := constructor(routes.Services{
 		Logger:           h.logger,

diff --git a/apps/agent/pkg/api/validation/validator.go b/apps/agent/pkg/api/validation/validator.go
@@ -6,14 +6,13 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 
 	"github.com/Southclaws/fault"
 	"github.com/Southclaws/fault/fmsg"
 	"github.com/pb33f/libopenapi"
 	validator "github.com/pb33f/libopenapi-validator"
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/api/ctxutil"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/util"
 )
 
@@ -25,12 +24,9 @@ type Validator struct {
 	validator validator.Validator
 }
 
-func New(specPath string) (*Validator, error) {
-	b, err := os.ReadFile(specPath)
-	if err != nil {
-		return nil, fault.Wrap(err, fmsg.With("failed to read spec file"))
-	}
-	document, err := libopenapi.NewDocument(b)
+func New() (*Validator, error) {
+
+	document, err := libopenapi.NewDocument(openapi.Spec)
 	if err != nil {
 		return nil, fault.Wrap(err, fmsg.With("failed to create OpenAPI document"))
 	}

diff --git a/apps/agent/pkg/openapi/config.yaml b/apps/agent/pkg/openapi/config.yaml
@@ -1,5 +1,5 @@
 package: openapi
-output: ./gen/openapi/gen.go
+output: ./pkg/openapi/gen.go
 generate:
   models: true
 output-options:

diff --git a/apps/agent/gen/openapi/gen.go → apps/agent/pkg/openapi/gen.go b/apps/agent/gen/openapi/gen.go → apps/agent/pkg/openapi/gen.go
diff --git a/apps/agent/pkg/openapi/spec.go b/apps/agent/pkg/openapi/spec.go
@@ -0,0 +1,11 @@
+package openapi
+
+import (
+	_ "embed"
+)
+
+// Spec is the OpenAPI specification for the service
+// It's loaded from our openapi file and embedded into the binary
+//
+//go:embed openapi.json
+var Spec []byte
diff --git a/apps/agent/pkg/tinybird/tinybird.go b/apps/agent/pkg/tinybird/tinybird.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 )
 
 type Client struct {

diff --git a/apps/agent/schema.json b/apps/agent/schema.json
@@ -13,19 +13,13 @@
     "clickhouse": {
       "type": "object",
       "properties": {
-        "addr": {
+        "url": {
           "type": "string",
           "minLength": 1
-        },
-        "password": {
-          "type": "string"
-        },
-        "username": {
-          "type": "string"
         }
       },
       "additionalProperties": false,
-      "required": ["addr", "username", "password"]
+      "required": ["url"]
     },
     "cluster": {
       "type": "object",
@@ -282,7 +276,8 @@
           "required": ["s3Bucket", "s3Url", "s3AccessKeyId", "s3AccessKeySecret", "masterKeys"]
         }
       },
-      "additionalProperties": false
+      "additionalProperties": false,
+      "required": ["vault"]
     },
     "tracing": {
       "type": "object",

diff --git a/apps/agent/services/eventrouter/service.go b/apps/agent/services/eventrouter/service.go
@@ -8,13 +8,13 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/unkeyed/unkey/apps/agent/gen/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/auth"
 	"github.com/unkeyed/unkey/apps/agent/pkg/batch"
 	"github.com/unkeyed/unkey/apps/agent/pkg/clickhouse"
 	"github.com/unkeyed/unkey/apps/agent/pkg/clickhouse/schema"
 	"github.com/unkeyed/unkey/apps/agent/pkg/logging"
 	"github.com/unkeyed/unkey/apps/agent/pkg/metrics"
+	"github.com/unkeyed/unkey/apps/agent/pkg/openapi"
 	"github.com/unkeyed/unkey/apps/agent/pkg/prometheus"
 	"github.com/unkeyed/unkey/apps/agent/pkg/tinybird"
 	"github.com/unkeyed/unkey/apps/agent/pkg/tracing"