mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-28 04:36:11 +01:00
fe5adbbbdc
This contains two backwards-compatible changes: * in the lfs http_client, the number of lfs oids requested per batch is loaded from lfs_client#BATCH_SIZE and defaulted to the previous value of 20 * in the lfs server/service, the max number of lfs oids allowed in a batch api request is loaded from server#LFS_MAX_BATCH_SIZE and defaults to 'nil' which equates to the previous behavior of 'infinite' This fixes #32306 --------- Signed-off-by: Royce Remer <royceremer@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit c60e4dc1095ef90a790582cacfad27c972637bb2) Conflicts: - services/lfs/server.go Conflict due to our Quota implementation. Resolved by manually adding the change after the quota check.
119 lines
2.7 KiB
Go
119 lines
2.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func Test_getStorageInheritNameSectionTypeForLFS(t *testing.T) {
|
|
iniStr := `
|
|
[storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", LFS.Storage.Type)
|
|
assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
|
|
|
|
iniStr = `
|
|
[server]
|
|
LFS_CONTENT_PATH = path_ignored
|
|
[lfs]
|
|
PATH = path_used
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "local", LFS.Storage.Type)
|
|
assert.Contains(t, LFS.Storage.Path, "path_used")
|
|
|
|
iniStr = `
|
|
[server]
|
|
LFS_CONTENT_PATH = deprecatedpath
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "local", LFS.Storage.Type)
|
|
assert.Contains(t, LFS.Storage.Path, "deprecatedpath")
|
|
|
|
iniStr = `
|
|
[storage.lfs]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", LFS.Storage.Type)
|
|
assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
|
|
|
|
iniStr = `
|
|
[lfs]
|
|
STORAGE_TYPE = my_minio
|
|
|
|
[storage.my_minio]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", LFS.Storage.Type)
|
|
assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
|
|
|
|
iniStr = `
|
|
[lfs]
|
|
STORAGE_TYPE = my_minio
|
|
MINIO_BASE_PATH = my_lfs/
|
|
|
|
[storage.my_minio]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", LFS.Storage.Type)
|
|
assert.EqualValues(t, "my_lfs/", LFS.Storage.MinioConfig.BasePath)
|
|
}
|
|
|
|
func Test_LFSStorage1(t *testing.T) {
|
|
iniStr := `
|
|
[storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, loadLFSFrom(cfg))
|
|
assert.EqualValues(t, "minio", LFS.Storage.Type)
|
|
assert.EqualValues(t, "gitea", LFS.Storage.MinioConfig.Bucket)
|
|
assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
|
|
}
|
|
|
|
func Test_LFSClientServerConfigs(t *testing.T) {
|
|
iniStr := `
|
|
[server]
|
|
LFS_MAX_BATCH_SIZE = 100
|
|
[lfs_client]
|
|
# will default to 20
|
|
BATCH_SIZE = 0
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadLFSFrom(cfg))
|
|
assert.EqualValues(t, 100, LFS.MaxBatchSize)
|
|
assert.EqualValues(t, 20, LFSClient.BatchSize)
|
|
}
|