address comments

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
envoyproxy · Apr 7, 2024 · a033009 · a033009
1 parent 40e996e
commit a033009
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 1 deletion.
diff --git a/internal/xds/translator/ratelimit.go b/internal/xds/translator/ratelimit.go
@@ -268,7 +268,16 @@ func GetRateLimitServiceConfigStr(pbCfg *rlsconfv3.RateLimitConfig) (string, err
 	enc.SetIndent(2)
 	// Translate pb config to yaml
 	yamlRoot := config.ConfigXdsProtoToYaml(pbCfg)
-	err := enc.Encode(*yamlRoot)
+	rateLimitConfig := &struct {
+		Name        string
+		Domain      string
+		Descriptors []config.YamlDescriptor
+	}{
+		Name:        pbCfg.Name,
+		Domain:      yamlRoot.Domain,
+		Descriptors: yamlRoot.Descriptors,
+	}
+	err := enc.Encode(rateLimitConfig)
 	return buf.String(), err
 }
 

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/distinct-match.yaml b/internal/xds/translator/testdata/out/ratelimit-config/distinct-match.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/distinct-remote-address-match.yaml b/internal/xds/translator/testdata/out/ratelimit-config/distinct-remote-address-match.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/empty-header-matches.yaml b/internal/xds/translator/testdata/out/ratelimit-config/empty-header-matches.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/masked-remote-address-match.yaml b/internal/xds/translator/testdata/out/ratelimit-config/masked-remote-address-match.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/...or/testdata/out/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml b/...or/testdata/out/ratelimit-config/multiple-masked-remote-address-match-with-same-cidr.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/multiple-matches.yaml b/internal/xds/translator/testdata/out/ratelimit-config/multiple-matches.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/multiple-routes.yaml b/internal/xds/translator/testdata/out/ratelimit-config/multiple-routes.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/multiple-rules.yaml b/internal/xds/translator/testdata/out/ratelimit-config/multiple-rules.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route

diff --git a/internal/xds/translator/testdata/out/ratelimit-config/value-match.yaml b/internal/xds/translator/testdata/out/ratelimit-config/value-match.yaml
@@ -1,3 +1,4 @@
+name: first-listener
 domain: first-listener
 descriptors:
   - key: first-route