Merge remote-tracking branch 'origin' into buf-experiment

Signed-off-by: Eduardo Apolinario <[email protected]>
flyteorg · Feb 1, 2024 · c554f61 · c554f61
2 parents 00ab086 + 09578d1
commit c554f61
Show file tree

Hide file tree

Showing 8 changed files with 548 additions and 552 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -11,6 +11,7 @@ build:
   jobs:
     post_install:
       - conda-lock install --name $READTHEDOCS_VERSION monodocs-environment.lock.yaml
+      - pip install ./flyteidl
       - conda info
       - conda env list
       - conda list

diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml
diff --git a/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go b/flyteidl/gen/pb-go/flyteidl/service/admin.pb.go
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.pb.gw.go b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.pb.gw.go
diff --git a/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json b/flyteidl/gen/pb-go/gateway/flyteidl/service/admin.swagger.json
diff --git a/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py b/flyteidl/gen/pb_python/flyteidl/service/admin_pb2.py
diff --git a/flyteidl/protos/flyteidl/service/admin.proto b/flyteidl/protos/flyteidl/service/admin.proto
@@ -371,7 +371,7 @@ service AdminService {
     option (google.api.http) = {
       get: "/api/v1/data/executions/{id.project}/{id.domain}/{id.name}"
       additional_bindings {
-        get: "/api/v1/data/executions/org/{id.org}/{id.project}/{id.domain}/{id.name}"
+        get: "/api/v1/data/org/{id.org}/executions/{id.project}/{id.domain}/{id.name}"
       }
     };
     // option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {