vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-15 11:57:59 +00:00
Code Issues Projects Releases Wiki Activity

white space revert to minimize change

Browse Source
This commit is contained in:
Ales Bregar
2025-08-11 11:06:56 +02:00
committed by André Roth
parent bd95012687
commit ec4503c941
2 changed files with 147 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AUTHORS
+1
View File
@@ -74,3 +74,4 @@ List of contributors, in chronological order:
* Tobias Assarsson (https://github.com/daedaluz) * Tobias Assarsson (https://github.com/daedaluz)
* Yaksh Bariya (https://github.com/thunder-coding) * Yaksh Bariya (https://github.com/thunder-coding)
* Brian Witt (https://github.com/bwitt) * Brian Witt (https://github.com/bwitt)
* Ales Bregar (https://github.com/abregar)
utils/config_test.go
+146 -146
View File
@@ -19,8 +19,8 @@ func (s *ConfigSuite) TestLoadConfig(c *C) {
_, _ = f.WriteString(configFile) _, _ = f.WriteString(configFile)
_ = f.Close() _ = f.Close()
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
err := LoadConfig(configname, &s.config) err := LoadConfig(configname, &s.config)
c.Assert(err, IsNil) c.Assert(err, IsNil)
@@ -32,8 +32,8 @@ func (s *ConfigSuite) TestLoadConfig(c *C) {
func (s *ConfigSuite) TestSaveConfig(c *C) { func (s *ConfigSuite) TestSaveConfig(c *C) {
configname := filepath.Join(c.MkDir(), "aptly.json2") configname := filepath.Join(c.MkDir(), "aptly.json2")
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
s.config.RootDir = "/tmp/aptly" s.config.RootDir = "/tmp/aptly"
s.config.DownloadConcurrency = 5 s.config.DownloadConcurrency = 5
@@ -71,94 +71,94 @@ func (s *ConfigSuite) TestSaveConfig(c *C) {
_, _ = f.Read(buf) _, _ = f.Read(buf)
c.Check(string(buf), Equals, ""+ c.Check(string(buf), Equals, ""+
"{\n"+ "{\n" +
" \"rootDir\": \"/tmp/aptly\",\n"+ " \"rootDir\": \"/tmp/aptly\",\n" +
" \"logLevel\": \"info\",\n"+ " \"logLevel\": \"info\",\n" +
" \"logFormat\": \"json\",\n"+ " \"logFormat\": \"json\",\n" +
" \"databaseOpenAttempts\": 5,\n"+ " \"databaseOpenAttempts\": 5,\n" +
" \"architectures\": null,\n"+ " \"architectures\": null,\n" +
" \"skipLegacyPool\": false,\n"+ " \"skipLegacyPool\": false,\n" +
" \"dependencyFollowSuggests\": false,\n"+ " \"dependencyFollowSuggests\": false,\n" +
" \"dependencyFollowRecommends\": false,\n"+ " \"dependencyFollowRecommends\": false,\n" +
" \"dependencyFollowAllVariants\": false,\n"+ " \"dependencyFollowAllVariants\": false,\n" +
" \"dependencyFollowSource\": false,\n"+ " \"dependencyFollowSource\": false,\n" +
" \"dependencyVerboseResolve\": false,\n"+ " \"dependencyVerboseResolve\": false,\n" +
" \"ppaDistributorID\": \"\",\n"+ " \"ppaDistributorID\": \"\",\n" +
" \"ppaCodename\": \"\",\n"+ " \"ppaCodename\": \"\",\n" +
" \"serveInAPIMode\": false,\n"+ " \"serveInAPIMode\": false,\n" +
" \"enableMetricsEndpoint\": false,\n"+ " \"enableMetricsEndpoint\": false,\n" +
" \"enableSwaggerEndpoint\": false,\n"+ " \"enableSwaggerEndpoint\": false,\n" +
" \"AsyncAPI\": false,\n"+ " \"AsyncAPI\": false,\n" +
" \"databaseBackend\": {\n"+ " \"databaseBackend\": {\n" +
" \"type\": \"\",\n"+ " \"type\": \"\",\n" +
" \"dbPath\": \"\",\n"+ " \"dbPath\": \"\",\n" +
" \"url\": \"\"\n"+ " \"url\": \"\"\n" +
" },\n"+ " },\n" +
" \"downloader\": \"\",\n"+ " \"downloader\": \"\",\n" +
" \"downloadConcurrency\": 5,\n"+ " \"downloadConcurrency\": 5,\n" +
" \"downloadSpeedLimit\": 0,\n"+ " \"downloadSpeedLimit\": 0,\n" +
" \"downloadRetries\": 0,\n"+ " \"downloadRetries\": 0,\n" +
" \"downloadSourcePackages\": false,\n"+ " \"downloadSourcePackages\": false,\n" +
" \"gpgProvider\": \"gpg\",\n"+ " \"gpgProvider\": \"gpg\",\n" +
" \"gpgDisableSign\": false,\n"+ " \"gpgDisableSign\": false,\n" +
" \"gpgDisableVerify\": false,\n"+ " \"gpgDisableVerify\": false,\n" +
" \"gpgKeys\": null,\n"+ " \"gpgKeys\": null,\n" +
" \"skipContentsPublishing\": false,\n"+ " \"skipContentsPublishing\": false,\n" +
" \"skipBz2Publishing\": false,\n"+ " \"skipBz2Publishing\": false,\n" +
" \"FileSystemPublishEndpoints\": {\n"+ " \"FileSystemPublishEndpoints\": {\n" +
" \"test\": {\n"+ " \"test\": {\n" +
" \"rootDir\": \"/opt/aptly-publish\",\n"+ " \"rootDir\": \"/opt/aptly-publish\",\n" +
" \"linkMethod\": \"\",\n"+ " \"linkMethod\": \"\",\n" +
" \"verifyMethod\": \"\"\n"+ " \"verifyMethod\": \"\"\n" +
" }\n"+ " }\n" +
" },\n"+ " },\n" +
" \"S3PublishEndpoints\": {\n"+ " \"S3PublishEndpoints\": {\n" +
" \"test\": {\n"+ " \"test\": {\n" +
" \"region\": \"us-east-1\",\n"+ " \"region\": \"us-east-1\",\n" +
" \"bucket\": \"repo\",\n"+ " \"bucket\": \"repo\",\n" +
" \"prefix\": \"\",\n"+ " \"prefix\": \"\",\n" +
" \"acl\": \"\",\n"+ " \"acl\": \"\",\n" +
" \"awsAccessKeyID\": \"\",\n"+ " \"awsAccessKeyID\": \"\",\n" +
" \"awsSecretAccessKey\": \"\",\n"+ " \"awsSecretAccessKey\": \"\",\n" +
" \"awsSessionToken\": \"\",\n"+ " \"awsSessionToken\": \"\",\n" +
" \"endpoint\": \"\",\n"+ " \"endpoint\": \"\",\n" +
" \"storageClass\": \"\",\n"+ " \"storageClass\": \"\",\n" +
" \"encryptionMethod\": \"\",\n"+ " \"encryptionMethod\": \"\",\n" +
" \"plusWorkaround\": false,\n"+ " \"plusWorkaround\": false,\n" +
" \"disableMultiDel\": false,\n"+ " \"disableMultiDel\": false,\n" +
" \"forceSigV2\": false,\n"+ " \"forceSigV2\": false,\n" +
" \"forceVirtualHostedStyle\": false,\n"+ " \"forceVirtualHostedStyle\": false,\n" +
" \"debug\": false\n"+ " \"debug\": false\n" +
" }\n"+ " }\n" +
" },\n"+ " },\n" +
" \"SwiftPublishEndpoints\": {\n"+ " \"SwiftPublishEndpoints\": {\n" +
" \"test\": {\n"+ " \"test\": {\n" +
" \"container\": \"repo\",\n"+ " \"container\": \"repo\",\n" +
" \"prefix\": \"\",\n"+ " \"prefix\": \"\",\n" +
" \"osname\": \"\",\n"+ " \"osname\": \"\",\n" +
" \"password\": \"\",\n"+ " \"password\": \"\",\n" +
" \"tenant\": \"\",\n"+ " \"tenant\": \"\",\n" +
" \"tenantid\": \"\",\n"+ " \"tenantid\": \"\",\n" +
" \"domain\": \"\",\n"+ " \"domain\": \"\",\n" +
" \"domainid\": \"\",\n"+ " \"domainid\": \"\",\n" +
" \"tenantdomain\": \"\",\n"+ " \"tenantdomain\": \"\",\n" +
" \"tenantdomainid\": \"\",\n"+ " \"tenantdomainid\": \"\",\n" +
" \"authurl\": \"\"\n"+ " \"authurl\": \"\"\n" +
" }\n"+ " }\n" +
" },\n"+ " },\n" +
" \"AzurePublishEndpoints\": {\n"+ " \"AzurePublishEndpoints\": {\n" +
" \"test\": {\n"+ " \"test\": {\n" +
" \"container\": \"repo\",\n"+ " \"container\": \"repo\",\n" +
" \"prefix\": \"\",\n"+ " \"prefix\": \"\",\n" +
" \"accountName\": \"\",\n"+ " \"accountName\": \"\",\n" +
" \"accountKey\": \"\",\n"+ " \"accountKey\": \"\",\n" +
" \"endpoint\": \"\"\n"+ " \"endpoint\": \"\"\n" +
" }\n"+ " }\n" +
" },\n"+ " },\n" +
" \"packagePoolStorage\": {\n"+ " \"packagePoolStorage\": {\n" +
" \"type\": \"local\",\n"+ " \"type\": \"local\",\n" +
" \"path\": \"/tmp/aptly-pool\"\n"+ " \"path\": \"/tmp/aptly-pool\"\n" +
" }\n"+ " }\n" +
"}") "}")
} }
@@ -168,8 +168,8 @@ func (s *ConfigSuite) TestLoadYAMLConfig(c *C) {
_, _ = f.WriteString(configFileYAML) _, _ = f.WriteString(configFileYAML)
_ = f.Close() _ = f.Close()
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
err := LoadConfig(configname, &s.config) err := LoadConfig(configname, &s.config)
c.Assert(err, IsNil) c.Assert(err, IsNil)
@@ -184,8 +184,8 @@ func (s *ConfigSuite) TestLoadYAMLErrorConfig(c *C) {
_, _ = f.WriteString(configFileYAMLError) _, _ = f.WriteString(configFileYAMLError)
_ = f.Close() _ = f.Close()
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
err := LoadConfig(configname, &s.config) err := LoadConfig(configname, &s.config)
c.Assert(err.Error(), Equals, "invalid yaml (unknown pool storage type: invalid) or json (invalid character 'p' looking for beginning of value)") c.Assert(err.Error(), Equals, "invalid yaml (unknown pool storage type: invalid) or json (invalid character 'p' looking for beginning of value)")
@@ -197,13 +197,13 @@ func (s *ConfigSuite) TestSaveYAMLConfig(c *C) {
_, _ = f.WriteString(configFileYAML) _, _ = f.WriteString(configFileYAML)
_ = f.Close() _ = f.Close()
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
err := LoadConfig(configname, &s.config) err := LoadConfig(configname, &s.config)
c.Assert(err, IsNil) c.Assert(err, IsNil)
err = SaveConfigYAML(configname, &s.config) err = SaveConfigYAML(configname, &s.config)
c.Assert(err, IsNil) c.Assert(err, IsNil)
f, _ = os.Open(configname) f, _ = os.Open(configname)
@@ -219,17 +219,17 @@ func (s *ConfigSuite) TestSaveYAMLConfig(c *C) {
} }
func (s *ConfigSuite) TestSaveYAML2Config(c *C) { func (s *ConfigSuite) TestSaveYAML2Config(c *C) {
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
s.config.PackagePoolStorage.Local = &LocalPoolStorage{"/tmp/aptly-pool"} s.config.PackagePoolStorage.Local = &LocalPoolStorage{"/tmp/aptly-pool"}
s.config.PackagePoolStorage.Azure = nil s.config.PackagePoolStorage.Azure = nil
configname := filepath.Join(c.MkDir(), "aptly.yaml4") configname := filepath.Join(c.MkDir(), "aptly.yaml4")
err := SaveConfigYAML(configname, &s.config) err := SaveConfigYAML(configname, &s.config)
c.Assert(err, IsNil) c.Assert(err, IsNil)
f, _ := os.Open(configname) f, _ := os.Open(configname)
defer func() { defer func() {
_ = f.Close() _ = f.Close()
}() }()
@@ -238,45 +238,45 @@ func (s *ConfigSuite) TestSaveYAML2Config(c *C) {
buf := make([]byte, st.Size()) buf := make([]byte, st.Size())
_, _ = f.Read(buf) _, _ = f.Read(buf)
c.Check(string(buf), Equals, ""+ c.Check(string(buf), Equals, "" +
"root_dir: \"\"\n"+ "root_dir: \"\"\n" +
"log_level: \"\"\n"+ "log_level: \"\"\n" +
"log_format: \"\"\n"+ "log_format: \"\"\n" +
"database_open_attempts: 0\n"+ "database_open_attempts: 0\n" +
"architectures: []\n"+ "architectures: []\n" +
"skip_legacy_pool: false\n"+ "skip_legacy_pool: false\n" +
"dep_follow_suggests: false\n"+ "dep_follow_suggests: false\n" +
"dep_follow_recommends: false\n"+ "dep_follow_recommends: false\n" +
"dep_follow_all_variants: false\n"+ "dep_follow_all_variants: false\n" +
"dep_follow_source: false\n"+ "dep_follow_source: false\n" +
"dep_verboseresolve: false\n"+ "dep_verboseresolve: false\n" +
"ppa_distributor_id: \"\"\n"+ "ppa_distributor_id: \"\"\n" +
"ppa_codename: \"\"\n"+ "ppa_codename: \"\"\n" +
"serve_in_api_mode: false\n"+ "serve_in_api_mode: false\n" +
"enable_metrics_endpoint: false\n"+ "enable_metrics_endpoint: false\n" +
"enable_swagger_endpoint: false\n"+ "enable_swagger_endpoint: false\n" +
"async_api: false\n"+ "async_api: false\n" +
"database_backend:\n"+ "database_backend:\n" +
" type: \"\"\n"+ " type: \"\"\n" +
" db_path: \"\"\n"+ " db_path: \"\"\n" +
" url: \"\"\n"+ " url: \"\"\n" +
"downloader: \"\"\n"+ "downloader: \"\"\n" +
"download_concurrency: 0\n"+ "download_concurrency: 0\n" +
"download_limit: 0\n"+ "download_limit: 0\n" +
"download_retries: 0\n"+ "download_retries: 0\n" +
"download_sourcepackages: false\n"+ "download_sourcepackages: false\n" +
"gpg_provider: \"\"\n"+ "gpg_provider: \"\"\n" +
"gpg_disable_sign: false\n"+ "gpg_disable_sign: false\n" +
"gpg_disable_verify: false\n"+ "gpg_disable_verify: false\n" +
"gpg_keys: []\n"+ "gpg_keys: []\n" +
"skip_contents_publishing: false\n"+ "skip_contents_publishing: false\n" +
"skip_bz2_publishing: false\n"+ "skip_bz2_publishing: false\n" +
"filesystem_publish_endpoints: {}\n"+ "filesystem_publish_endpoints: {}\n" +
"s3_publish_endpoints: {}\n"+ "s3_publish_endpoints: {}\n" +
"swift_publish_endpoints: {}\n"+ "swift_publish_endpoints: {}\n" +
"azure_publish_endpoints: {}\n"+ "azure_publish_endpoints: {}\n" +
"packagepool_storage:\n"+ "packagepool_storage:\n" +
" type: local\n"+ " type: local\n" +
" path: /tmp/aptly-pool\n") " path: /tmp/aptly-pool\n")
} }
@@ -285,8 +285,8 @@ func (s *ConfigSuite) TestLoadEmptyConfig(c *C) {
f, _ := os.Create(configname) f, _ := os.Create(configname)
_ = f.Close() _ = f.Close()
// start with empty config // start with empty config
s.config = ConfigStructure{} s.config = ConfigStructure{}
err := LoadConfig(configname, &s.config) err := LoadConfig(configname, &s.config)
c.Assert(err.Error(), Equals, "invalid yaml (EOF) or json (EOF)") c.Assert(err.Error(), Equals, "invalid yaml (EOF) or json (EOF)")
@@ -379,4 +379,4 @@ packagepool_storage:
` `
const configFileYAMLError = `packagepool_storage: const configFileYAMLError = `packagepool_storage:
type: invalid type: invalid
` `