Fix rebase issues
This commit is contained in:
parent
9705c9d212
commit
bc1e9b3161
@ -30,7 +30,6 @@ var (
|
|||||||
// Storage defines a storage provider, along with any configuration
|
// Storage defines a storage provider, along with any configuration
|
||||||
// required to set up or communicate with that provider.
|
// required to set up or communicate with that provider.
|
||||||
type Storage struct {
|
type Storage struct {
|
||||||
Provider ProviderType
|
|
||||||
Provider ProviderType
|
Provider ProviderType
|
||||||
Config map[string]string
|
Config map[string]string
|
||||||
// TODO: These are AWS S3 specific -> move these out
|
// TODO: These are AWS S3 specific -> move these out
|
||||||
@ -41,7 +40,6 @@ type Storage struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NewStorage aggregates all the supplied configurations into a single configuration.
|
// NewStorage aggregates all the supplied configurations into a single configuration.
|
||||||
func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error) {
|
|
||||||
func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error) {
|
func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error) {
|
||||||
cs, err := common.UnionStringConfigs(cfgs...)
|
cs, err := common.UnionStringConfigs(cfgs...)
|
||||||
|
|
||||||
@ -54,7 +52,6 @@ func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error
|
|||||||
// NewStorageUsingRole supports specifying an AWS IAM role the storage provider
|
// NewStorageUsingRole supports specifying an AWS IAM role the storage provider
|
||||||
// should assume.
|
// should assume.
|
||||||
func NewStorageUsingRole(
|
func NewStorageUsingRole(
|
||||||
p ProviderType,
|
|
||||||
p ProviderType,
|
p ProviderType,
|
||||||
roleARN string,
|
roleARN string,
|
||||||
sessionName string,
|
sessionName string,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user