ai proto update/fed console fix (#10642)

solo-io · Feb 20, 2025 · e1d9b9e · e1d9b9e
1 parent 2e8882e
commit e1d9b9e
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 66 deletions.
diff --git a/changelog/v1.19.0-beta11/ai-options-proto-fix.yaml b/changelog/v1.19.0-beta11/ai-options-proto-fix.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/solo-projects/issues/7875
+    resolvesIssue: false
+    description: >-
+      Remove `regex` field from ai options proto enum to avoid generated code conflicts with `REGEX` field
diff --git a/...thub.com/solo-io/gloo/projects/gloo/api/v1/enterprise/options/ai/ai.proto.sk.md b/...thub.com/solo-io/gloo/projects/gloo/api/v1/enterprise/options/ai/ai.proto.sk.md
diff --git a/projects/gloo/api/v1/enterprise/options/ai/ai.proto b/projects/gloo/api/v1/enterprise/options/ai/ai.proto
@@ -655,7 +655,6 @@ message AIPromptGuard {
     message HeaderMatch {
       // The header string match type.
       enum MatchType {
-        option allow_alias = true;
         // The string must match exactly the specified string.
         EXACT = 0;
         // The string must have the specified prefix.
@@ -666,8 +665,6 @@ message AIPromptGuard {
         CONTAINS = 3;
         // The string must match the specified [RE2-style regular expression](https://github.com/google/re2/wiki/) pattern.
         REGEX = 4;
-        // Do not use. Use `REGEX` (fully capitalized) instead.
-        regex = 4;
       }
       // The header key string to match against.
       string key = 1;

diff --git a/projects/gloo/pkg/api/v1/enterprise/options/ai/ai.pb.go b/projects/gloo/pkg/api/v1/enterprise/options/ai/ai.pb.go