azfile: File download methods

sdk/storage/azfile/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "go",
   "TagPrefix": "go/storage/azfile",
-  "Tag": "go/storage/azfile_413a85db89"
+  "Tag": "go/storage/azfile_41f00dcea9"
 }

sdk/storage/azfile/directory/client.go

@@ -12,16 +12,13 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/file"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/fileerror"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/base"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/exported"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/generated"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/shared"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/sas"
 	"net/http"
 	"net/url"
 	"strings"
-	"time"
 )
 
 // ClientOptions contains the optional parameters when creating a Client.
@@ -209,34 +206,3 @@ func (d *Client) NewListFilesAndDirectoriesPager(options *ListFilesAndDirectorie
 		},
 	})
 }
-
-// GetSASURL is a convenience method for generating a SAS token for the currently pointed at directory.
-// It can only be used if the credential supplied during creation was a SharedKeyCredential.
-func (d *Client) GetSASURL(permissions sas.FilePermissions, expiry time.Time, o *GetSASURLOptions) (string, error) {
-	if d.sharedKey() == nil {
-		return "", fileerror.MissingSharedKeyCredential
-	}
-	st := o.format()
-
-	urlParts, err := sas.ParseURL(d.URL())
-	if err != nil {
-		return "", err
-	}
-
-	qps, err := sas.SignatureValues{
-		Version:             sas.Version,
-		Protocol:            sas.ProtocolHTTPS,
-		ShareName:           urlParts.ShareName,
-		DirectoryOrFilePath: urlParts.DirectoryOrFilePath,
-		Permissions:         permissions.String(),
-		StartTime:           st,
-		ExpiryTime:          expiry.UTC(),
-	}.SignWithSharedKey(d.sharedKey())
-	if err != nil {
-		return "", err
-	}
-
-	endpoint := d.URL() + "?" + qps.Encode()
-
-	return endpoint, nil
-}

sdk/storage/azfile/directory/client_test.go

@@ -8,15 +8,12 @@ package directory_test
 
 import (
 	"context"
-	"fmt"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
 	"github.com/Azure/azure-sdk-for-go/sdk/internal/recording"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/directory"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/file"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/fileerror"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/testcommon"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/sas"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/service"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"testing"
@@ -219,63 +216,6 @@ func (d *DirectoryRecordedTestsSuite) TestDirectoryCreateNegativeMultiLevel() {
 	testcommon.ValidateFileErrorCode(_require, err, fileerror.ParentNotFound)
 }
 
-func (d *DirectoryUnrecordedTestsSuite) TestDirectoryClientUsingSAS() {
-	_require := require.New(d.T())
-	testName := d.T().Name()
-
-	svcClient, err := testcommon.GetServiceClient(d.T(), testcommon.TestAccountDefault, nil)
-	_require.NoError(err)
-
-	shareName := testcommon.GenerateShareName(testName)
-	shareClient := testcommon.CreateNewShare(context.Background(), _require, shareName, svcClient)
-	defer testcommon.DeleteShare(context.Background(), _require, shareClient)
-
-	dirClient := testcommon.CreateNewDirectory(context.Background(), _require, testcommon.GenerateDirectoryName(testName), shareClient)
-
-	permissions := sas.FilePermissions{
-		Read:   true,
-		Write:  true,
-		Delete: true,
-		Create: true,
-	}
-	expiry := time.Now().Add(time.Hour)
-
-	dirSASURL, err := dirClient.GetSASURL(permissions, expiry, nil)
-	_require.NoError(err)
-
-	dirSASClient, err := directory.NewClientWithNoCredential(dirSASURL, nil)
-	_require.NoError(err)
-
-	_, err = dirSASClient.GetProperties(context.Background(), nil)
-	_require.Error(err)
-	testcommon.ValidateFileErrorCode(_require, err, fileerror.AuthenticationFailed)
-
-	subDirSASClient := dirSASClient.NewSubdirectoryClient("subdir")
-	_, err = subDirSASClient.Create(context.Background(), nil)
-	_require.Error(err)
-	testcommon.ValidateFileErrorCode(_require, err, fileerror.AuthenticationFailed)
-
-	// TODO: directory SAS client unable to do create and get properties on directories.
-	// Also unable to do create or get properties on files. Validate this behaviour.
-	fileSASClient := dirSASClient.NewFileClient(testcommon.GenerateFileName(testName))
-	_, err = fileSASClient.Create(context.Background(), 1024, nil)
-	_require.Error(err)
-	testcommon.ValidateFileErrorCode(_require, err, fileerror.AuthenticationFailed)
-
-	_, err = fileSASClient.GetProperties(context.Background(), nil)
-	_require.Error(err)
-	testcommon.ValidateFileErrorCode(_require, err, fileerror.AuthenticationFailed)
-
-	// create file using shared key client
-	_, err = dirClient.NewFileClient(testcommon.GenerateFileName(testName)).Create(context.Background(), 1024, nil)
-	_require.NoError(err)
-
-	// get properties using SAS client
-	_, err = fileSASClient.GetProperties(context.Background(), nil)
-	_require.Error(err)
-	testcommon.ValidateFileErrorCode(_require, err, fileerror.AuthenticationFailed)
-}
-
 func (d *DirectoryRecordedTestsSuite) TestDirCreateDeleteDefault() {
 	_require := require.New(d.T())
 	testName := d.T().Name()
@@ -739,56 +679,6 @@ func (d *DirectoryRecordedTestsSuite) TestDirGetSetMetadataMergeAndReplace() {
 	_require.EqualValues(gResp.Metadata, md2)
 }
 
-func (d *DirectoryRecordedTestsSuite) TestSASDirectoryClientNoKey() {
-	_require := require.New(d.T())
-	accountName, _ := testcommon.GetGenericAccountInfo(testcommon.TestAccountDefault)
-	_require.Greater(len(accountName), 0)
-
-	testName := d.T().Name()
-	shareName := testcommon.GenerateShareName(testName)
-	dirName := testcommon.GenerateDirectoryName(testName)
-	dirClient, err := directory.NewClientWithNoCredential(fmt.Sprintf("https://%s.file.core.windows.net/%v/%v", accountName, shareName, dirName), nil)
-	_require.NoError(err)
-
-	permissions := sas.FilePermissions{
-		Read:   true,
-		Write:  true,
-		Delete: true,
-		Create: true,
-	}
-	expiry := time.Now().Add(time.Hour)
-
-	_, err = dirClient.GetSASURL(permissions, expiry, nil)
-	_require.Equal(err, fileerror.MissingSharedKeyCredential)
-}
-
-func (d *DirectoryRecordedTestsSuite) TestSASDirectoryClientSignNegative() {
-	_require := require.New(d.T())
-	accountName, accountKey := testcommon.GetGenericAccountInfo(testcommon.TestAccountDefault)
-	_require.Greater(len(accountName), 0)
-	_require.Greater(len(accountKey), 0)
-
-	cred, err := service.NewSharedKeyCredential(accountName, accountKey)
-	_require.NoError(err)
-
-	testName := d.T().Name()
-	shareName := testcommon.GenerateShareName(testName)
-	dirName := testcommon.GenerateDirectoryName(testName)
-	dirClient, err := directory.NewClientWithSharedKeyCredential(fmt.Sprintf("https://%s.file.core.windows.net/%v%v", accountName, shareName, dirName), cred, nil)
-	_require.NoError(err)
-
-	permissions := sas.FilePermissions{
-		Read:   true,
-		Write:  true,
-		Delete: true,
-		Create: true,
-	}
-	expiry := time.Time{}
-
-	_, err = dirClient.GetSASURL(permissions, expiry, nil)
-	_require.Equal(err.Error(), "service SAS is missing at least one of these: ExpiryTime or Permissions")
-}
-
 // TODO: add tests for listing files and directories after file client is completed
 
 // TODO: add tests for ListHandles and ForceCloseHandles

sdk/storage/azfile/directory/models.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/generated"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/shared"
 	"reflect"
-	"time"
 )
 
 // SharedKeyCredential contains an account's name and its primary or secondary key.
@@ -158,7 +157,7 @@ func (l ListFilesInclude) format() []generated.ListFilesIncludeType {
 		return nil
 	}
 
-	include := []generated.ListFilesIncludeType{}
+	var include []generated.ListFilesIncludeType
 
 	if l.Timestamps {
 		include = append(include, ListFilesIncludeTypeTimestamps)
@@ -190,27 +189,6 @@ type FileProperty = generated.FileProperty
 
 // ---------------------------------------------------------------------------------------------------------------------
 
-// GetSASURLOptions contains the optional parameters for the Client.GetSASURL method.
-type GetSASURLOptions struct {
-	StartTime *time.Time
-}
-
-func (o *GetSASURLOptions) format() time.Time {
-	if o == nil {
-		return time.Time{}
-	}
-
-	var st time.Time
-	if o.StartTime != nil {
-		st = o.StartTime.UTC()
-	} else {
-		st = time.Time{}
-	}
-	return st
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
-
 // ListHandlesOptions contains the optional parameters for the Client.ListHandles method.
 type ListHandlesOptions struct {
 	// A string value that identifies the portion of the list to be returned with the next list operation. The operation returns