mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 02:46:04 +01:00 
			
		
		
		
	Fix all possible setting error related storages and added some tests (#23911)
Follow up #22405 Fix #20703 This PR rewrites storage configuration read sequences with some breaks and tests. It becomes more strict than before and also fixed some inherit problems. - Move storage's MinioConfig struct into setting, so after the configuration loading, the values will be stored into the struct but not still on some section. - All storages configurations should be stored on one section, configuration items cannot be overrided by multiple sections. The prioioty of configuration is `[attachment]` > `[storage.attachments]` | `[storage.customized]` > `[storage]` > `default` - For extra override configuration items, currently are `SERVE_DIRECT`, `MINIO_BASE_PATH`, `MINIO_BUCKET`, which could be configured in another section. The prioioty of the override configuration is `[attachment]` > `[storage.attachments]` > `default`. - Add more tests for storages configurations. - Update the storage documentations. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -29,3 +29,170 @@ func TestMustBytes(t *testing.T) { | ||||
| 	assert.EqualValues(t, 1782579, test("1.7mib")) | ||||
| 	assert.EqualValues(t, -1, test("1 yib")) // too large | ||||
| } | ||||
|  | ||||
| func Test_getStorageInheritNameSectionTypeForPackages(t *testing.T) { | ||||
| 	// packages storage inherits from storage if nothing configured | ||||
| 	iniStr := ` | ||||
| [storage] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err := NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", Packages.Storage.Type) | ||||
| 	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// we can also configure packages storage directly | ||||
| 	iniStr = ` | ||||
| [storage.packages] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", Packages.Storage.Type) | ||||
| 	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// or we can indicate the storage type in the packages section | ||||
| 	iniStr = ` | ||||
| [packages] | ||||
| STORAGE_TYPE = my_minio | ||||
|  | ||||
| [storage.my_minio] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", Packages.Storage.Type) | ||||
| 	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// or we can indicate the storage type  and minio base path in the packages section | ||||
| 	iniStr = ` | ||||
| [packages] | ||||
| STORAGE_TYPE = my_minio | ||||
| MINIO_BASE_PATH = my_packages/ | ||||
|  | ||||
| [storage.my_minio] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", Packages.Storage.Type) | ||||
| 	assert.EqualValues(t, "my_packages/", Packages.Storage.MinioConfig.BasePath) | ||||
| } | ||||
|  | ||||
| func Test_PackageStorage1(t *testing.T) { | ||||
| 	iniStr := ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [packages] | ||||
| MINIO_BASE_PATH = packages/ | ||||
| SERVE_DIRECT = true | ||||
| [storage] | ||||
| STORAGE_TYPE            = minio | ||||
| MINIO_ENDPOINT          = s3.my-domain.net | ||||
| MINIO_BUCKET            = gitea | ||||
| MINIO_LOCATION          = homenet | ||||
| MINIO_USE_SSL           = true | ||||
| MINIO_ACCESS_KEY_ID     = correct_key | ||||
| MINIO_SECRET_ACCESS_KEY = correct_key | ||||
| ` | ||||
| 	cfg, err := NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
|  | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
| 	storage := Packages.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
| 	assert.EqualValues(t, "packages/", storage.MinioConfig.BasePath) | ||||
| 	assert.True(t, storage.MinioConfig.ServeDirect) | ||||
| } | ||||
|  | ||||
| func Test_PackageStorage2(t *testing.T) { | ||||
| 	iniStr := ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [storage.packages] | ||||
| MINIO_BASE_PATH = packages/ | ||||
| SERVE_DIRECT = true | ||||
| [storage] | ||||
| STORAGE_TYPE            = minio | ||||
| MINIO_ENDPOINT          = s3.my-domain.net | ||||
| MINIO_BUCKET            = gitea | ||||
| MINIO_LOCATION          = homenet | ||||
| MINIO_USE_SSL           = true | ||||
| MINIO_ACCESS_KEY_ID     = correct_key | ||||
| MINIO_SECRET_ACCESS_KEY = correct_key | ||||
| ` | ||||
| 	cfg, err := NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
|  | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
| 	storage := Packages.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
| 	assert.EqualValues(t, "packages/", storage.MinioConfig.BasePath) | ||||
| 	assert.True(t, storage.MinioConfig.ServeDirect) | ||||
| } | ||||
|  | ||||
| func Test_PackageStorage3(t *testing.T) { | ||||
| 	iniStr := ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [packages] | ||||
| STORAGE_TYPE            = my_cfg | ||||
| MINIO_BASE_PATH = my_packages/ | ||||
| SERVE_DIRECT = true | ||||
| [storage.my_cfg] | ||||
| STORAGE_TYPE            = minio | ||||
| MINIO_ENDPOINT          = s3.my-domain.net | ||||
| MINIO_BUCKET            = gitea | ||||
| MINIO_LOCATION          = homenet | ||||
| MINIO_USE_SSL           = true | ||||
| MINIO_ACCESS_KEY_ID     = correct_key | ||||
| MINIO_SECRET_ACCESS_KEY = correct_key | ||||
| ` | ||||
| 	cfg, err := NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
|  | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
| 	storage := Packages.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
| 	assert.EqualValues(t, "my_packages/", storage.MinioConfig.BasePath) | ||||
| 	assert.True(t, storage.MinioConfig.ServeDirect) | ||||
| } | ||||
|  | ||||
| func Test_PackageStorage4(t *testing.T) { | ||||
| 	iniStr := ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [storage.packages] | ||||
| STORAGE_TYPE            = my_cfg | ||||
| MINIO_BASE_PATH = my_packages/ | ||||
| SERVE_DIRECT = true | ||||
| [storage.my_cfg] | ||||
| STORAGE_TYPE            = minio | ||||
| MINIO_ENDPOINT          = s3.my-domain.net | ||||
| MINIO_BUCKET            = gitea | ||||
| MINIO_LOCATION          = homenet | ||||
| MINIO_USE_SSL           = true | ||||
| MINIO_ACCESS_KEY_ID     = correct_key | ||||
| MINIO_SECRET_ACCESS_KEY = correct_key | ||||
| ` | ||||
| 	cfg, err := NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
|  | ||||
| 	assert.NoError(t, loadPackagesFrom(cfg)) | ||||
| 	storage := Packages.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
| 	assert.EqualValues(t, "my_packages/", storage.MinioConfig.BasePath) | ||||
| 	assert.True(t, storage.MinioConfig.ServeDirect) | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user