Fix rebase issues

This commit is contained in:
Abhishek Pandey 2023-09-13 19:31:06 +05:30
parent 9705c9d212
commit bc1e9b3161

View File

@ -30,7 +30,6 @@ var (
// Storage defines a storage provider, along with any configuration
// required to set up or communicate with that provider.
type Storage struct {
Provider ProviderType
Provider ProviderType
Config map[string]string
// 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.
func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error) {
func NewStorage(p ProviderType, cfgs ...common.StringConfigurer) (Storage, error) {
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
// should assume.
func NewStorageUsingRole(
p ProviderType,
p ProviderType,
roleARN string,
sessionName string,