rob
/
clipper
2
0
Fork 0
Code Issues 11 Pull Requests 1 Projects Releases Wiki Activity

Add base URL to serve file system store objects over HTTP

This commit is contained in:
Rob Watson 2021-12-09 04:05:34 +01:00
parent 13224f75ea
commit fb3a497119
4 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/.env.example
View File

@ -15,7 +15,12 @@ ASSETS_HTTP_ROOT=
# NOTE: Enabling the file system store will disable serving assets over HTTP. # NOTE: Enabling the file system store will disable serving assets over HTTP.
FILE_STORE=filesystem FILE_STORE=filesystem
# The base path for the file system store.
# The base URL used for serving file store assets.
# Example: http://localhost:8888
FILE_STORE_HTTP_BASE_URL=
# The root directory for the file system store.
FILE_STORE_HTTP_ROOT=data/ FILE_STORE_HTTP_ROOT=data/
# AWS credentials, required for the S3 store. # AWS credentials, required for the S3 store.

2
backend/cmd/clipper/main.go
View File

@ -101,5 +101,5 @@ func buildFileStore(ctx context.Context, c config.Config, logger *zap.Logger) (m
} }
logger.Info("Initializing file sysytem store") logger.Info("Initializing file sysytem store")
return filestore.NewFileSystemStore(c.FileStoreHTTPRoot, "/") return filestore.NewFileSystemStore(c.FileStoreHTTPRoot, c.FileStoreHTTPBaseURL)
} }

7
backend/config/config.go
View File

@ -28,6 +28,7 @@ type Config struct {
DatabaseURL string DatabaseURL string
FileStore FileStore FileStore FileStore
FileStoreHTTPRoot string FileStoreHTTPRoot string
FileStoreHTTPBaseURL string
AWSAccessKeyID string AWSAccessKeyID string
AWSSecretAccessKey string AWSSecretAccessKey string
AWSRegion string AWSRegion string
@ -76,6 +77,11 @@ func NewFromEnv() (Config, error) {
return Config{}, fmt.Errorf("invalid FILE_STORE value: %s", fileStoreString) return Config{}, fmt.Errorf("invalid FILE_STORE value: %s", fileStoreString)
} }
fileStoreHTTPBaseURL := os.Getenv("FILE_STORE_HTTP_BASE_URL")
if fileStoreHTTPBaseURL == "" {
fileStoreHTTPBaseURL = "/"
}
var awsAccessKeyID, awsSecretAccessKey, awsRegion, s3Bucket, fileStoreHTTPRoot string var awsAccessKeyID, awsSecretAccessKey, awsRegion, s3Bucket, fileStoreHTTPRoot string
if fileStore == S3Store { if fileStore == S3Store {
awsAccessKeyID = os.Getenv("AWS_ACCESS_KEY_ID") awsAccessKeyID = os.Getenv("AWS_ACCESS_KEY_ID")
@ -118,5 +124,6 @@ func NewFromEnv() (Config, error) {
S3Bucket: s3Bucket, S3Bucket: s3Bucket,
AssetsHTTPRoot: assetsHTTPRoot, AssetsHTTPRoot: assetsHTTPRoot,
FileStoreHTTPRoot: fileStoreHTTPRoot, FileStoreHTTPRoot: fileStoreHTTPRoot,
FileStoreHTTPBaseURL: fileStoreHTTPBaseURL,
}, nil }, nil
} }

3
backend/filestore/fs.go
View File

@ -63,7 +63,8 @@ func (s *FileSystemStore) GetObjectWithRange(ctx context.Context, key string, st
// GetURL returns an HTTP URL for the provided file path. // GetURL returns an HTTP URL for the provided file path.
func (s *FileSystemStore) GetURL(ctx context.Context, key string) (string, error) { func (s *FileSystemStore) GetURL(ctx context.Context, key string) (string, error) {
url := url.URL{} var url url.URL
url.Scheme = s.baseURL.Scheme
url.Host = s.baseURL.Host url.Host = s.baseURL.Host
url.Path = fmt.Sprintf("%s%s", s.baseURL.Path, key) url.Path = fmt.Sprintf("%s%s", s.baseURL.Path, key)
return url.String(), nil return url.String(), nil