publish: check if storage exists

2026-07-15 11:57:59 +00:00 · 2026-06-18 13:36:17 +02:00
parent 29e643cdf6
commit dd85493b1a
14 changed files with 94 additions and 70 deletions
@@ -117,7 +117,12 @@ func (context *AptlyContext) config() *utils.ConfigStructure {
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "Config file not found, creating default config at %s\n\n", homeLocation)

-				_ = utils.SaveConfigRaw(homeLocation, aptly.AptlyConf)
+				defaultConfig := aptly.AptlyConf
+				if len(defaultConfig) == 0 {
+					defaultConfig = []byte("root_dir: \"\"")
+				}
+
+				_ = utils.SaveConfigRaw(homeLocation, defaultConfig)
 				err = utils.LoadConfig(homeLocation, &utils.Config)
 				if err != nil {
 					Fatal(fmt.Errorf("error loading config file %s: %s", homeLocation, err))
@@ -408,8 +413,8 @@ func (context *AptlyContext) PackagePool() aptly.PackagePool {
 	return context.packagePool
 }

-// GetPublishedStorage returns instance of PublishedStorage
-func (context *AptlyContext) GetPublishedStorage(name string) aptly.PublishedStorage {
+// GetPublishedStorage returns instance of PublishedStorage, or an error if the storage is not configured
+func (context *AptlyContext) GetPublishedStorage(name string) (aptly.PublishedStorage, error) {
 	context.Lock()
 	defer context.Unlock()

@@ -420,14 +425,14 @@ func (context *AptlyContext) GetPublishedStorage(name string) aptly.PublishedSto
 		} else if strings.HasPrefix(name, "filesystem:") {
 			params, ok := context.config().FileSystemPublishRoots[name[11:]]
 			if !ok {
-				Fatal(fmt.Errorf("published local storage %v not configured", name[11:]))
+				return nil, fmt.Errorf("published local storage %v not configured", name[11:])
 			}

 			publishedStorage = files.NewPublishedStorage(params.RootDir, params.LinkMethod, params.VerifyMethod)
 		} else if strings.HasPrefix(name, "s3:") {
 			params, ok := context.config().S3PublishRoots[name[3:]]
 			if !ok {
-				Fatal(fmt.Errorf("published S3 storage %v not configured", name[3:]))
+				return nil, fmt.Errorf("published S3 storage %v not configured", name[3:])
 			}

 			var err error
@@ -437,12 +442,12 @@ func (context *AptlyContext) GetPublishedStorage(name string) aptly.PublishedSto
 				params.EncryptionMethod, params.PlusWorkaround, params.DisableMultiDel,
 				params.ForceSigV2, params.ForceVirtualHostedStyle, params.Debug)
 			if err != nil {
-				Fatal(err)
+				return nil, err
 			}
 		} else if strings.HasPrefix(name, "gcs:") {
 			params, ok := context.config().GCSPublishRoots[name[4:]]
 			if !ok {
-				Fatal(fmt.Errorf("published GCS storage %v not configured", name[4:]))
+				return nil, fmt.Errorf("published GCS storage %v not configured", name[4:])
 			}

 			var err error
@@ -451,51 +456,51 @@ func (context *AptlyContext) GetPublishedStorage(name string) aptly.PublishedSto
 				params.Project, params.Endpoint, params.ACL, params.StorageClass, params.EncryptionKey,
 				params.DisableMultiDel, params.Debug)
 			if err != nil {
-				Fatal(err)
+				return nil, err
 			}
 		} else if strings.HasPrefix(name, "swift:") {
 			params, ok := context.config().SwiftPublishRoots[name[6:]]
 			if !ok {
-				Fatal(fmt.Errorf("published Swift storage %v not configured", name[6:]))
+				return nil, fmt.Errorf("published Swift storage %v not configured", name[6:])
 			}

 			var err error
 			publishedStorage, err = swift.NewPublishedStorage(params.UserName, params.Password,
 				params.AuthURL, params.Tenant, params.TenantID, params.Domain, params.DomainID, params.TenantDomain, params.TenantDomainID, params.Container, params.Prefix)
 			if err != nil {
-				Fatal(err)
+				return nil, err
 			}
 		} else if strings.HasPrefix(name, "azure:") {
 			params, ok := context.config().AzurePublishRoots[name[6:]]
 			if !ok {
-				Fatal(fmt.Errorf("published Azure storage %v not configured", name[6:]))
+				return nil, fmt.Errorf("published Azure storage %v not configured", name[6:])
 			}

 			var err error
 			publishedStorage, err = azure.NewPublishedStorage(
 				params.AccountName, params.AccountKey, params.Container, params.Prefix, params.Endpoint)
 			if err != nil {
-				Fatal(err)
+				return nil, err
 			}
 		} else if strings.HasPrefix(name, "jfrog:") {
 			params, ok := context.config().JFrogPublishRoots[name[6:]]
 			if !ok {
-				Fatal(fmt.Errorf("published JFrog storage %v not configured", name[6:]))
+				return nil, fmt.Errorf("published JFrog storage %v not configured", name[6:])
 			}

 			var err error
 			publishedStorage, err = jfrog.NewPublishedStorage(
 				name[6:], params)
 			if err != nil {
-				Fatal(err)
+				return nil, fmt.Errorf("error creating jfrog manager: %w", err)
 			}
 		} else {
-			Fatal(fmt.Errorf("unknown published storage format: %v", name))
+			return nil, fmt.Errorf("unknown published storage format: %v", name)
 		}
 		context.publishedStorages[name] = publishedStorage
 	}

-	return publishedStorage
+	return publishedStorage, nil
 }

 // UploadPath builds path to upload storage
@@ -2,7 +2,6 @@ package context

 import (
 	"fmt"
-	"os"
 	"reflect"
 	"testing"

@@ -81,12 +80,11 @@ func (s *AptlyContextSuite) SetUpTest(c *C) {

 func (s *AptlyContextSuite) TestGetPublishedStorageBadFS(c *C) {
 	// https://github.com/aptly-dev/aptly/issues/711
-	// This will fail on account of us not having a config, so the
-	// storage never exists.
-	c.Assert(func() { s.context.GetPublishedStorage("filesystem:fuji") },
-		FatalErrorPanicMatches,
-		&FatalError{ReturnCode: 1, Message: fmt.Sprintf("error loading config file %s/.aptly.conf: invalid yaml (EOF) or json (EOF)",
-			os.Getenv("HOME"))})
+	// https://github.com/aptly-dev/aptly/issues/1477
+	// GetPublishedStorage must return an error (not panic) when the
+	// requested storage is not configured.
+	_, err := s.context.GetPublishedStorage("filesystem:fuji")
+	c.Assert(err, NotNil)
 }

 func (s *AptlyContextSuite) TestGetPublishedStorageJFrogConfigured(c *C) {
@@ -98,18 +96,20 @@ func (s *AptlyContextSuite) TestGetPublishedStorageJFrogConfigured(c *C) {
 	utils.Config.JFrogPublishRoots = map[string]utils.JFrogPublishRoot{
 		"test": {
 			Repository:  "aptly-repo",
-			Url:         "https://example.jfrog.local/artifactory",
+			URL:         "https://example.jfrog.local/artifactory",
 			AccessToken: "token",
 			Prefix:      "public",
 		},
 	}

-	storage := s.context.GetPublishedStorage("jfrog:test")
+	storage, err := s.context.GetPublishedStorage("jfrog:test")
+	c.Assert(err, IsNil)
 	c.Assert(storage, NotNil)
 	c.Assert(fmt.Sprintf("%v", storage), Equals, "jfrog:aptly-repo:public")

 	// Ensure we get the cached object on repeated lookups.
-	storageAgain := s.context.GetPublishedStorage("jfrog:test")
+	storageAgain, err := s.context.GetPublishedStorage("jfrog:test")
+	c.Assert(err, IsNil)
 	c.Assert(storageAgain, Equals, storage)
 }

@@ -120,9 +120,9 @@ func (s *AptlyContextSuite) TestGetPublishedStorageJFrogMissing(c *C) {
 	s.context.configLoaded = true
 	utils.Config.JFrogPublishRoots = map[string]utils.JFrogPublishRoot{}

-	c.Assert(func() { s.context.GetPublishedStorage("jfrog:missing") },
-		FatalErrorPanicMatches,
-		&FatalError{ReturnCode: 1, Message: "published JFrog storage missing not configured"})
+	_, err := s.context.GetPublishedStorage("jfrog:missing")
+	c.Assert(err, NotNil)
+	c.Check(err.Error(), Equals, "published JFrog storage missing not configured")
 }

 func (s *AptlyContextSuite) TestGetPublishedStorageJFrogInitError(c *C) {
@@ -133,19 +133,11 @@ func (s *AptlyContextSuite) TestGetPublishedStorageJFrogInitError(c *C) {
 	utils.Config.JFrogPublishRoots = map[string]utils.JFrogPublishRoot{
 		"broken": {
 			Repository: "aptly-repo",
-			Url:        "ssh://example.local/artifactory",
+			URL:        "ssh://example.local/artifactory",
 		},
 	}

-	defer func() {
-		obtained := recover()
-		c.Assert(obtained, NotNil)
-
-		fatalErr, ok := obtained.(*FatalError)
-		c.Assert(ok, Equals, true)
-		c.Check(fatalErr.ReturnCode, Equals, 1)
-		c.Check(fatalErr.Message, Matches, `error creating jfrog manager: .*`)
-	}()
-
-	s.context.GetPublishedStorage("jfrog:broken")
+	_, err := s.context.GetPublishedStorage("jfrog:broken")
+	c.Assert(err, NotNil)
+	c.Check(err.Error(), Matches, `error creating jfrog manager: .*`)
 }