From bc1e9b31617bf8a955c9fbdadd6c9c7ff7f884d1 Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Wed, 13 Sep 2023 19:31:06 +0530 Subject: [PATCH] Fix rebase issues --- src/pkg/storage/storage.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pkg/storage/storage.go b/src/pkg/storage/storage.go index b1d758b86..9ebc8486a 100644 --- a/src/pkg/storage/storage.go +++ b/src/pkg/storage/storage.go @@ -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,