TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 05:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next-rc' into next

Browse Source 
# Conflicts:
#	build/workflow.Dockerfile
#	cmd/setup/config.go
#	cmd/setup/setup.go
#	console/package.json
#	console/src/app/services/grpc.service.ts
#	console/yarn.lock
#	deploy/knative/cockroachdb-statefulset-single-node.yaml
#	e2e/config/localhost/docker-compose.yaml
#	go.mod
#	go.sum
#	internal/command/oidc_session_test.go
#	internal/query/idp_template_test.go
This commit is contained in:
Livio Spring
2025-04-30 16:41:49 +02:00
parent 9f312b907d cf3f02237d
commit 483a2c1122
771 changed files with 27519 additions and 12039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/static/database/crdb.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/zitadel/zitadel/internal/zerrors"
)
var _ static.Storage = (*crdbStorage)(nil)
var _ static.Storage = (*storage)(nil)
const (
assetsTable = "system.assets"
@@ -29,15 +29,15 @@ const (
AssetColUpdatedAt = "updated_at"
)
type crdbStorage struct {
type storage struct {
client *sql.DB
}
func NewStorage(client *sql.DB, _ map[string]interface{}) (static.Storage, error) {
return &crdbStorage{client: client}, nil
return &storage{client: client}, nil
}
func (c *crdbStorage) PutObject(ctx context.Context, instanceID, location, resourceOwner, name, contentType string, objectType static.ObjectType, object io.Reader, objectSize int64) (*static.Asset, error) {
func (c *storage) PutObject(ctx context.Context, instanceID, location, resourceOwner, name, contentType string, objectType static.ObjectType, object io.Reader, objectSize int64) (*static.Asset, error) {
data, err := io.ReadAll(object)
if err != nil {
return nil, zerrors.ThrowInternal(err, "DATAB-Dfwvq", "Errors.Internal")
@@ -71,7 +71,7 @@ func (c *crdbStorage) PutObject(ctx context.Context, instanceID, location, resou
}, nil
}
func (c *crdbStorage) GetObject(ctx context.Context, instanceID, resourceOwner, name string) ([]byte, func() (*static.Asset, error), error) {
func (c *storage) GetObject(ctx context.Context, instanceID, resourceOwner, name string) ([]byte, func() (*static.Asset, error), error) {
query, args, err := squirrel.Select(AssetColData, AssetColContentType, AssetColHash, AssetColUpdatedAt).
From(assetsTable).
Where(squirrel.Eq{
@@ -111,7 +111,7 @@ func (c *crdbStorage) GetObject(ctx context.Context, instanceID, resourceOwner,
nil
}
func (c *crdbStorage) GetObjectInfo(ctx context.Context, instanceID, resourceOwner, name string) (*static.Asset, error) {
func (c *storage) GetObjectInfo(ctx context.Context, instanceID, resourceOwner, name string) (*static.Asset, error) {
query, args, err := squirrel.Select(AssetColContentType, AssetColLocation, "length("+AssetColData+")", AssetColHash, AssetColUpdatedAt).
From(assetsTable).
Where(squirrel.Eq{
@@ -143,7 +143,7 @@ func (c *crdbStorage) GetObjectInfo(ctx context.Context, instanceID, resourceOwn
return asset, nil
}
func (c *crdbStorage) RemoveObject(ctx context.Context, instanceID, resourceOwner, name string) error {
func (c *storage) RemoveObject(ctx context.Context, instanceID, resourceOwner, name string) error {
stmt, args, err := squirrel.Delete(assetsTable).
Where(squirrel.Eq{
AssetColInstanceID: instanceID,
@@ -162,7 +162,7 @@ func (c *crdbStorage) RemoveObject(ctx context.Context, instanceID, resourceOwne
return nil
}
func (c *crdbStorage) RemoveObjects(ctx context.Context, instanceID, resourceOwner string, objectType static.ObjectType) error {
func (c *storage) RemoveObjects(ctx context.Context, instanceID, resourceOwner string, objectType static.ObjectType) error {
stmt, args, err := squirrel.Delete(assetsTable).
Where(squirrel.Eq{
AssetColInstanceID: instanceID,
@@ -181,7 +181,7 @@ func (c *crdbStorage) RemoveObjects(ctx context.Context, instanceID, resourceOwn
return nil
}
func (c *crdbStorage) RemoveInstanceObjects(ctx context.Context, instanceID string) error {
func (c *storage) RemoveInstanceObjects(ctx context.Context, instanceID string) error {
stmt, args, err := squirrel.Delete(assetsTable).
Where(squirrel.Eq{
AssetColInstanceID: instanceID,

16
internal/static/database/crdb_test.go
View File

@@ -40,7 +40,7 @@ const (
" WHERE instance_id = $1"
)
func Test_crdbStorage_CreateObject(t *testing.T) {
func Test_dbStorage_CreateObject(t *testing.T) {
type fields struct {
client db
}
@@ -112,7 +112,7 @@ func Test_crdbStorage_CreateObject(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &crdbStorage{
c := &storage{
client: tt.fields.client.db,
}
got, err := c.PutObject(tt.args.ctx, tt.args.instanceID, tt.args.location, tt.args.resourceOwner, tt.args.name, tt.args.contentType, tt.args.objectType, tt.args.data, tt.args.objectSize)
@@ -127,7 +127,7 @@ func Test_crdbStorage_CreateObject(t *testing.T) {
}
}
func Test_crdbStorage_RemoveObject(t *testing.T) {
func Test_dbStorage_RemoveObject(t *testing.T) {
type fields struct {
client db
}
@@ -166,7 +166,7 @@ func Test_crdbStorage_RemoveObject(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &crdbStorage{
c := &storage{
client: tt.fields.client.db,
}
err := c.RemoveObject(tt.args.ctx, tt.args.instanceID, tt.args.resourceOwner, tt.args.name)
@@ -178,7 +178,7 @@ func Test_crdbStorage_RemoveObject(t *testing.T) {
}
}
func Test_crdbStorage_RemoveObjects(t *testing.T) {
func Test_dbStorage_RemoveObjects(t *testing.T) {
type fields struct {
client db
}
@@ -216,7 +216,7 @@ func Test_crdbStorage_RemoveObjects(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &crdbStorage{
c := &storage{
client: tt.fields.client.db,
}
err := c.RemoveObjects(tt.args.ctx, tt.args.instanceID, tt.args.resourceOwner, tt.args.objectType)
@@ -227,7 +227,7 @@ func Test_crdbStorage_RemoveObjects(t *testing.T) {
})
}
}
func Test_crdbStorage_RemoveInstanceObjects(t *testing.T) {
func Test_dbStorage_RemoveInstanceObjects(t *testing.T) {
type fields struct {
client db
}
@@ -260,7 +260,7 @@ func Test_crdbStorage_RemoveInstanceObjects(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &crdbStorage{
c := &storage{
client: tt.fields.client.db,
}
err := c.RemoveInstanceObjects(tt.args.ctx, tt.args.instanceID)

1413
internal/static/i18n/ro.yaml Normal file
View File

File diff suppressed because it is too large Load Diff