Fixes + stable gateway ids

api/billing/documents/internal/docstore/local.go

@@ -21,11 +21,13 @@ func NewLocalStore(logger mlogger.Logger, cfg LocalConfig) (*LocalStore, error)
 	if root == "" {
 		return nil, merrors.InvalidArgument("docstore: local root_path is empty")
 	}
+
 	store := &LocalStore{
 		logger:   logger.Named("docstore").Named("local"),
 		rootPath: root,
 	}
 	store.logger.Info("Document storage initialised", zap.String("root_path", root))
+
 	return store, nil
 }
 
@@ -33,15 +35,19 @@ func (s *LocalStore) Save(ctx context.Context, key string, data []byte) error {
 	if err := ctx.Err(); err != nil {
 		return err
 	}
+
 	path := filepath.Join(s.rootPath, filepath.Clean(key))
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
 		s.logger.Warn("Failed to create document directory", zap.Error(err), zap.String("path", path))
+
 		return err
 	}
 	if err := os.WriteFile(path, data, 0o600); err != nil {
 		s.logger.Warn("Failed to write document file", zap.Error(err), zap.String("path", path))
+
 		return err
 	}
+
 	return nil
 }
 
@@ -49,12 +55,16 @@ func (s *LocalStore) Load(ctx context.Context, key string) ([]byte, error) {
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
+
 	path := filepath.Join(s.rootPath, filepath.Clean(key))
+
 	data, err := os.ReadFile(path)
 	if err != nil {
 		s.logger.Warn("Failed to read document file", zap.Error(err), zap.String("path", path))
+
 		return nil, err
 	}
+
 	return data, nil
 }
 

api/billing/documents/internal/docstore/s3.go

@@ -32,6 +32,7 @@ func NewS3Store(logger mlogger.Logger, cfg S3Config) (*S3Store, error) {
 	if accessKey == "" && cfg.AccessKeyEnv != "" {
 		accessKey = strings.TrimSpace(os.Getenv(cfg.AccessKeyEnv))
 	}
+
 	secretKey := strings.TrimSpace(cfg.SecretAccessKey)
 	if secretKey == "" && cfg.SecretKeyEnv != "" {
 		secretKey = strings.TrimSpace(os.Getenv(cfg.SecretKeyEnv))
@@ -62,23 +63,21 @@ func NewS3Store(logger mlogger.Logger, cfg S3Config) (*S3Store, error) {
 				endpoint = "http://" + endpoint
 			}
 		}
-		resolver := aws.EndpointResolverWithOptionsFunc(func(service, region string, _ ...interface{}) (aws.Endpoint, error) {
-			if service == s3.ServiceID {
-				return aws.Endpoint{URL: endpoint, SigningRegion: region, HostnameImmutable: true}, nil
-			}
-			return aws.Endpoint{}, &aws.EndpointNotFoundError{}
-		})
-		loadOpts = append(loadOpts, config.WithEndpointResolverWithOptions(resolver))
 	}
 
 	awsCfg, err := config.LoadDefaultConfig(context.Background(), loadOpts...)
 	if err != nil {
 		logger.Warn("Failed to create AWS config", zap.Error(err), zap.String("bucket", bucket))
+
 		return nil, err
 	}
 
 	client := s3.NewFromConfig(awsCfg, func(opts *s3.Options) {
 		opts.UsePathStyle = cfg.ForcePathStyle
+
+		if endpoint != "" {
+			opts.BaseEndpoint = aws.String(endpoint)
+		}
 	})
 
 	store := &S3Store{
@@ -87,6 +86,7 @@ func NewS3Store(logger mlogger.Logger, cfg S3Config) (*S3Store, error) {
 		bucket: bucket,
 	}
 	store.logger.Info("Document storage initialised", zap.String("bucket", bucket), zap.String("endpoint", endpoint))
+
 	return store, nil
 }
 
@@ -94,6 +94,7 @@ func (s *S3Store) Save(ctx context.Context, key string, data []byte) error {
 	if err := ctx.Err(); err != nil {
 		return err
 	}
+
 	_, err := s.client.PutObject(ctx, &s3.PutObjectInput{
 		Bucket: aws.String(s.bucket),
 		Key:    aws.String(key),
@@ -101,8 +102,10 @@ func (s *S3Store) Save(ctx context.Context, key string, data []byte) error {
 	})
 	if err != nil {
 		s.logger.Warn("Failed to upload document", zap.Error(err), zap.String("key", key))
+
 		return err
 	}
+
 	return nil
 }
 
@@ -110,15 +113,19 @@ func (s *S3Store) Load(ctx context.Context, key string) ([]byte, error) {
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
+
 	obj, err := s.client.GetObject(ctx, &s3.GetObjectInput{
 		Bucket: aws.String(s.bucket),
 		Key:    aws.String(key),
 	})
 	if err != nil {
 		s.logger.Warn("Failed to fetch document", zap.Error(err), zap.String("key", key))
+
 		return nil, err
 	}
+
 	defer obj.Body.Close()
+
 	return io.ReadAll(obj.Body)
 }
 

api/billing/documents/internal/docstore/store.go

@@ -36,7 +36,7 @@ type S3Config struct {
 	Bucket          string `yaml:"bucket"`
 	AccessKeyEnv    string `yaml:"access_key_env"`
 	SecretKeyEnv    string `yaml:"secret_access_key_env"`
-	AccessKey       string `yaml:"access_key"`
+	AccessKey       string `yaml:"access_key"` //nolint:gosec // config field, not a hardcoded secret
 	SecretAccessKey string `yaml:"secret_access_key"`
 	UseSSL          bool   `yaml:"use_ssl"`
 	ForcePathStyle  bool   `yaml:"force_path_style"`
@@ -55,11 +55,13 @@ func New(logger mlogger.Logger, cfg Config) (Store, error) {
 		if cfg.Local == nil {
 			return nil, merrors.InvalidArgument("docstore: local config missing")
 		}
+
 		return NewLocalStore(logger, *cfg.Local)
 	case string(DriverS3), string(DriverMinio):
 		if cfg.S3 == nil {
 			return nil, merrors.InvalidArgument("docstore: s3 config missing")
 		}
+
 		return NewS3Store(logger, *cfg.S3)
 	default:
 		return nil, merrors.InvalidArgument("docstore: unsupported driver")