TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-07 07:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use v2beta package (#9452)

Browse Source
This commit is contained in:
Marco Ardizzone
2025-04-28 17:15:23 +02:00
parent 784fe04646
commit ef57a3de41
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/instance/v2/converter.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/query"
"github.com/zitadel/zitadel/internal/zerrors" "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" "golang.org/x/text/language"
) )

2
internal/api/grpc/instance/v2/converter_test.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/query"
"github.com/zitadel/zitadel/internal/zerrors" "github.com/zitadel/zitadel/internal/zerrors"
filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta" 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" "github.com/zitadel/zitadel/pkg/grpc/object/v2"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )

2
internal/api/grpc/instance/v2/instance.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/api/grpc/object/v2"
"github.com/zitadel/zitadel/internal/zerrors" "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) { func (s *Server) CreateInstance(ctx context.Context, req *instance.CreateInstanceRequest) (*instance.CreateInstanceResponse, error) {

2
internal/api/grpc/instance/v2/query.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta" 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" "google.golang.org/protobuf/types/known/emptypb"
) )

2
internal/api/grpc/instance/v2/server.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/zitadel/zitadel/internal/config/systemdefaults" "github.com/zitadel/zitadel/internal/config/systemdefaults"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/query" "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) var _ instance.InstanceServiceServer = (*Server)(nil)

2
internal/integration/client.go
View File

@@ -26,6 +26,7 @@ import (
feature_v2beta "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta" feature_v2beta "github.com/zitadel/zitadel/pkg/grpc/feature/v2beta"
"github.com/zitadel/zitadel/pkg/grpc/idp" "github.com/zitadel/zitadel/pkg/grpc/idp"
idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp/v2" 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" mgmt "github.com/zitadel/zitadel/pkg/grpc/management"
"github.com/zitadel/zitadel/pkg/grpc/object/v2" "github.com/zitadel/zitadel/pkg/grpc/object/v2"
object_v3alpha "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha" object_v3alpha "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha"
@@ -70,6 +71,7 @@ type Client struct {
UserV3Alpha user_v3alpha.ZITADELUsersClient UserV3Alpha user_v3alpha.ZITADELUsersClient
SAMLv2 saml_pb.SAMLServiceClient SAMLv2 saml_pb.SAMLServiceClient
SCIM *scim.Client SCIM *scim.Client
InstanceV2Beta instance.InstanceServiceClient
} }
func newClient(ctx context.Context, target string) (*Client, error) { func newClient(ctx context.Context, target string) (*Client, error) {

4
proto/zitadel/instance/v2/instance.proto → proto/zitadel/instance/v2beta/instance.proto
View File

@@ -4,9 +4,9 @@ import "protoc-gen-openapiv2/options/annotations.proto";
import "zitadel/object/v2/object.proto"; import "zitadel/object/v2/object.proto";
import "validate/validate.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 { message Instance {
string id = 1 [ string id = 1 [

8
proto/zitadel/instance/v2/instance_service.proto → proto/zitadel/instance/v2beta/instance_service.proto
View File

@@ -1,10 +1,10 @@
syntax = "proto3"; syntax = "proto3";
package zitadel.instance.v2; package zitadel.instance.v2beta;
import "validate/validate.proto"; import "validate/validate.proto";
import "zitadel/object/v2/object.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/filter/v2beta/filter.proto";
import "zitadel/authn/v2beta/authn.proto"; import "zitadel/authn/v2beta/authn.proto";
import "protoc-gen-openapiv2/options/annotations.proto"; import "protoc-gen-openapiv2/options/annotations.proto";
@@ -14,7 +14,7 @@ import "google/api/field_behavior.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "zitadel/protoc_gen_zitadel/v2/options.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) = { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: { info: {
@@ -187,7 +187,7 @@ message DeleteInstanceResponse {
} }
message GetInstanceResponse { message GetInstanceResponse {
zitadel.instance.v2.Instance instance = 1; zitadel.instance.v2beta.Instance instance = 1;
} }
message UpdateInstanceRequest { message UpdateInstanceRequest {