From cc9cdbe82d7a616f3545c20788edef7ea9115f3b Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Tue, 12 Nov 2024 10:19:12 +0100 Subject: [PATCH] Authz: Move extension proto up a layer (#96254) * Authz: Move extension proto up a layer * Lint --- Makefile | 2 +- pkg/services/accesscontrol/dualwrite/collectors.go | 2 +- pkg/services/accesscontrol/dualwrite/resource_reconciler.go | 2 +- pkg/services/authz/{zanzana => }/proto/v1/buf.gen.yaml | 4 ++-- pkg/services/authz/{zanzana => }/proto/v1/buf.yaml | 0 pkg/services/authz/{zanzana => }/proto/v1/extention.pb.go | 0 pkg/services/authz/{zanzana => }/proto/v1/extention.proto | 0 .../authz/{zanzana => }/proto/v1/extention_grpc.pb.go | 0 pkg/services/authz/zanzana.go | 2 +- pkg/services/authz/zanzana/client.go | 2 +- pkg/services/authz/zanzana/client/client.go | 2 +- pkg/services/authz/zanzana/client/noop.go | 2 +- pkg/services/authz/zanzana/common/tuple.go | 2 +- pkg/services/authz/zanzana/server/server.go | 2 +- pkg/services/authz/zanzana/server/server_list.go | 2 +- pkg/services/authz/zanzana/server/server_list_test.go | 2 +- pkg/services/authz/zanzana/server/server_read.go | 2 +- pkg/services/authz/zanzana/server/server_write.go | 2 +- 18 files changed, 15 insertions(+), 15 deletions(-) rename pkg/services/authz/{zanzana => }/proto/v1/buf.gen.yaml (65%) rename pkg/services/authz/{zanzana => }/proto/v1/buf.yaml (100%) rename pkg/services/authz/{zanzana => }/proto/v1/extention.pb.go (100%) rename pkg/services/authz/{zanzana => }/proto/v1/extention.proto (100%) rename pkg/services/authz/{zanzana => }/proto/v1/extention_grpc.pb.go (100%) diff --git a/Makefile b/Makefile index ccabdbd733a..6929b8167d4 100644 --- a/Makefile +++ b/Makefile @@ -416,7 +416,7 @@ protobuf: ## Compile protobuf definitions buf generate pkg/plugins/backendplugin/pluginextensionv2 --template pkg/plugins/backendplugin/pluginextensionv2/buf.gen.yaml buf generate pkg/plugins/backendplugin/secretsmanagerplugin --template pkg/plugins/backendplugin/secretsmanagerplugin/buf.gen.yaml buf generate pkg/storage/unified/resource --template pkg/storage/unified/resource/buf.gen.yaml - buf generate pkg/services/authz/zanzana/proto/v1 --template pkg/services/authz/zanzana/proto/v1/buf.gen.yaml + buf generate pkg/services/authz/proto/v1 --template pkg/services/authz/proto/v1/buf.gen.yaml .PHONY: clean clean: ## Clean up intermediate build artifacts. diff --git a/pkg/services/accesscontrol/dualwrite/collectors.go b/pkg/services/accesscontrol/dualwrite/collectors.go index 0186f080e78..3607675f25c 100644 --- a/pkg/services/accesscontrol/dualwrite/collectors.go +++ b/pkg/services/accesscontrol/dualwrite/collectors.go @@ -6,8 +6,8 @@ import ( openfgav1 "github.com/openfga/api/proto/openfga/v1" "github.com/grafana/grafana/pkg/infra/db" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) func teamMembershipCollector(store db.DB) legacyTupleCollector { diff --git a/pkg/services/accesscontrol/dualwrite/resource_reconciler.go b/pkg/services/accesscontrol/dualwrite/resource_reconciler.go index 2d8fe0553c2..b947ba343ff 100644 --- a/pkg/services/accesscontrol/dualwrite/resource_reconciler.go +++ b/pkg/services/accesscontrol/dualwrite/resource_reconciler.go @@ -7,8 +7,8 @@ import ( "github.com/grafana/authlib/claims" openfgav1 "github.com/openfga/api/proto/openfga/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) // legacyTupleCollector collects tuples groupd by object and tupleKey diff --git a/pkg/services/authz/zanzana/proto/v1/buf.gen.yaml b/pkg/services/authz/proto/v1/buf.gen.yaml similarity index 65% rename from pkg/services/authz/zanzana/proto/v1/buf.gen.yaml rename to pkg/services/authz/proto/v1/buf.gen.yaml index f75391ff05c..60ec6d91f4e 100644 --- a/pkg/services/authz/zanzana/proto/v1/buf.gen.yaml +++ b/pkg/services/authz/proto/v1/buf.gen.yaml @@ -1,10 +1,10 @@ version: v1 plugins: - plugin: go - out: pkg/services/authz/zanzana/proto/v1 + out: pkg/services/authz/proto/v1 opt: paths=source_relative - plugin: go-grpc - out: pkg/services/authz/zanzana/proto/v1 + out: pkg/services/authz/proto/v1 opt: - paths=source_relative - require_unimplemented_servers=false diff --git a/pkg/services/authz/zanzana/proto/v1/buf.yaml b/pkg/services/authz/proto/v1/buf.yaml similarity index 100% rename from pkg/services/authz/zanzana/proto/v1/buf.yaml rename to pkg/services/authz/proto/v1/buf.yaml diff --git a/pkg/services/authz/zanzana/proto/v1/extention.pb.go b/pkg/services/authz/proto/v1/extention.pb.go similarity index 100% rename from pkg/services/authz/zanzana/proto/v1/extention.pb.go rename to pkg/services/authz/proto/v1/extention.pb.go diff --git a/pkg/services/authz/zanzana/proto/v1/extention.proto b/pkg/services/authz/proto/v1/extention.proto similarity index 100% rename from pkg/services/authz/zanzana/proto/v1/extention.proto rename to pkg/services/authz/proto/v1/extention.proto diff --git a/pkg/services/authz/zanzana/proto/v1/extention_grpc.pb.go b/pkg/services/authz/proto/v1/extention_grpc.pb.go similarity index 100% rename from pkg/services/authz/zanzana/proto/v1/extention_grpc.pb.go rename to pkg/services/authz/proto/v1/extention_grpc.pb.go diff --git a/pkg/services/authz/zanzana.go b/pkg/services/authz/zanzana.go index 7599d900408..45620c6e68f 100644 --- a/pkg/services/authz/zanzana.go +++ b/pkg/services/authz/zanzana.go @@ -16,9 +16,9 @@ import ( "github.com/grafana/grafana/pkg/infra/db" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/tracing" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana" zclient "github.com/grafana/grafana/pkg/services/authz/zanzana/client" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" zserver "github.com/grafana/grafana/pkg/services/authz/zanzana/server" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/grpcserver" diff --git a/pkg/services/authz/zanzana/client.go b/pkg/services/authz/zanzana/client.go index facfdf00c1d..9bb9fca456e 100644 --- a/pkg/services/authz/zanzana/client.go +++ b/pkg/services/authz/zanzana/client.go @@ -6,8 +6,8 @@ import ( "github.com/grafana/authlib/authz" "github.com/grafana/authlib/claims" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana/client" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) // Client is a wrapper around [openfgav1.OpenFGAServiceClient] diff --git a/pkg/services/authz/zanzana/client/client.go b/pkg/services/authz/zanzana/client/client.go index 9a519345509..01e7ed8e60b 100644 --- a/pkg/services/authz/zanzana/client/client.go +++ b/pkg/services/authz/zanzana/client/client.go @@ -13,7 +13,7 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/infra/log" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/setting" ) diff --git a/pkg/services/authz/zanzana/client/noop.go b/pkg/services/authz/zanzana/client/noop.go index d71968c7180..40d12ac0496 100644 --- a/pkg/services/authz/zanzana/client/noop.go +++ b/pkg/services/authz/zanzana/client/noop.go @@ -6,7 +6,7 @@ import ( "github.com/grafana/authlib/authz" "github.com/grafana/authlib/claims" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" ) var _ authz.AccessClient = (*NoopClient)(nil) diff --git a/pkg/services/authz/zanzana/common/tuple.go b/pkg/services/authz/zanzana/common/tuple.go index 824a332871f..c09007a6ae9 100644 --- a/pkg/services/authz/zanzana/common/tuple.go +++ b/pkg/services/authz/zanzana/common/tuple.go @@ -6,7 +6,7 @@ import ( openfgav1 "github.com/openfga/api/proto/openfga/v1" "google.golang.org/protobuf/types/known/structpb" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" ) const ( diff --git a/pkg/services/authz/zanzana/server/server.go b/pkg/services/authz/zanzana/server/server.go index 08de91b2d96..039af673649 100644 --- a/pkg/services/authz/zanzana/server/server.go +++ b/pkg/services/authz/zanzana/server/server.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/otel" "github.com/grafana/grafana/pkg/infra/log" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/setting" ) diff --git a/pkg/services/authz/zanzana/server/server_list.go b/pkg/services/authz/zanzana/server/server_list.go index 448624abfed..c2ea35e4020 100644 --- a/pkg/services/authz/zanzana/server/server_list.go +++ b/pkg/services/authz/zanzana/server/server_list.go @@ -8,8 +8,8 @@ import ( openfgav1 "github.com/openfga/api/proto/openfga/v1" "google.golang.org/protobuf/types/known/structpb" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana/common" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) func (s *Server) List(ctx context.Context, r *authzextv1.ListRequest) (*authzextv1.ListResponse, error) { diff --git a/pkg/services/authz/zanzana/server/server_list_test.go b/pkg/services/authz/zanzana/server/server_list_test.go index 6df11266c1a..520616b5736 100644 --- a/pkg/services/authz/zanzana/server/server_list_test.go +++ b/pkg/services/authz/zanzana/server/server_list_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/grafana/grafana/pkg/apimachinery/utils" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" ) func testList(t *testing.T, server *Server) { diff --git a/pkg/services/authz/zanzana/server/server_read.go b/pkg/services/authz/zanzana/server/server_read.go index dc44748d9b6..4c0d238d401 100644 --- a/pkg/services/authz/zanzana/server/server_read.go +++ b/pkg/services/authz/zanzana/server/server_read.go @@ -5,8 +5,8 @@ import ( openfgav1 "github.com/openfga/api/proto/openfga/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana/common" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) func (s *Server) Read(ctx context.Context, req *authzextv1.ReadRequest) (*authzextv1.ReadResponse, error) { diff --git a/pkg/services/authz/zanzana/server/server_write.go b/pkg/services/authz/zanzana/server/server_write.go index c2b19bce4fc..38c36fdebf6 100644 --- a/pkg/services/authz/zanzana/server/server_write.go +++ b/pkg/services/authz/zanzana/server/server_write.go @@ -5,8 +5,8 @@ import ( openfgav1 "github.com/openfga/api/proto/openfga/v1" + authzextv1 "github.com/grafana/grafana/pkg/services/authz/proto/v1" "github.com/grafana/grafana/pkg/services/authz/zanzana/common" - authzextv1 "github.com/grafana/grafana/pkg/services/authz/zanzana/proto/v1" ) func (s *Server) Write(ctx context.Context, req *authzextv1.WriteRequest) (*authzextv1.WriteResponse, error) {