primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 11:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plumb config - Latest (#627)

Browse Source 
* switch proxy to config file

pull in single flight changes

* changes for single-flight

* intermediate stage. All tests passing. pkg still has env refs

* remove all env references

* delete config/env entirely

* fix failing tests

* create the config.toml file as part of dev setup

* create config file only if it doesn't exist

* update Dockerfiles to use config file

* move composing elements to the top

* verbose parameter naming

* newline

* add flag for config file path

* update docs with config file flag

* remove unnecessary nil check

* use filepath.join

* rename redis port to address

* fix path.join

* fix issues after merge

* add vendor dir
This commit is contained in:
Rohan Chakravarthy
2018-09-11 15:04:20 -07:00
committed by Aaron Schlesinger
parent bb250437da
commit 0e470d0294
207 changed files with 3397 additions and 19365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/proxy/actions/storage.go
+25 -34
View File
@@ -3,9 +3,9 @@ package actions
import (
"context"
"fmt"
"strings"
"github.com/gomods/athens/pkg/config/env"
"github.com/gomods/athens/pkg/config"
"github.com/gomods/athens/pkg/errors"
"github.com/gomods/athens/pkg/storage"
"github.com/gomods/athens/pkg/storage/fs"
"github.com/gomods/athens/pkg/storage/gcp"
@@ -16,49 +16,40 @@ import (
)
// GetStorage returns storage backend based on env configuration
func GetStorage() (storage.Backend, error) {
storageType := env.StorageTypeWithDefault("memory")
var storageRoot string
var err error
func GetStorage(storageType string, storageConfig *config.StorageConfig) (storage.Backend, error) {
const op errors.Op = "actions.GetStorage"
switch storageType {
case "memory":
return mem.NewStorage()
case "mongo":
connectionString := env.MongoConnectionString()
certPath := env.MongoCertPath()
return mongo.NewStorageWithCert(connectionString, certPath)
case "disk":
storageRoot, err = env.DiskRoot()
if err != nil {
return nil, err
if storageConfig.Mongo == nil {
return nil, errors.E(op, "Invalid Mongo Storage Configuration")
}
s, err := fs.NewStorage(storageRoot, afero.NewOsFs())
return mongo.NewStorage(storageConfig.Mongo)
case "disk":
if storageConfig.Disk == nil {
return nil, errors.E(op, "Invalid Disk Storage Configuration")
}
rootLocation := storageConfig.Disk.RootPath
s, err := fs.NewStorage(rootLocation, afero.NewOsFs())
if err != nil {
return nil, fmt.Errorf("could not create new storage from os fs (%s)", err)
errStr := fmt.Sprintf("could not create new storage from os fs (%s)", err)
return nil, errors.E(op, errStr)
}
return s, nil
case "minio":
endpoint, err := env.MinioEndpoint()
if err != nil {
return nil, err
if storageConfig.Minio == nil {
return nil, errors.E(op, "Invalid Minio Storage Configuration")
}
accessKeyID, err := env.MinioAccessKeyID()
if err != nil {
return nil, err
}
secretAccessKey, err := env.MinioSecretAccessKey()
if err != nil {
return nil, err
}
bucketName := env.MinioBucketNameWithDefault("gomods")
useSSL := true
if useSSLVar := env.MinioSSLWithDefault("yes"); strings.ToLower(useSSLVar) == "no" {
useSSL = false
}
return minio.NewStorage(endpoint, accessKeyID, secretAccessKey, bucketName, useSSL)
return minio.NewStorage(storageConfig.Minio)
case "gcp":
return gcp.New(context.Background())
if storageConfig.GCP == nil {
return nil, errors.E(op, "Invalid GCP Storage Configuration")
}
if storageConfig.CDN == nil {
return nil, errors.E(op, "Invalid CDN Storage Configuration")
}
return gcp.New(context.Background(), storageConfig.GCP, storageConfig.CDN)
default:
return nil, fmt.Errorf("storage type %s is unknown", storageType)
}