mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-19 14:12:52 +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]>
200 lines
6.7 KiB
Go
200 lines
6.7 KiB
Go
//go:build integration
|
|
|
|
package instance_test
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/muhlemmer/gu"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
"github.com/zitadel/zitadel/internal/integration"
|
|
"github.com/zitadel/zitadel/pkg/grpc/feature/v2"
|
|
instance "github.com/zitadel/zitadel/pkg/grpc/instance/v2beta"
|
|
)
|
|
|
|
func TestDeleteInstace(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Given
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
|
|
defer cancel()
|
|
|
|
ctxWithSysAuthZ := integration.WithSystemAuthorization(ctx)
|
|
|
|
instEventStore := integration.NewInstance(ctxWithSysAuthZ)
|
|
|
|
instRelational := integration.NewInstance(ctxWithSysAuthZ)
|
|
integration.EnsureInstanceFeature(t, ctxWithSysAuthZ, instRelational, &feature.SetInstanceFeaturesRequest{EnableRelationalTables: gu.Ptr(true)}, func(tCollect *assert.CollectT, got *feature.GetInstanceFeaturesResponse) {
|
|
assert.True(tCollect, got.EnableRelationalTables.GetEnabled())
|
|
})
|
|
|
|
type instanceWithType struct {
|
|
instType string
|
|
instance *integration.Instance
|
|
}
|
|
instances := []instanceWithType{
|
|
{instType: "eventstore", instance: instEventStore},
|
|
{instType: "relational", instance: instRelational},
|
|
}
|
|
t.Cleanup(func() {
|
|
instRelational.Client.InstanceV2Beta.DeleteInstance(ctxWithSysAuthZ, &instance.DeleteInstanceRequest{InstanceId: instRelational.ID()})
|
|
instEventStore.Client.InstanceV2Beta.DeleteInstance(ctxWithSysAuthZ, &instance.DeleteInstanceRequest{InstanceId: instEventStore.ID()})
|
|
})
|
|
|
|
for _, inst := range instances {
|
|
tt := []struct {
|
|
testName string
|
|
inputRequest *instance.DeleteInstanceRequest
|
|
inputContext context.Context
|
|
expectedErrorMsg string
|
|
expectedErrorCode codes.Code
|
|
expectedInstanceID string
|
|
expectsNullTimestamp bool
|
|
}{
|
|
{
|
|
testName: "when invalid context should return unauthN error",
|
|
inputRequest: &instance.DeleteInstanceRequest{
|
|
InstanceId: " ",
|
|
},
|
|
inputContext: context.Background(),
|
|
expectedErrorCode: codes.Unauthenticated,
|
|
expectedErrorMsg: "auth header missing",
|
|
},
|
|
{
|
|
testName: "when instance not found should return no error",
|
|
inputRequest: &instance.DeleteInstanceRequest{
|
|
InstanceId: inst.instance.ID() + "invalid",
|
|
},
|
|
inputContext: ctxWithSysAuthZ,
|
|
expectsNullTimestamp: true,
|
|
},
|
|
{
|
|
testName: "when delete succeeds should return deletion date",
|
|
inputRequest: &instance.DeleteInstanceRequest{
|
|
InstanceId: inst.instance.ID(),
|
|
},
|
|
inputContext: ctxWithSysAuthZ,
|
|
expectedInstanceID: inst.instance.ID(),
|
|
},
|
|
}
|
|
for _, tc := range tt {
|
|
t.Run(fmt.Sprintf("%s - %s", inst.instType, tc.testName), func(t *testing.T) {
|
|
// Test
|
|
res, err := inst.instance.Client.InstanceV2Beta.DeleteInstance(tc.inputContext, tc.inputRequest)
|
|
|
|
// Verify
|
|
assert.Equal(t, tc.expectedErrorCode, status.Code(err))
|
|
assert.Contains(t, status.Convert(err).Message(), tc.expectedErrorMsg)
|
|
if tc.expectedErrorMsg == "" {
|
|
require.NotNil(t, res)
|
|
require.Equal(t, tc.expectsNullTimestamp, res.GetDeletionDate() == nil)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestUpdateInstace(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Given
|
|
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
|
|
defer cancel()
|
|
|
|
ctxWithSysAuthZ := integration.WithSystemAuthorization(ctx)
|
|
|
|
instEventStore := integration.NewInstance(ctxWithSysAuthZ)
|
|
orgOwnerESCtx := instEventStore.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner)
|
|
|
|
instRelational := integration.NewInstance(ctxWithSysAuthZ)
|
|
integration.EnsureInstanceFeature(t, ctxWithSysAuthZ, instRelational, &feature.SetInstanceFeaturesRequest{EnableRelationalTables: gu.Ptr(true)}, func(tCollect *assert.CollectT, got *feature.GetInstanceFeaturesResponse) {
|
|
assert.True(tCollect, got.EnableRelationalTables.GetEnabled())
|
|
})
|
|
orgOwnerRelationalCtx := instRelational.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner)
|
|
|
|
instances := []struct {
|
|
instance *integration.Instance
|
|
ctx context.Context
|
|
}{
|
|
{instance: instEventStore, ctx: orgOwnerESCtx},
|
|
{instance: instRelational, ctx: orgOwnerRelationalCtx},
|
|
}
|
|
|
|
t.Cleanup(func() {
|
|
instEventStore.Client.InstanceV2Beta.DeleteInstance(ctxWithSysAuthZ, &instance.DeleteInstanceRequest{InstanceId: instEventStore.ID()})
|
|
instRelational.Client.InstanceV2Beta.DeleteInstance(ctxWithSysAuthZ, &instance.DeleteInstanceRequest{InstanceId: instRelational.ID()})
|
|
})
|
|
|
|
for i, inst := range instances {
|
|
tt := []struct {
|
|
testName string
|
|
inputRequest *instance.UpdateInstanceRequest
|
|
inputContext context.Context
|
|
expectedErrorMsg string
|
|
expectedErrorCode codes.Code
|
|
expectedNewName string
|
|
}{
|
|
{
|
|
testName: "when invalid context should return unauthN error",
|
|
inputRequest: &instance.UpdateInstanceRequest{
|
|
InstanceId: inst.instance.ID(),
|
|
InstanceName: " ",
|
|
},
|
|
inputContext: context.Background(),
|
|
expectedErrorCode: codes.Unauthenticated,
|
|
expectedErrorMsg: "auth header missing",
|
|
},
|
|
{
|
|
testName: "when unauthZ context should return unauthZ error",
|
|
inputRequest: &instance.UpdateInstanceRequest{
|
|
InstanceId: inst.instance.ID(),
|
|
InstanceName: " ",
|
|
},
|
|
inputContext: inst.ctx,
|
|
expectedErrorCode: codes.PermissionDenied,
|
|
expectedErrorMsg: "No matching permissions found (AUTH-5mWD2)",
|
|
},
|
|
{
|
|
testName: "when update succeeds should change instance name",
|
|
inputRequest: &instance.UpdateInstanceRequest{
|
|
InstanceId: inst.instance.ID(),
|
|
InstanceName: fmt.Sprintf("an-updated-name %d", i),
|
|
},
|
|
inputContext: ctxWithSysAuthZ,
|
|
expectedNewName: fmt.Sprintf("an-updated-name %d", i),
|
|
},
|
|
}
|
|
|
|
for _, tc := range tt {
|
|
t.Run(tc.testName, func(t *testing.T) {
|
|
// Test
|
|
res, err := inst.instance.Client.InstanceV2Beta.UpdateInstance(tc.inputContext, tc.inputRequest)
|
|
|
|
// Verify
|
|
assert.Equal(t, tc.expectedErrorCode, status.Code(err))
|
|
assert.Equal(t, tc.expectedErrorMsg, status.Convert(err).Message())
|
|
if tc.expectedErrorMsg == "" {
|
|
|
|
require.NotNil(t, res)
|
|
assert.NotEmpty(t, res.GetChangeDate())
|
|
|
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tc.inputContext, time.Minute)
|
|
require.EventuallyWithT(t, func(tt *assert.CollectT) {
|
|
retrievedInstance, err := inst.instance.Client.InstanceV2Beta.GetInstance(tc.inputContext, &instance.GetInstanceRequest{InstanceId: inst.instance.ID()})
|
|
require.Nil(tt, err)
|
|
assert.Equal(tt, tc.expectedNewName, retrievedInstance.GetInstance().GetName())
|
|
}, retryDuration, tick, "timeout waiting for expected execution result")
|
|
}
|
|
})
|
|
}
|
|
|
|
}
|
|
}
|