Cleanup in preparation for sync refactor #3217
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,144 @@ | ||||||
| package azcopy | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
|
|
||||||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore" | ||||||
| "github.com/Azure/azure-storage-azcopy/v10/common" | ||||||
| "github.com/Azure/azure-storage-azcopy/v10/traverser" | ||||||
| ) | ||||||
|
|
||||||
| func GetSourceServiceClient(ctx context.Context, | ||||||
adreed-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| source common.ResourceString, | ||||||
| loc common.Location, | ||||||
| trailingDot common.TrailingDotOption, | ||||||
| cpk common.CpkOptions, | ||||||
| uotm *common.UserOAuthTokenManager) (*common.ServiceClient, common.CredentialType, error) { | ||||||
| srcCredType, _, err := GetCredentialTypeForLocation(ctx, | ||||||
| loc, | ||||||
| source, | ||||||
| true, | ||||||
| uotm, | ||||||
| cpk) | ||||||
| if err != nil { | ||||||
| return nil, srcCredType, err | ||||||
| } | ||||||
| var tc azcore.TokenCredential | ||||||
| if srcCredType.IsAzureOAuth() { | ||||||
| // Get token from env var or cache. | ||||||
| tokenInfo, err := uotm.GetTokenInfo(ctx) | ||||||
| if err != nil { | ||||||
| return nil, srcCredType, err | ||||||
| } | ||||||
|
|
||||||
| tc, err = tokenInfo.GetTokenCredential() | ||||||
| if err != nil { | ||||||
| return nil, srcCredType, err | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| var srcReauthTok *common.ScopedAuthenticator | ||||||
| if at, ok := tc.(common.AuthenticateToken); ok { // We don't need two different tokens here since it gets passed in just the same either way. | ||||||
| // This will cause a reauth with StorageScope, which is fine, that's the original Authenticate call as it stands. | ||||||
| srcReauthTok = (*common.ScopedAuthenticator)(common.NewScopedCredential(at, common.ECredentialType.OAuthToken())) | ||||||
| } | ||||||
|
|
||||||
| options := traverser.CreateClientOptions(common.AzcopyCurrentJobLogger, nil, srcReauthTok) | ||||||
|
Member
There was a problem hiding this comment. Should we add a condition in the client creation for if we're not using OAuth tokens? |
||||||
|
|
||||||
| // Create Source Client. | ||||||
| var azureFileSpecificOptions any | ||||||
| if loc == common.ELocation.File() || loc == common.ELocation.FileNFS() { | ||||||
|
Member
There was a problem hiding this comment. loc.IsFile()
Suggested change
|
||||||
| azureFileSpecificOptions = &common.FileClientOptions{ | ||||||
| AllowTrailingDot: trailingDot == common.ETrailingDotOption.Enable(), | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| srcServiceClient, err := common.GetServiceClientForLocation( | ||||||
| loc, | ||||||
| source, | ||||||
| srcCredType, | ||||||
| tc, | ||||||
| &options, | ||||||
| azureFileSpecificOptions, | ||||||
| ) | ||||||
| if err != nil { | ||||||
| return nil, srcCredType, err | ||||||
| } | ||||||
| return srcServiceClient, srcCredType, nil | ||||||
| } | ||||||
|
|
||||||
| func GetDestinationServiceClient(ctx context.Context, | ||||||
|
Member
There was a problem hiding this comment. ditto
Member
Author
There was a problem hiding this comment. Creating an item for this. There are some updates I need to make with the method args so I'll clean it up at once after the core of the migration is done |
||||||
| destination common.ResourceString, | ||||||
| fromTo common.FromTo, | ||||||
| srcCredType common.CredentialType, | ||||||
| trailingDot common.TrailingDotOption, | ||||||
| cpk common.CpkOptions, | ||||||
| uotm *common.UserOAuthTokenManager) (*common.ServiceClient, common.CredentialType, error) { | ||||||
| dstCredType, _, err := GetCredentialTypeForLocation(ctx, | ||||||
| fromTo.To(), | ||||||
| destination, | ||||||
| false, | ||||||
| uotm, | ||||||
| cpk) | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
| var tc azcore.TokenCredential | ||||||
| if dstCredType.IsAzureOAuth() { | ||||||
| // Get token from env var or cache. | ||||||
| tokenInfo, err := uotm.GetTokenInfo(ctx) | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
|
|
||||||
| tc, err = tokenInfo.GetTokenCredential() | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| var dstReauthTok *common.ScopedAuthenticator | ||||||
| if at, ok := tc.(common.AuthenticateToken); ok { // We don't need two different tokens here since it gets passed in just the same either way. | ||||||
| // This will cause a reauth with StorageScope, which is fine, that's the original Authenticate call as it stands. | ||||||
| dstReauthTok = (*common.ScopedAuthenticator)(common.NewScopedCredential(at, common.ECredentialType.OAuthToken())) | ||||||
| } | ||||||
|
|
||||||
| var srcTokenCred *common.ScopedToken | ||||||
| if fromTo.IsS2S() && srcCredType.IsAzureOAuth() { | ||||||
| // Get token from env var or cache. | ||||||
| srcTokenInfo, err := uotm.GetTokenInfo(ctx) | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
|
|
||||||
| sourceTc, err := srcTokenInfo.GetTokenCredential() | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
| srcTokenCred = common.NewScopedCredential(sourceTc, srcCredType) | ||||||
| } | ||||||
|
|
||||||
| options := traverser.CreateClientOptions(common.AzcopyCurrentJobLogger, srcTokenCred, dstReauthTok) | ||||||
|
|
||||||
| // Create Destination Client. | ||||||
| var azureFileSpecificOptions any | ||||||
| if fromTo.To() == common.ELocation.File() || fromTo.To() == common.ELocation.FileNFS() { | ||||||
|
Member
There was a problem hiding this comment. fromTo.To().IsFile()
Suggested change
|
||||||
| azureFileSpecificOptions = &common.FileClientOptions{ | ||||||
| AllowTrailingDot: trailingDot == common.ETrailingDotOption.Enable(), | ||||||
| AllowSourceTrailingDot: trailingDot == common.ETrailingDotOption.Enable() && fromTo.To() == common.ELocation.File(), | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| dstServiceClient, err := common.GetServiceClientForLocation( | ||||||
| fromTo.To(), | ||||||
| destination, | ||||||
| dstCredType, | ||||||
| tc, | ||||||
| &options, | ||||||
| azureFileSpecificOptions, | ||||||
| ) | ||||||
| if err != nil { | ||||||
| return nil, dstCredType, err | ||||||
| } | ||||||
| return dstServiceClient, dstCredType, nil | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't we need the microsoft licensing header?