From ef57a3de4100c82b1b7c214a324dc43409166453 Mon Sep 17 00:00:00 2001 From: Marco Ardizzone Date: Mon, 28 Apr 2025 17:15:23 +0200 Subject: [PATCH] feat: Use v2beta package (#9452) --- internal/api/grpc/instance/v2/converter.go | 2 +- internal/api/grpc/instance/v2/converter_test.go | 2 +- internal/api/grpc/instance/v2/instance.go | 2 +- internal/api/grpc/instance/v2/query.go | 2 +- internal/api/grpc/instance/v2/server.go | 2 +- internal/integration/client.go | 2 ++ proto/zitadel/instance/{v2 => v2beta}/instance.proto | 4 ++-- .../instance/{v2 => v2beta}/instance_service.proto | 8 ++++---- 8 files changed, 13 insertions(+), 11 deletions(-) rename proto/zitadel/instance/{v2 => v2beta}/instance.proto (97%) rename proto/zitadel/instance/{v2 => v2beta}/instance_service.proto (98%) diff --git a/internal/api/grpc/instance/v2/converter.go b/internal/api/grpc/instance/v2/converter.go index d5309832aec..ad5486d52ba 100644 --- a/internal/api/grpc/instance/v2/converter.go +++ b/internal/api/grpc/instance/v2/converter.go @@ -14,7 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/zerrors" - "github.com/zitadel/zitadel/pkg/grpc/instance/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" "golang.org/x/text/language" ) diff --git a/internal/api/grpc/instance/v2/converter_test.go b/internal/api/grpc/instance/v2/converter_test.go index 0678ba64011..bf3222cf2e5 100644 --- a/internal/api/grpc/instance/v2/converter_test.go +++ b/internal/api/grpc/instance/v2/converter_test.go @@ -12,7 +12,7 @@ import ( "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/zerrors" filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta" - "github.com/zitadel/zitadel/pkg/grpc/instance/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" "github.com/zitadel/zitadel/pkg/grpc/object/v2" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/api/grpc/instance/v2/instance.go b/internal/api/grpc/instance/v2/instance.go index 9ddf27d5a61..bcd091fb6e1 100644 --- a/internal/api/grpc/instance/v2/instance.go +++ b/internal/api/grpc/instance/v2/instance.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/zerrors" - "github.com/zitadel/zitadel/pkg/grpc/instance/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" ) func (s *Server) CreateInstance(ctx context.Context, req *instance.CreateInstanceRequest) (*instance.CreateInstanceResponse, error) { diff --git a/internal/api/grpc/instance/v2/query.go b/internal/api/grpc/instance/v2/query.go index b04968b7cb3..bfec60ae1d1 100644 --- a/internal/api/grpc/instance/v2/query.go +++ b/internal/api/grpc/instance/v2/query.go @@ -4,7 +4,7 @@ import ( "context" filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta" - "github.com/zitadel/zitadel/pkg/grpc/instance/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/internal/api/grpc/instance/v2/server.go b/internal/api/grpc/instance/v2/server.go index 3d77f47bc3d..c2d153de34d 100644 --- a/internal/api/grpc/instance/v2/server.go +++ b/internal/api/grpc/instance/v2/server.go @@ -9,7 +9,7 @@ import ( "github.com/zitadel/zitadel/internal/config/systemdefaults" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/query" - "github.com/zitadel/zitadel/pkg/grpc/instance/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" ) var _ instance.InstanceServiceServer = (*Server)(nil) diff --git a/internal/integration/client.go b/internal/integration/client.go index 2cb8fa36414..e34febd86c2 100644 --- a/internal/integration/client.go +++ b/internal/integration/client.go @@ -26,6 +26,7 @@ import ( feature_v2beta "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta" "github.com/zitadel/zitadel/pkg/grpc/idp" idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp/v2" + instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta" mgmt "github.com/zitadel/zitadel/pkg/grpc/management" "github.com/zitadel/zitadel/pkg/grpc/object/v2" object_v3alpha "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha" @@ -70,6 +71,7 @@ type Client struct { UserV3Alpha user_v3alpha.ZITADELUsersClient SAMLv2 saml_pb.SAMLServiceClient SCIM *scim.Client + InstanceV2Beta instance.InstanceServiceClient } func newClient(ctx context.Context, target string) (*Client, error) { diff --git a/proto/zitadel/instance/v2/instance.proto b/proto/zitadel/instance/v2beta/instance.proto similarity index 97% rename from proto/zitadel/instance/v2/instance.proto rename to proto/zitadel/instance/v2beta/instance.proto index ac58f834f16..b16ddd579a0 100644 --- a/proto/zitadel/instance/v2/instance.proto +++ b/proto/zitadel/instance/v2beta/instance.proto @@ -4,9 +4,9 @@ import "protoc-gen-openapiv2/options/annotations.proto"; import "zitadel/object/v2/object.proto"; import "validate/validate.proto"; -package zitadel.instance.v2; +package zitadel.instance.v2beta; -option go_package = "github.com/zitadel/zitadel/pkg/grpc/instance/v2;instance"; +option go_package = "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta;instance"; message Instance { string id = 1 [ diff --git a/proto/zitadel/instance/v2/instance_service.proto b/proto/zitadel/instance/v2beta/instance_service.proto similarity index 98% rename from proto/zitadel/instance/v2/instance_service.proto rename to proto/zitadel/instance/v2beta/instance_service.proto index 1b098b2ecc5..1cc24b41916 100644 --- a/proto/zitadel/instance/v2/instance_service.proto +++ b/proto/zitadel/instance/v2beta/instance_service.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package zitadel.instance.v2; +package zitadel.instance.v2beta; import "validate/validate.proto"; import "zitadel/object/v2/object.proto"; -import "zitadel/instance/v2/instance.proto"; +import "zitadel/instance/v2beta/instance.proto"; import "zitadel/filter/v2beta/filter.proto"; import "zitadel/authn/v2beta/authn.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; @@ -14,7 +14,7 @@ import "google/api/field_behavior.proto"; import "google/protobuf/timestamp.proto"; import "zitadel/protoc_gen_zitadel/v2/options.proto"; -option go_package = "github.com/zitadel/zitadel/pkg/grpc/instance/v2;instance"; +option go_package = "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta;instance"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { @@ -187,7 +187,7 @@ message DeleteInstanceResponse { } message GetInstanceResponse { - zitadel.instance.v2.Instance instance = 1; + zitadel.instance.v2beta.Instance instance = 1; } message UpdateInstanceRequest {