mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-30 18:36:22 +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:
		
							
								
								
									
										111
									
								
								modules/setting/repository_archive_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								modules/setting/repository_archive_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,111 @@ | ||||
| // Copyright 2023 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package setting | ||||
|  | ||||
| import ( | ||||
| 	"testing" | ||||
|  | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  | ||||
| func Test_getStorageInheritNameSectionTypeForRepoArchive(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, loadRepoArchiveFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type) | ||||
| 	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// we can also configure packages storage directly | ||||
| 	iniStr = ` | ||||
| [storage.repo-archive] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadRepoArchiveFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type) | ||||
| 	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// or we can indicate the storage type in the packages section | ||||
| 	iniStr = ` | ||||
| [repo-archive] | ||||
| STORAGE_TYPE = my_minio | ||||
|  | ||||
| [storage.my_minio] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadRepoArchiveFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type) | ||||
| 	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath) | ||||
|  | ||||
| 	// or we can indicate the storage type  and minio base path in the packages section | ||||
| 	iniStr = ` | ||||
| [repo-archive] | ||||
| STORAGE_TYPE = my_minio | ||||
| MINIO_BASE_PATH = my_archive/ | ||||
|  | ||||
| [storage.my_minio] | ||||
| STORAGE_TYPE = minio | ||||
| ` | ||||
| 	cfg, err = NewConfigProviderFromData(iniStr) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.NoError(t, loadRepoArchiveFrom(cfg)) | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type) | ||||
| 	assert.EqualValues(t, "my_archive/", RepoArchive.Storage.MinioConfig.BasePath) | ||||
| } | ||||
|  | ||||
| func Test_RepoArchiveStorage(t *testing.T) { | ||||
| 	iniStr := ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [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, loadRepoArchiveFrom(cfg)) | ||||
| 	storage := RepoArchive.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
|  | ||||
| 	iniStr = ` | ||||
| ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||||
| [storage.repo-archive] | ||||
| STORAGE_TYPE = s3 | ||||
| [storage.s3] | ||||
| 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, loadRepoArchiveFrom(cfg)) | ||||
| 	storage = RepoArchive.Storage | ||||
|  | ||||
| 	assert.EqualValues(t, "minio", storage.Type) | ||||
| 	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket) | ||||
| } | ||||
		Reference in New Issue
	
	Block a user