Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 14:20:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

azblob: rename method to initialize from SAS URL

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-10-02 15:03:38 +02:00
parent 8a43486730
commit 2067c5c527
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/vfs/azblobfs.go
View File

@@ -100,7 +100,7 @@ func NewAzBlobFs(connectionID, localTempDir, mountPath string, config AzBlobFsCo
fs.setConfigDefaults() fs.setConfigDefaults()
if fs.config.SASURL.GetPayload() != "" { if fs.config.SASURL.GetPayload() != "" {
return fs.initFsFromSASURL() return fs.initFromSASURL()
} }
credential, err := azblob.NewSharedKeyCredential(fs.config.AccountName, fs.config.AccountKey.GetPayload()) credential, err := azblob.NewSharedKeyCredential(fs.config.AccountName, fs.config.AccountKey.GetPayload())
@@ -122,7 +122,7 @@ func NewAzBlobFs(connectionID, localTempDir, mountPath string, config AzBlobFsCo
return fs, err return fs, err
} }
func (fs *AzureBlobFs) initFsFromSASURL() (Fs, error) { func (fs *AzureBlobFs) initFromSASURL() (Fs, error) {
parts, err := azblob.ParseURL(fs.config.SASURL.GetPayload()) parts, err := azblob.ParseURL(fs.config.SASURL.GetPayload())
if err != nil { if err != nil {
return fs, fmt.Errorf("invalid SAS URL: %w", err) return fs, fmt.Errorf("invalid SAS URL: %w", err)
@@ -132,7 +132,7 @@ func (fs *AzureBlobFs) initFsFromSASURL() (Fs, error) {
} }
if parts.ContainerName != "" { if parts.ContainerName != "" {
if fs.config.Container != "" && fs.config.Container != parts.ContainerName { if fs.config.Container != "" && fs.config.Container != parts.ContainerName {
return fs, fmt.Errorf("container name in SAS URL %#v and container provided %#v do not match", return fs, fmt.Errorf("container name in SAS URL %q and container provided %q do not match",
parts.ContainerName, fs.config.Container) parts.ContainerName, fs.config.Container)
} }
svc, err := container.NewClientWithNoCredential(fs.config.SASURL.GetPayload(), getAzContainerClientOptions()) svc, err := container.NewClientWithNoCredential(fs.config.SASURL.GetPayload(), getAzContainerClientOptions())