feat: rate limit

feat: add ratelimit implementation

Author: smintz

.gitattributes

@@ -0,0 +1,6 @@
+*.pconf linguist-language=Starlark
+*.mpconf linguist-language=Starlark
+*.pinc linguist-language=Starlark
+*.proto-validator linguist-language=Starlark
+*.materialized_JSON linguist-language=json
+# *.materialized_JSON linguist-generated  # uncomment this line if you wish to hide these changes during code reviews (not recommended)

.gitignore

@@ -19,4 +19,5 @@
 
 # Go workspace file
 go.work
-dist
+dist
+.protoconf_cache

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "protoc": { "options": ["-I", "src"] },
+  "files.associations": {
+    "*.pconf": "Starlark",
+    "*.mpconf": "Starlark",
+    "*.pinc": "Starlark",
+    "*.proto-validator": "Starlark",
+    "*.materialized_JSON": "json"
+  }
+}

CONFIGSPACE

@@ -0,0 +1,53 @@
+envoy = remote_repo(
+    url="github.com/envoyproxy/data-plane-api",
+    commit="54a58fd",
+    # load protos from repo's root (default is to load from `/src`)
+    additional_proto_dirs=["."],
+    # patterns to exclude (mainly to avoid proto files duplications)
+    exclude_file_regexps=[
+        "^google/.*",
+        "^bazel/.*",
+    ],
+)
+ratelimit = remote_repo(
+    url="github.com/envoyproxy/ratelimit",
+    commit="19f2079",
+    additional_proto_dirs=["api"],
+    exclude_file_regexps=["^google/.*"],
+)
+
+xds = remote_repo(
+    url="github.com/cncf/xds",
+    commit="0335649",
+    additional_proto_dirs=["."],
+)
+
+GOOGLE_APIS_COMMIT = "cbe62016a4eb24e71186899b79b9a4736f858653"
+googleapis = remote_repo(
+    url="https://github.com/googleapis/googleapis/archive/{0}.zip//googleapis-{0}/".format(
+        GOOGLE_APIS_COMMIT
+    ),
+    # commit="cbe6201",
+    additional_proto_dirs=["."],
+    exclude_file_regexps=[
+        "^google/api/.*.proto",
+        "^google/rpc/.*.proto",
+        "^google/iam/.*.proto",
+        "^google/type/.*.proto",
+        "^google/storage/.*.proto",
+    ],
+)
+
+# xds = remote_repo(
+#     url="github.com/protoconf/protoconf-xds",
+#     branch="main",
+#     exclude_file_regexps=[
+#         "google/.*",
+#         "envoy/.*",
+#         "io/prometheus/.*",
+#         "opencensus/.*",
+#         "opentelemetry/.*",
+#         "udpa/.*",
+#         "validate/.*",
+#     ],
+# )

Dockerfile

@@ -1,3 +1,3 @@
-FROM envoyproxy/envoy:dev-334a50e7ab10ff3247c300fdf32a2425e9deaa55
+FROM envoyproxy/envoy:dev-7f6df241c61094c6e1ec26c8d1acf05f5803a32c
 COPY envoy.yaml /etc/envoy/envoy.yaml
 RUN chmod go+r /etc/envoy/envoy.yaml

buf.gen.yaml

@@ -1,5 +1,5 @@
 version: v1
 plugins:
   - name: go
-    out: .
+    out: src
     opt: paths=source_relative

buf.yaml

@@ -1,4 +1,4 @@
-version: v1
+version: v1beta1
 deps:
   - buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
   - buf.build/opencensus/opencensus
@@ -26,6 +26,8 @@ lint:
       - envoy/api/v2/listener.proto
       - envoy/config/bootstrap/v2/bootstrap.proto
 build:
+  roots:
+    - src
   excludes:
     - src/xds
     - src/validate
@@ -34,3 +36,4 @@ build:
     - src/google
     - src/opentelemetry
     - src/opencensus
+    - src/io

cmd/serve/serve.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"github.com/avast/retry-go"
 	clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
@@ -31,6 +32,7 @@ import (
 	routev3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
 	tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
 	runtimev3 "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3"
+	ratelimitv3 "github.com/envoyproxy/go-control-plane/ratelimit/config/ratelimit/v3"
 	"github.com/mitchellh/cli"
 	"github.com/stephenafamo/orchestra"
 
@@ -148,6 +150,7 @@ func (c *Command) Run(args []string) int {
 					resource.SecretType:          makeSecrets(xdsRecord.Secrets),
 					resource.ExtensionConfigType: makeExtensionConfigs(xdsRecord.ExtentionConfigs),
 					resource.RuntimeType:         makeRuntimes(xdsRecord.Runtimes),
+					resource.RateLimitConfigType: makeRatelimits(xdsRecord.Ratelimits),
 				})
 				if err != nil {
 					c.logger.Errorf("%v", err)
@@ -168,7 +171,7 @@ func (c *Command) Run(args []string) int {
 	ctx := context.Background()
 	cb := &test.Callbacks{Debug: c.logger.Debug}
 	srv := server.NewServer(ctx, xdsCache, cb)
-	err = orchestra.PlayUntilSignal(orchestra.PlayerFunc(xds.GeneratePlayer(srv, uint(c.config.Port))))
+	err = orchestra.PlayUntilSignal(orchestra.PlayerFunc(xds.GeneratePlayer(srv, uint(c.config.Port))), syscall.SIGINT, syscall.SIGTERM)
 	if err != nil {
 		c.logger.Errorf("grpc server return error: %v", err)
 		return 1
@@ -230,3 +233,10 @@ func makeRuntimes(input []*runtimev3.Runtime) (ret []types.Resource) {
 	}
 	return ret
 }
+
+func makeRatelimits(input []*ratelimitv3.RateLimitConfig) (ret []types.Resource) {
+	for _, item := range input {
+		ret = append(ret, item)
+	}
+	return ret
+}

go.mod

@@ -16,9 +16,7 @@ require (
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect
-	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect