mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
# Which Problems Are Solved This PR implements the endpoints listed in https://github.com/zitadel/zitadel/issues/10444 . # How the Problems Are Solved The implementation follows the same pattern as the Instance one. The `Add` and `Remove` are implementing the `Commander` interface, while `List` Domains endpoints are implementing the `Querier` interace. The PR adds also some forgotten calls to the relational logic for the Instance API. The commits are identifiable by the label `instance:` prepended to them. This is the complete list: bafce01b0 , 6fe7257ab , e27bc9c34 , 8133ede73 , fde667953 , a3e1135ed , ee1a6f9c1 # Additional Context - Closes #10444 --------- Co-authored-by: Elio Bischof <[email protected]> Co-authored-by: Lebogang Phoshoko <[email protected]> Co-authored-by: Wim Van Laer <[email protected]> Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Gayathri Vijayan <[email protected]>
189 lines
6.8 KiB
Go
189 lines
6.8 KiB
Go
package instancev2
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/api/instance/v2/convert"
|
|
"github.com/zitadel/zitadel/backend/v3/domain"
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
|
filter_v2 "github.com/zitadel/zitadel/pkg/grpc/filter/v2"
|
|
filter_v2beta "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta"
|
|
instance_v2 "github.com/zitadel/zitadel/pkg/grpc/instance/v2"
|
|
instance_v2beta "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta"
|
|
)
|
|
|
|
// =================
|
|
// v2Beta endpoints
|
|
// =================
|
|
|
|
func DeleteInstanceBeta(ctx context.Context, request *connect.Request[instance_v2beta.DeleteInstanceRequest]) (*connect.Response[instance_v2beta.DeleteInstanceResponse], error) {
|
|
instanceDeleteCmd := domain.NewDeleteInstanceCommand(request.Msg.GetInstanceId())
|
|
|
|
err := domain.Invoke(ctx, instanceDeleteCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var deletionDate *timestamppb.Timestamp
|
|
if instanceDeleteCmd.DeleteTime != nil {
|
|
deletionDate = timestamppb.New(*instanceDeleteCmd.DeleteTime)
|
|
}
|
|
return &connect.Response[instance_v2beta.DeleteInstanceResponse]{
|
|
Msg: &instance_v2beta.DeleteInstanceResponse{
|
|
// TODO(IAM-Marco): Change this with the real update date when OrganizationRepo.Update()
|
|
// returns the timestamp
|
|
DeletionDate: deletionDate,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func GetInstanceBeta(ctx context.Context, request *connect.Request[instance_v2beta.GetInstanceRequest]) (*connect.Response[instance_v2beta.GetInstanceResponse], error) {
|
|
instanceGetCmd := domain.NewGetInstanceCommand(request.Msg.GetInstanceId())
|
|
|
|
err := domain.Invoke(ctx, instanceGetCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &connect.Response[instance_v2beta.GetInstanceResponse]{
|
|
Msg: &instance_v2beta.GetInstanceResponse{
|
|
Instance: convert.DomainInstanceModelToGRPCBetaResponse(instanceGetCmd.Result()),
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func UpdateInstanceBeta(ctx context.Context, request *connect.Request[instance_v2beta.UpdateInstanceRequest]) (*connect.Response[instance_v2beta.UpdateInstanceResponse], error) {
|
|
instanceUpdateCmd := domain.NewUpdateInstanceCommand(request.Msg.GetInstanceId(), request.Msg.GetInstanceName())
|
|
|
|
err := domain.Invoke(ctx, instanceUpdateCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &connect.Response[instance_v2beta.UpdateInstanceResponse]{
|
|
Msg: &instance_v2beta.UpdateInstanceResponse{
|
|
// TODO(IAM-Marco): Change this with the real update date when InstanceRepo.Update()
|
|
// returns the timestamp
|
|
ChangeDate: timestamppb.Now(),
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func ListInstancesBeta(ctx context.Context, request *connect.Request[instance_v2beta.ListInstancesRequest]) (*connect.Response[instance_v2beta.ListInstancesResponse], error) {
|
|
instancesListCmd := domain.NewListInstancesCommand(convert.ListInstancesBetaRequestToV2Request(request.Msg))
|
|
|
|
err := domain.Invoke(
|
|
ctx,
|
|
instancesListCmd,
|
|
domain.WithInstanceRepo(repository.InstanceRepository()),
|
|
domain.WithInstanceDomainRepo(repository.InstanceDomainRepository()),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
instances := instancesListCmd.Result()
|
|
return &connect.Response[instance_v2beta.ListInstancesResponse]{
|
|
Msg: &instance_v2beta.ListInstancesResponse{
|
|
Instances: convert.DomainInstanceListModelToGRPCBetaResponse(instances),
|
|
Pagination: &filter_v2beta.PaginationResponse{
|
|
// TODO(IAM-Marco): return correct value. Tracked in https://github.com/zitadel/zitadel/issues/10955
|
|
TotalResult: uint64(len(instances)),
|
|
AppliedLimit: uint64(request.Msg.GetPagination().GetLimit()),
|
|
},
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
// =================
|
|
// v2 endpoints
|
|
// =================
|
|
|
|
func DeleteInstance(ctx context.Context, request *connect.Request[instance_v2.DeleteInstanceRequest]) (*connect.Response[instance_v2.DeleteInstanceResponse], error) {
|
|
instanceDeleteCmd := domain.NewDeleteInstanceCommand(request.Msg.GetInstanceId())
|
|
|
|
err := domain.Invoke(ctx, instanceDeleteCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var deletionDate *timestamppb.Timestamp
|
|
if instanceDeleteCmd.DeleteTime != nil {
|
|
deletionDate = timestamppb.New(*instanceDeleteCmd.DeleteTime)
|
|
}
|
|
return &connect.Response[instance_v2.DeleteInstanceResponse]{
|
|
Msg: &instance_v2.DeleteInstanceResponse{
|
|
// TODO(IAM-Marco): Change this with the real update date when OrganizationRepo.Update()
|
|
// returns the timestamp
|
|
DeletionDate: deletionDate,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func GetInstance(ctx context.Context, request *connect.Request[instance_v2.GetInstanceRequest]) (*connect.Response[instance_v2.GetInstanceResponse], error) {
|
|
instanceGetCmd := domain.NewGetInstanceCommand(request.Msg.GetInstanceId())
|
|
|
|
err := domain.Invoke(ctx, instanceGetCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &connect.Response[instance_v2.GetInstanceResponse]{
|
|
Msg: &instance_v2.GetInstanceResponse{
|
|
Instance: convert.DomainInstanceModelToGRPCResponse(instanceGetCmd.Result()),
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func UpdateInstance(ctx context.Context, request *connect.Request[instance_v2.UpdateInstanceRequest]) (*connect.Response[instance_v2.UpdateInstanceResponse], error) {
|
|
instanceUpdateCmd := domain.NewUpdateInstanceCommand(request.Msg.GetInstanceId(), request.Msg.GetInstanceName())
|
|
|
|
err := domain.Invoke(ctx, instanceUpdateCmd, domain.WithInstanceRepo(repository.InstanceRepository()))
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &connect.Response[instance_v2.UpdateInstanceResponse]{
|
|
Msg: &instance_v2.UpdateInstanceResponse{
|
|
// TODO(IAM-Marco): Change this with the real update date when InstanceRepo.Update()
|
|
// returns the timestamp
|
|
ChangeDate: timestamppb.Now(),
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func ListInstances(ctx context.Context, request *connect.Request[instance_v2.ListInstancesRequest]) (*connect.Response[instance_v2.ListInstancesResponse], error) {
|
|
instancesListCmd := domain.NewListInstancesCommand(request.Msg)
|
|
|
|
err := domain.Invoke(
|
|
ctx,
|
|
instancesListCmd,
|
|
domain.WithInstanceRepo(repository.InstanceRepository()),
|
|
domain.WithInstanceDomainRepo(repository.InstanceDomainRepository()),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
instances := instancesListCmd.Result()
|
|
return &connect.Response[instance_v2.ListInstancesResponse]{
|
|
Msg: &instance_v2.ListInstancesResponse{
|
|
Instances: convert.DomainInstanceListModelToGRPCResponse(instances),
|
|
Pagination: &filter_v2.PaginationResponse{
|
|
// TODO(IAM-Marco): return correct value. Tracked in https://github.com/zitadel/zitadel/issues/10955
|
|
TotalResult: uint64(len(instances)),
|
|
AppliedLimit: uint64(request.Msg.GetPagination().GetLimit()),
|
|
},
|
|
},
|
|
}, nil
|
|
}
|