Skip to content

azfile: mmb fix and exposing NewSharedKeyCredential() in different clients #20748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
souravgupta-msft merged 1 commit into from
May 5, 2023
Merged

azfile: mmb fix and exposing NewSharedKeyCredential() in different clients #20748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions sdk/storage/azfile/directory/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ import (
// SharedKeyCredential contains an account's name and its primary or secondary key.
type SharedKeyCredential = exported.SharedKeyCredential

// NewSharedKeyCredential creates an immutable SharedKeyCredential containing the
// storage account's name and either its primary or secondary key.
func NewSharedKeyCredential(accountName, accountKey string) (*SharedKeyCredential, error) {
return exported.NewSharedKeyCredential(accountName, accountKey)
}

// ---------------------------------------------------------------------------------------------------------------------

// CreateOptions contains the optional parameters for the Client.Create method.
Expand Down
3 changes: 1 addition & 2 deletions sdk/storage/azfile/file/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/shared"
"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/Azure/azure-sdk-for-go/sdk/storage/azfile/share"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down Expand Up @@ -1586,7 +1585,7 @@ func (f *FileRecordedTestsSuite) TestSASFileClientSignNegative() {
_require.Greater(len(accountName), 0)
_require.Greater(len(accountKey), 0)

cred, err := service.NewSharedKeyCredential(accountName, accountKey)
cred, err := file.NewSharedKeyCredential(accountName, accountKey)
_require.NoError(err)

testName := f.T().Name()
Expand Down
0 sdk/storage/azfile/file/mmf_linux.go → sdk/storage/azfile/file/mmf_unix.go
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions sdk/storage/azfile/file/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ import (
// SharedKeyCredential contains an account's name and its primary or secondary key.
type SharedKeyCredential = exported.SharedKeyCredential

// NewSharedKeyCredential creates an immutable SharedKeyCredential containing the
// storage account's name and either its primary or secondary key.
func NewSharedKeyCredential(accountName, accountKey string) (*SharedKeyCredential, error) {
return exported.NewSharedKeyCredential(accountName, accountKey)
}

// SMBProperties contains the optional parameters regarding the SMB/NTFS properties for a file.
type SMBProperties = exported.SMBProperties

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azfile/share/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ func (s *ShareRecordedTestsSuite) TestSASShareClientSignNegative() {
_require.Greater(len(accountName), 0)
_require.Greater(len(accountKey), 0)

cred, err := service.NewSharedKeyCredential(accountName, accountKey)
cred, err := share.NewSharedKeyCredential(accountName, accountKey)
_require.NoError(err)

testName := s.T().Name()
Expand Down
6 changes: 6 additions & 0 deletions sdk/storage/azfile/share/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ import (
// SharedKeyCredential contains an account's name and its primary or secondary key.
type SharedKeyCredential = exported.SharedKeyCredential

// NewSharedKeyCredential creates an immutable SharedKeyCredential containing the
// storage account's name and either its primary or secondary key.
func NewSharedKeyCredential(accountName, accountKey string) (*SharedKeyCredential, error) {
return exported.NewSharedKeyCredential(accountName, accountKey)
}

// ---------------------------------------------------------------------------------------------------------------------

// CreateOptions contains the optional parameters for the Client.Create method.
Expand Down