Get Artifactory token outside constructor

This will make it possible to avoid setting environment variables in
most of the tests which is nice since setting environment variables
cannot be done in parallel.

Author: code-asher

storage/artifactory.go

@@ -24,8 +24,6 @@ import (
 	"github.com/coder/code-marketplace/util"
 )
 
-const ArtifactoryTokenEnvKey = "ARTIFACTORY_TOKEN"
-
 type ArtifactoryError struct {
 	Status  int    `json:"status"`
 	Message string `json:"message"`
@@ -61,12 +59,7 @@ type Artifactory struct {
 	uri             string
 }
 
-func NewArtifactoryStorage(ctx context.Context, uri, repo string, logger slog.Logger) (*Artifactory, error) {
-	token := os.Getenv(ArtifactoryTokenEnvKey)
-	if token == "" {
-		return nil, xerrors.Errorf("the %s environment variable must be set", ArtifactoryTokenEnvKey)
-	}
-
+func NewArtifactoryStorage(ctx context.Context, uri, repo, token string, logger slog.Logger) (*Artifactory, error) {
 	if !strings.HasSuffix(uri, "/") {
 		uri = uri + "/"
 	}

storage/storage.go

@@ -127,6 +127,8 @@ type Storage interface {
 	WalkExtensions(ctx context.Context, fn func(manifest *VSIXManifest, versions []string) error) error
 }
 
+const ArtifactoryTokenEnvKey = "ARTIFACTORY_TOKEN"
+
 // NewStorage returns a storage instance based on the provided extension
 // directory or Artifactory URL.  If neither or both are provided an error is
 // returned.
@@ -136,7 +138,11 @@ func NewStorage(ctx context.Context, options *Options) (Storage, error) {
 	} else if options.Artifactory != "" && options.Repo == "" {
 		return nil, xerrors.Errorf("must provide repository")
 	} else if options.Artifactory != "" {
-		return NewArtifactoryStorage(ctx, options.Artifactory, options.Repo, options.Logger)
+		token := os.Getenv(ArtifactoryTokenEnvKey)
+		if token == "" {
+			return nil, xerrors.Errorf("the %s environment variable must be set", ArtifactoryTokenEnvKey)
+		}
+		return NewArtifactoryStorage(ctx, options.Artifactory, options.Repo, token, options.Logger)
 	} else if options.ExtDir != "" {
 		return NewLocalStorage(options.ExtDir, options.Logger)
 	}